[Fmsystem-commits] [11597] property: order-dates

[Sigurd Nes]

Revision: 11597
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11597
Author:   sigurdne
Date:     2014-01-15 20:43:43 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
property: order-dates

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

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2014-01-14 19:19:32 UTC 
(rev 11596)
+++ trunk/property/inc/class.soworkorder.inc.php        2014-01-15 20:43:43 UTC 
(rev 11597)
@@ -1541,7 +1541,16 @@
                        if (isset($workorder['new_project_id']) && 
$workorder['new_project_id'] && ($workorder['new_project_id'] != 
$workorder['project_id']))
                        {
                                $new_project_id = (int) 
$workorder['new_project_id'];
+
+                               $this->db->query("SELECT ecodimb FROM 
fm_project WHERE id= $new_project_id" ,__LINE__,__FILE__);
+                               $this->db->next_record();
+                               $project_ecodimb = (int)$this->db->f('ecodimb');
+
                                $this->db->query("UPDATE fm_workorder SET 
project_id = {$new_project_id} WHERE id= {$workorder['id']}" 
,__LINE__,__FILE__);
+                               if($project_ecodimb)
+                               {
+                                       $this->db->query("UPDATE fm_workorder 
SET ecodimb = {$project_ecodimb} WHERE id= {$workorder['id']}" 
,__LINE__,__FILE__);
+                               }
                                
$historylog->add('NP',$workorder['id'],$new_project_id, 
$workorder['project_id']);
                        }
 
@@ -2324,6 +2333,12 @@
                                $this->_update_order_budget($id, $year, 
$periodization_id, (int)$budget['budget_amount'], 
(int)$budget['budget_amount'], (int)$budget['budget_amount'], $action = 
'update', true);
 
                                $this->db->query("UPDATE fm_workorder_budget 
SET active = 0 WHERE order_id = {$id} AND year = 
{$latest_year}",__LINE__,__FILE__);
+
+                               $last_day_of_year =  mktime (13 , 0, 0 ,12, 31, 
date("Y"));
+                               $now = time();
+
+                               $this->db->query("UPDATE fm_workorder SET 
start_date = {$now}, end_date = {$last_day_of_year} WHERE id = 
{$id}",__LINE__,__FILE__);
+
                        }
                        else if($project_type_id == 2)//investment
                        {

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2014-01-14 19:19:32 UTC 
(rev 11596)
+++ trunk/property/inc/class.uiworkorder.inc.php        2014-01-15 20:43:43 UTC 
(rev 11597)
@@ -1411,16 +1411,40 @@
  */
                                if( $project['start_date'] && 
!$values['start_date'])
                                {
-                                       
$values['start_date']=$project['start_date'];
+                                       
if($project['project_type_id']==1)//operation
+                                       {
+                                               $values['start_date'] = 
$GLOBALS['phpgw']->common->show_date(time(),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                                       }
+                                       else
+                                       {
+                                               
$values['start_date']=$project['start_date'];
+                                       }
                                }
+
+                               $last_day_of_year =  mktime (13 , 0, 0 ,12, 31, 
date("Y"));
+
                                if( $project['end_date'] && 
!$values['end_date'])
                                {
-                                       
$values['end_date']=$project['end_date'];
+                                       
if($project['project_type_id']==1)//operation
+                                       {
+                                               $values['end_date'] = 
$GLOBALS['phpgw']->common->show_date($last_day_of_year, 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                                       }
+                                       else
+                                       {
+                                               
$values['end_date']=$project['end_date'];
+                                       }
                                }
                                else if( !$project['end_date'] && 
!$values['end_date'])
                                {
-                                       
$values['end_date']=$project['end_date'];
-                                       $values['end_date'] = 
$GLOBALS['phpgw']->common->show_date(time(),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+
+                                       
if($project['project_type_id']==1)//operation
+                                       {
+                                               $values['end_date'] = 
$GLOBALS['phpgw']->common->show_date($last_day_of_year, 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                                       }
+                                       else
+                                       {
+                                               $values['end_date'] = 
$GLOBALS['phpgw']->common->show_date(time(),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                                       }
                                }
 
                                if( $project['name'] && 
!isset($values['title']))
@@ -2037,6 +2061,7 @@
                                'lang_calculate'                                
                => lang('Calculate Workorder'),
                                'lang_calculate_statustext'                     
        => lang('Calculate workorder by adding items from vendors prizebook or 
adding general hours'),
 
+
                                'lang_send'                                     
                        => $this->bo->order_sent_adress ? lang('ReSend 
Workorder') :lang('Send Workorder'),
                                'lang_send_statustext'                          
        => lang('send this workorder to vendor'),