[Fmsystem-commits] [9000] property: list amount as ordered

[Sigurd Nes]

Revision: 9000
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9000
Author:   sigurdne
Date:     2012-03-20 19:23:44 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
property: list amount as ordered

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-20 18:04:19 UTC (rev 
8999)
+++ trunk/property/inc/class.soproject.inc.php  2012-03-20 19:23:44 UTC (rev 
9000)
@@ -706,6 +706,10 @@
                                        }
                                        
                                        $project['combined_cost']       += 
($_sum - $__actual_cost);
+                                       if($project['combined_cost'] < 0)
+                                       {
+                                               $project['combined_cost'] = 0;
+                                       }
                                        $project['actual_cost']         += 
$_actual_cost;
                                        $project['billable_hours']      += 
(int)$this->db->f('billable_hours');
                                }
@@ -1424,6 +1428,7 @@
                                $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}");
                        }
 
                        $receipt['id'] = $project['id'];
@@ -1600,7 +1605,7 @@
                                                'project_id'            => 
$project_id,
                                                'year'                          
=> $year ,
                                                'budget'                        
=> 0,
-                                               'sum_orders'                    
=> isset($cost_info['sum_orders']) && $cost_info['sum_orders'] ? 
$cost_info['sum_orders'] : 0,
+                                               'sum_orders'            => 
isset($cost_info['sum_orders']) && $cost_info['sum_orders'] > 0 ? 
$cost_info['sum_orders'] : 0,
                                                'actual_cost'           => 
isset($cost_info['actual_cost']) && $cost_info['actual_cost'] ? 
$cost_info['actual_cost'] : 0,
                                                'user_id'                       
=> 0,
                                                'entry_date'            => 0,

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2012-03-20 18:04:19 UTC (rev 
8999)
+++ trunk/property/inc/class.uiproject.inc.php  2012-03-20 19:23:44 UTC (rev 
9000)
@@ -1385,7 +1385,7 @@
 
                                if(!isset($values['workorder_budget']) && $save)
                                {
-                                       
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=> 
'property.uiworkorder.edit', 'project_id'=> $id));
+//                                     
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=> 
'property.uiworkorder.edit', 'project_id'=> $id));
                                }
 
                                if 
(!$this->bocommon->check_perms($values['grants'],PHPGW_ACL_EDIT))