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

[Sigurd Nes]

Revision: 11642
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11642
Author:   sigurdne
Date:     2014-01-28 19:50:12 +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 19:25:00 UTC (rev 
11641)
+++ trunk/property/inc/class.sobudget.inc.php   2014-01-28 19:50:12 UTC (rev 
11642)
@@ -717,27 +717,26 @@
                                        if($budget['year'] == $year)
                                        {
 
+                                               if($budget['period'] != 
"{$year}00" && $filter_period && ((int)$filter_period) < (int)$budget['period'])
+                                               {
+                                                       break;
+                                               }
+
                                                $_taxfactor             = 1 + 
($_taxcode[(int)$order_info['mva']]/100);
                                                $_actual_cost   = 
round($budget['actual_cost']/$_taxfactor);
 
                                                $sum_actual_cost += 
$_actual_cost;
-                                               
if($budget['actual_period']==$filter_period)
+                                               
if((int)$budget['actual_period']==(int)$filter_period)
                                                {
                                                        
$actual_cost_period[$order_info['b_account']][$order_info['district_id']][$order_info['ecodimb']]
 += $_actual_cost;
                                                        $sum_actual_cost_period 
+= $_actual_cost;
                                                }
+//$_periods[] = $budget['actual_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($budget['period'] != 
"{$year}00" && $filter_period && ((int)$filter_period) < (int)$budget['period'])
-                                               {
-                                                       break;
-                                               }
-
-//$_periods[] = $budget['period'];
                                        }
 
                                        if(!$_count)
@@ -751,7 +750,7 @@
                                }
                        }
 
-
+//_debug_array($_periods);
 //                     _debug_array($obligations);
 
                        //----------- ad hoc order