[Fmsystem-commits] [11839] more on budget handling

[Sigurd Nes]

Revision: 11839
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11839
Author:   sigurdne
Date:     2014-03-17 22:02:26 +0000 (Mon, 17 Mar 2014)
Log Message:
-----------
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-17 15:35:12 UTC 
(rev 11838)
+++ trunk/property/inc/class.soworkorder.inc.php        2014-03-17 22:02:26 UTC 
(rev 11839)
@@ -2152,15 +2152,21 @@
                         */
                        $distribution_key_remaining_period = array();
                        $distribution_key_delayed_period = array();
-                       foreach($order_budget as $period => $_budget)
+                       foreach($order_budget as $period => &$_budget)
                        {
-
                                if(isset($_start_period_remainig) && 
in_array($period, $_start_period_remainig))
                                {
-                                       if(abs($_budget['actual_cost']) > 0)
+                                       if($period <= date('Ym') && 
!abs($_budget['actual_cost']) > 0)
                                        {
+                                               $_sum_year_remaining_cost += 
$_budget['combined_cost'];
+                                               $_budget['combined_cost'] = 0;
                                                
$distribution_key_remaining_period[$period] = 0;
-                                               
$distribution_key_delayed_period[$period] = $distribution_key_remaining;
+                                               
$distribution_key_delayed_period[$period] += $distribution_key_remaining;
+                                       }
+                                       else if(abs($_budget['actual_cost']) > 
0)
+                                       {
+                                               
$distribution_key_remaining_period[$period] = 0;
+                                               
$distribution_key_delayed_period[$period] += $distribution_key_remaining;
 
                                        }
                                        else