[Fmsystem-commits] [11801] property: more on budget handling

[Sigurd Nes]

Revision: 11801
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11801
Author:   sigurdne
Date:     2014-03-09 21:36:56 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
property: more on budget handling

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

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2014-03-09 18:46:35 UTC 
(rev 11800)
+++ trunk/property/inc/class.soworkorder.inc.php        2014-03-09 21:36:56 UTC 
(rev 11801)
@@ -2072,8 +2072,12 @@
                                        if(!in_array($periode, 
$_start_period_remainig))
                                        {
                                                $_temp_obligation = 
$order_budget[$periode]['combined_cost'] - 
$_orders_paid_or_pending['actual_cost'];
-                                               $_sum_year_remaining_cost += 
$_temp_obligation;
-                                               
$order_budget[$periode]['combined_cost'] -= $_temp_obligation;
+                                               //FIXME
+                                               
if(((int)$order_budget[$periode]['combined_cost'] * 
(int)$_orders_paid_or_pending['actual_cost']) > 0)
+                                               {
+                                                       
$_sum_year_remaining_cost += $_temp_obligation;
+                                                       
$order_budget[$periode]['combined_cost'] -= $_temp_obligation;
+                                               }
                                        }
                                }
 
@@ -2144,7 +2148,10 @@
                                        if($active_period[$period] == 1)
                                        {
                                                $_sum_oblications += 
$_budget['combined_cost'];
-                                               $_sum_oblications -= 
$_budget['actual_cost'];
+                                               if(((int)$_budget['budget'] * 
(int)$_budget['actual_cost']) > 0)
+                                               {
+                                                       $_sum_oblications -= 
$_budget['actual_cost'];
+                                               }
 
                                                if($_budget['budget'] >= 0)
                                                {