[Fmsystem-commits] [15597] property: datehandling

[sigurdne]

Revision: 15597
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15597
Author:   sigurdne
Date:     2016-09-06 11:56:41 +0000 (Tue, 06 Sep 2016)
Log Message:
-----------
property: datehandling

Modified Paths:
--------------
    trunk/property/inc/class.uiworkorder.inc.php

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2016-09-06 11:25:11 UTC 
(rev 15596)
+++ trunk/property/inc/class.uiworkorder.inc.php        2016-09-06 11:56:41 UTC 
(rev 15597)
@@ -1279,7 +1279,21 @@
                                {
                                        if ($project['project_type_id'] == 
1)//operation
                                        {
-                                               $values['start_date'] = 
$GLOBALS['phpgw']->common->show_date(time(), 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                                               
phpgw::import_class('phpgwapi.datetime');
+                                               if( $project['end_date'] && 
phpgwapi_datetime::date_to_timestamp($project['end_date']) < time() )
+                                               {
+                                                       $values['start_date'] = 
$GLOBALS['phpgw']->common->show_date(
+                                                               
phpgwapi_datetime::date_to_timestamp($project['end_date']),
+                                                               
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']
+                                                       );
+                                               }
+                                               else
+                                               {
+                                                       $values['start_date'] = 
$GLOBALS['phpgw']->common->show_date(
+                                                               time(),
+                                                               
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']
+                                                       );
+                                               }
                                        }
                                        else
                                        {