[Fmsystem-commits] [11622] property: configurable default end date

[Sigurd Nes]

Revision: 11622
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11622
Author:   sigurdne
Date:     2014-01-23 08:41:32 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
property: configurable default end date

Modified Paths:
--------------
    trunk/property/inc/class.uiworkorder.inc.php
    trunk/property/templates/base/config.tpl

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2014-01-22 21:02:33 UTC 
(rev 11621)
+++ trunk/property/inc/class.uiworkorder.inc.php        2014-01-23 08:41:32 UTC 
(rev 11622)
@@ -1423,9 +1423,10 @@
 
                                $last_day_of_year =  mktime (13 , 0, 0 ,12, 31, 
date("Y"));
 
+
                                if( $project['end_date'] && 
!$values['end_date'])
                                {
-                                       
if($project['project_type_id']==1)//operation
+                                       if($project['project_type_id']==1 && 
isset($config->config_data['delay_operation_workorder_end_date']) && 
$config->config_data['delay_operation_workorder_end_date']==1)//operation
                                        {
                                                $values['end_date'] = 
$GLOBALS['phpgw']->common->show_date($last_day_of_year, 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                                        }
@@ -1436,8 +1437,7 @@
                                }
                                else if( !$project['end_date'] && 
!$values['end_date'])
                                {
-
-                                       
if($project['project_type_id']==1)//operation
+                                       if($project['project_type_id']==1 && 
isset($config->config_data['delay_operation_workorder_end_date']) && 
$config->config_data['delay_operation_workorder_end_date']==1)//operation
                                        {
                                                $values['end_date'] = 
$GLOBALS['phpgw']->common->show_date($last_day_of_year, 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                                        }

Modified: trunk/property/templates/base/config.tpl
===================================================================
--- trunk/property/templates/base/config.tpl    2014-01-22 21:02:33 UTC (rev 
11621)
+++ trunk/property/templates/base/config.tpl    2014-01-23 08:41:32 UTC (rev 
11622)
@@ -157,6 +157,17 @@
                                </select>
                        </td>
                </tr>
+               <tr class="row_on">
+                       <td>{lang_delay_operation_workorder_end_date}, 
{lang_last_day_in_year}:</td>
+                       <td>
+                               <select 
name="newsettings[delay_operation_workorder_end_date]">
+                                       <option value="" 
{selected_delay_operation_workorder_end_date_}>NO</option>
+                                       <option value="1" 
{selected_delay_operation_workorder_end_date_1}>YES</option>
+                               </select>
+                       </td>
+               </tr>
+
+
                <tr class="row_off">
                        <td>{lang_Default_municipal_number}:</td>
                        <td><input name="newsettings[default_municipal]" 
value="{value_default_municipal}"></td>