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

[Sigurd Nes]

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

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

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2014-03-07 14:21:44 UTC (rev 
11796)
+++ trunk/property/inc/class.soproject.inc.php  2014-03-09 11:36:18 UTC (rev 
11797)
@@ -2209,7 +2209,8 @@
                                $month                   = 
substr($entry['period'], 4, 2);
                                $entry['month']  = $month == '00' ? '' : $month;
 
-                               if($closed_period[$entry['period']])
+                               //if($closed_period[$entry['period']])
+                               if(abs($entry['actual_cost']) > 0 )
                                {
                                        $_diff_start     = 
abs($entry['budget']) > 0 ? $entry['budget'] : $entry['sum_orders'];
                                        $entry['diff']   = $_diff_start - 
$entry['sum_oblications'] - $entry['actual_cost'];

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2014-03-07 14:21:44 UTC 
(rev 11796)
+++ trunk/property/inc/class.soworkorder.inc.php        2014-03-09 11:36:18 UTC 
(rev 11797)
@@ -1780,7 +1780,7 @@
                        }
                        $continuous = false;
 
-                       $cached_info = phpgwapi_cache::system_get('property', 
"budget_order_{$order_id}");
+//                     $cached_info = phpgwapi_cache::system_get('property', 
"budget_order_{$order_id}");
 
                        if($cached_info)
                        {
@@ -2204,7 +2204,8 @@
                        $budget_acc              = 0;
                        foreach($values as &$entry)
                        {
-                               if($closed_period[$entry['period']])
+//                             if($closed_period[$entry['period']])
+                               if( abs($entry['actual_cost']) > 0 )
                                {
                                        $_diff_start     = 
abs($entry['budget']) > 0 ? $entry['budget'] : $entry['sum_orders'];
                                        $entry['diff']   = $_diff_start - 
$entry['sum_oblications'] - $entry['actual_cost'];