[Fmsystem-commits] [11640] Property: more on monthly filter on accounting

[Sigurd Nes]

Revision: 11640
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11640
Author:   sigurdne
Date:     2014-01-28 19:23:10 +0000 (Tue, 28 Jan 2014)
Log Message:
-----------
Property: more on monthly filter on accounting

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

Modified: trunk/property/inc/class.sobudget.inc.php
===================================================================
--- trunk/property/inc/class.sobudget.inc.php   2014-01-28 14:33:07 UTC (rev 
11639)
+++ trunk/property/inc/class.sobudget.inc.php   2014-01-28 19:23:10 UTC (rev 
11640)
@@ -727,16 +727,17 @@
                                                        $sum_actual_cost_period 
+= $_actual_cost;
                                                }
 
+                                               $sum_obligation_cost += 
$budget['sum_oblications'];
+                                               
$obligations[$order_info['b_account']][$order_info['district_id']][$order_info['ecodimb']]
 += $budget['sum_oblications'];
+
+                                               
$actual_cost[$order_info['b_account']][$order_info['district_id']][$order_info['ecodimb']]
 += $_actual_cost;
+
                                                if($budget['period'] != 
"{$year}00" && $filter_period && ((int)$filter_period) < (int)$budget['period'])
                                                {
                                                        break;
                                                }
 
 //$_periods[] = $budget['period'];
-                                               $sum_obligation_cost += 
$budget['sum_oblications'];
-                                               
$obligations[$order_info['b_account']][$order_info['district_id']][$order_info['ecodimb']]
 += $budget['sum_oblications'];
-
-                                               
$actual_cost[$order_info['b_account']][$order_info['district_id']][$order_info['ecodimb']]
 += $_actual_cost;
                                        }
 
                                        if(!$_count)