fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [9118] Merge 9113:9117 from trunk


From: Sigurd Nes
Subject: [Fmsystem-commits] [9118] Merge 9113:9117 from trunk
Date: Wed, 11 Apr 2012 07:09:53 +0000

Revision: 9118
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9118
Author:   sigurdne
Date:     2012-04-11 07:09:53 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
Merge 9113:9117 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
    branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
    branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
    branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
    branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117

Modified: 
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php 
2012-04-11 07:07:21 UTC (rev 9117)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php 
2012-04-11 07:09:53 UTC (rev 9118)
@@ -435,10 +435,12 @@
                
                if($activity->get_group_id() && $activity->get_group_id() > 0)
                {
+                       
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
 true));
                        
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
 $subject, $body);
                }
                else if($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
                {
+                       
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
                        
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
 $subject, $body);
                }
            }
@@ -474,11 +476,13 @@
        if($activity->get_group_id() && $activity->get_group_id() > 0)
        {
                //$contact_person2 = 
activitycalendar_socontactperson::get_instance()->get_group_contact2($activity>get_group_id());
+               
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
 true));
                
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),
 $subject, $body);
        }
        else if($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
        {
                //$contact_person2 = 
activitycalendar_socontactperson::get_instance()->get_oup_contact2($activity>get_group_id());
+               
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
                
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),
 $subject, $body);
        }
        
@@ -486,7 +490,7 @@
        
     }
     
-       function send_mailnotification_to_organization($contact_person_id, 
$subject, $body)
+       function send_mailnotification_to_organization($contact_person, 
$subject, $body)
        {
                
                //var_dump($contact_person_id . ',' . $subject . ',' . $body);
@@ -505,7 +509,7 @@
                        return false;
                }
                
-               $mailtoAddress = 
activitycalendar_socontactperson::get_instance()->get_mailaddress_for_org_contact($contact_person_id);
+               $mailtoAddress = 
activitycalendar_socontactperson::get_instance()->get_mailaddress_for_org_contact($contact_person->get_id());
                //$mailtoAddress = "address@hidden";
                
                //var_dump($mailtoAddress);
@@ -534,7 +538,7 @@
                }
        }
     
-       function send_mailnotification_to_group($contact_person_id, $subject, 
$body)
+       function send_mailnotification_to_group($contact_person, $subject, 
$body)
        {
                if (!is_object($GLOBALS['phpgw']->send))
                {
@@ -551,7 +555,7 @@
                        return false;
                }
                
-               $mailtoAddress = 
activitycalendar_socontactperson::get_instance()->get_mailaddress_for_group_contact($contact_person_id);
+               $mailtoAddress = 
activitycalendar_socontactperson::get_instance()->get_mailaddress_for_group_contact($contact_person->get_id());
                //$mailtoaddress = "address@hidden";
 //var_dump($mailtoAddress.';'.$from.';'.$subject);
                if (strlen($mailtoAddress) > 0) 

Modified: branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php  
2012-04-11 07:07:21 UTC (rev 9117)
+++ branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php  
2012-04-11 07:09:53 UTC (rev 9118)
@@ -417,7 +417,7 @@
                                );
                        $criteria[10] = array
                                (
-                                       'field' => 'fm_project.account_group',
+                                       'field' => 'fm_b_account.category',
                                        'type'  => 'int',
                                        'matchtype' => 'exact',
                                        'front' => '',

Modified: branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sobudget.inc.php     
2012-04-11 07:07:21 UTC (rev 9117)
+++ branches/Version-1_0-branch/property/inc/class.sobudget.inc.php     
2012-04-11 07:09:53 UTC (rev 9118)
@@ -540,14 +540,15 @@
                        //_debug_array($allrows);
                        $ordermethod = '';
                        /* 0 => cancelled, 1 => obligation , 2 => paid */
-                       $filtermethod = "WHERE fm_workorder.paid = 1 and 
fm_workorder.vendor_id > 0";
+                       //$filtermethod = "WHERE fm_workorder.paid = 1 and 
fm_workorder.vendor_id > 0";
+//                     $filtermethod = "WHERE fm_workorder.vendor_id > 0";
 
                        $start_date = mktime(1, 1, 1, 1, 1, $year);
                        $end_date = mktime  (23, 59, 59, 12, 31, $year);
 //                     $filtermethod .= " AND fm_workorder.start_date >= 
$start_date AND fm_workorder.start_date <= $end_date";
                        $filtermethod .= " AND fm_workorder_status.closed IS 
NULL AND fm_workorder.start_date >= $start_date AND fm_workorder.start_date <= 
$end_date";
 
-                       $where = 'AND';
+                       $where = 'WHERE';
 
                        if ($cat_id > 0)
                        {

Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php  
2012-04-11 07:07:21 UTC (rev 9117)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php  
2012-04-11 07:09:53 UTC (rev 9118)
@@ -331,7 +331,7 @@
 
                                //----- b_group
 
-                               if($b_group)
+//                             if($b_group)
                                {
                                        $joinmethod .= " {$this->join} 
fm_b_account ON (fm_workorder.account_id =fm_b_account.id))";
                                        $paranthesis .='(';
@@ -479,13 +479,17 @@
 
                                if($status_id == 'open')
                                {
-                                       $_status_filter = array();
+                                       $filtermethod .= " $where 
fm_workorder_status.closed IS NULL"; 
+
+/*                                     $_status_filter = array();
+                                       $this->db->query("SELECT * FROM 
fm_workorder_status WHERE closed IS NULL");
                                        $this->db->query("SELECT * FROM 
fm_workorder_status WHERE delivered IS NULL AND closed IS NULL");
                                        while($this->db->next_record())
                                        {
                                                $_status_filter[] = 
$this->db->f('id');
                                        }
                                        $filtermethod .= " $where 
fm_workorder.status IN ('" . implode("','", $_status_filter) . "')"; 
+*/
                                }
                                else
                                {
@@ -621,9 +625,11 @@
 
                        $sql_full = "{$sql} {$filtermethod} {$querymethod}";
 
+                       $sql_base = 
substr($sql_full,strripos($sql_full,'FROM'));
+
                        
if($GLOBALS['phpgw_info']['server']['db_type']=='postgres')
                        {                               
-                               $sql_minimized = 'SELECT DISTINCT 
fm_workorder.id '  . substr($sql_full,strripos($sql_full,'FROM'));
+                               $sql_minimized = "SELECT DISTINCT 
fm_workorder.id {$sql_base}";
                                $sql_count = "SELECT count(id) as cnt FROM 
({$sql_minimized}) as t";
 
                                $this->db->query($sql_count,__LINE__,__FILE__);

Modified: branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js 
2012-04-11 07:07:21 UTC (rev 9117)
+++ branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js 
2012-04-11 07:09:53 UTC (rev 9118)
@@ -59,15 +59,15 @@
                        if(details)
                        {
                                //look for  "grouping" column
-                               oMenuButton_3.set("label", ("<em>" + param + 
"</em>"));
-                               oMenuButton_3.set("value", param);
+               //              oMenuButton_3.set("label", ("<em>" + param + 
"</em>"));
+               //              oMenuButton_3.set("value", param);
                                path_values.grouping = param;
                        }
                        else
                        {
                                //reset GROUPING filter
-                               oMenuButton_3.set("label", ("<em>" + 
array_options[3][0][1] + "</em>"));
-                               path_values.grouping =  array_options[3][0][0];
+               //              oMenuButton_3.set("label", ("<em>" + 
array_options[3][0][1] + "</em>"));
+               //              path_values.grouping =  array_options[3][0][0];
                                path_values.b_account = param;
                        }
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]