[Fmsystem-commits] [9043] property: move orders to new project

[Sigurd Nes]

Revision: 9043
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9043
Author:   sigurdne
Date:     2012-03-27 08:46:13 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
property: move orders to new project

Modified Paths:
--------------
    trunk/property/inc/class.soproject.inc.php
    trunk/property/inc/class.uiproject.inc.php

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2012-03-27 08:20:42 UTC (rev 
9042)
+++ trunk/property/inc/class.soproject.inc.php  2012-03-27 08:46:13 UTC (rev 
9043)
@@ -1443,7 +1443,8 @@
                                $this->db->query("UPDATE fm_project SET budget 
= {$new_budget_new_project}, reserve = reserve + {$reserve_old_project} WHERE 
id = {$new_project_id}" ,__LINE__,__FILE__);
                                $this->db->query("UPDATE fm_project SET budget 
= 0, reserve = 0 WHERE id =  " . (int)$project['id'] ,__LINE__,__FILE__);
                                $this->db->query("DELETE FROM fm_project_budget 
WHERE project_id =  " . (int)$project['id'] ,__LINE__,__FILE__);
-                               
$historylog->add('RM',(int)$project['id'],"Budsjett og alle bestillinger er 
flyttet fra prosjekt {$project['id']} til prosjekt {$new_project_id}");
+                               
$historylog->add('RM',(int)$project['id'],"Budsjett og alle bestillinger er 
overført fra prosjekt {$project['id']} til prosjekt {$new_project_id}");
+                               $historylog->add('RM',$new_project_id,"Budsjett 
og alle bestillinger er overført fra prosjekt {$project['id']} til prosjekt 
{$new_project_id}");
                        }
 
                        $receipt['id'] = $project['id'];

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2012-03-27 08:20:42 UTC (rev 
9042)
+++ trunk/property/inc/class.uiproject.inc.php  2012-03-27 08:46:13 UTC (rev 
9043)
@@ -1379,6 +1379,8 @@
                        $record_history = array();
                        if(isset($bypass_error) || ((!isset($receipt['error']) 
|| $add_request) && !$bypass) && $id)
                        {
+                               $_transfer_new_project = 
isset($values['new_project_id']) && $values['new_project_id'] ? true : false;
+                               
                                $values = $this->bo->read_single($id);
 
                                if(!isset($values['origin']))
@@ -1386,7 +1388,7 @@
                                        $values['origin'] = '';
                                }
 
-                               if(!isset($values['workorder_budget']) && $save 
&& !$values['new_project_id'])
+                               if(!isset($values['workorder_budget']) && $save 
&& !$_transfer_new_project)
                                {
                                        
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=> 
'property.uiworkorder.edit', 'project_id'=> $id));
                                }