[Fmsystem-commits] [7495] Merge 7493:7494 from trunk

[Sigurd Nes]

Revision: 7495
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7495
Author:   sigurdne
Date:     2011-08-11 12:01:59 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
Merge 7493:7494 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.boagreement.inc.php
    branches/Version-1_0-branch/property/inc/class.soagreement.inc.php
    branches/Version-1_0-branch/property/inc/class.uiagreement.inc.php

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
   + 
/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

Modified: branches/Version-1_0-branch/property/inc/class.boagreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boagreement.inc.php  
2011-08-11 12:01:19 UTC (rev 7494)
+++ branches/Version-1_0-branch/property/inc/class.boagreement.inc.php  
2011-08-11 12:01:59 UTC (rev 7495)
@@ -167,6 +167,11 @@
                                {
                                        $agreement['start_date']  = 
$GLOBALS['phpgw']->common->show_date($agreement['start_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                                }
+                               if($agreement['termination_date'])
+                               {
+                                       $agreement['termination_date']  = 
$GLOBALS['phpgw']->common->show_date($agreement['termination_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                               }
+
                                if($agreement['end_date'])
                                {
                                        $agreement['end_date']  = 
$GLOBALS['phpgw']->common->show_date($agreement['end_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);

Modified: branches/Version-1_0-branch/property/inc/class.soagreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soagreement.inc.php  
2011-08-11 12:01:19 UTC (rev 7494)
+++ branches/Version-1_0-branch/property/inc/class.soagreement.inc.php  
2011-08-11 12:01:59 UTC (rev 7495)
@@ -130,6 +130,13 @@
                        $uicols['statustext'][]         = lang('start date');
                        $uicols['datatype'][]           = 'D';
 
+                       $cols_return[]                          = 
'termination_date';
+                       $uicols['input_type'][]         = 'text';
+                       $uicols['name'][]                       = 
'termination_date';
+                       $uicols['descr'][]                      = 
lang('termination date');
+                       $uicols['statustext'][]         = lang('termination 
date');
+                       $uicols['datatype'][]           = 'D';
+
                        $cols_return[]                          = 'end_date';
                        $uicols['input_type'][]         = 'text';
                        $uicols['name'][]                       = 'end_date';

Modified: branches/Version-1_0-branch/property/inc/class.uiagreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiagreement.inc.php  
2011-08-11 12:01:19 UTC (rev 7494)
+++ branches/Version-1_0-branch/property/inc/class.uiagreement.inc.php  
2011-08-11 12:01:59 UTC (rev 7495)
@@ -485,7 +485,7 @@
                                        
$datatable['headers']['header'][$i]['text']                     = 
$uicols['descr'][$i];
                                        
$datatable['headers']['header'][$i]['visible']                  = true;
                                        
$datatable['headers']['header'][$i]['sortable']                 = false;
-                                       if($uicols['name'][$i]=='id' || 
$uicols['name'][$i]=='name' || $uicols['name'][$i]=='org_name' || 
$uicols['name'][$i]=='category' || $uicols['name'][$i]=='start_date' || 
$uicols['name'][$i]=='end_date' || $uicols['name'][$i]=='status')
+                                       if($uicols['name'][$i]=='id' || 
$uicols['name'][$i]=='name' || $uicols['name'][$i]=='org_name' || 
$uicols['name'][$i]=='category' || $uicols['name'][$i]=='start_date' || 
$uicols['name'][$i]=='end_date' || $uicols['name'][$i]=='status'|| 
$uicols['name'][$i]=='termination_date')
                                        {
                                                
$datatable['headers']['header'][$i]['sortable']         = true;
                                                
$datatable['headers']['header'][$i]['sort_field']       = $uicols['name'][$i];