[Fmsystem-commits] [15914] more on reporting

[sigurdne]

Revision: 15914
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15914
Author:   sigurdne
Date:     2016-10-30 14:23:32 +0000 (Sun, 30 Oct 2016)
Log Message:
-----------
more on reporting

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.soproject.inc.php

Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php    
2016-10-30 14:09:28 UTC (rev 15913)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php    
2016-10-30 14:23:32 UTC (rev 15914)
@@ -2328,11 +2328,10 @@
                                        $budget_acc              = 0;
                                }
 
+                               $_diff_start     = abs($entry['budget']) > 0 ? 
$entry['budget'] : $entry['sum_orders'];
+                               $entry['diff']   = $_diff_start - 
$entry['sum_oblications'] - $entry['actual_cost'];
                                if(abs($entry['actual_cost']) > 0 || 
$entry['period'] < date('Ym'))
                                {
-                                       $_diff_start     = 
abs($entry['budget']) > 0 ? $entry['budget'] : $entry['sum_orders'];
-                                       $entry['diff']   = $_diff_start - 
$entry['sum_oblications'] - $entry['actual_cost'];
-
                                        $_deviation      = $entry['budget'] - 
$entry['actual_cost'];
                                        $deviation       = $_deviation;
                                        $deviation_acc += $deviation;
@@ -2340,7 +2339,6 @@
                                }
                                else
                                {
-                                       $entry['diff']   = 0;
                                        $deviation               = 0;
                                }