[Fmsystem-commits] [15915] more on reporting

[sigurdne]

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

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

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2016-10-30 14:23:32 UTC (rev 
15914)
+++ trunk/property/inc/class.soproject.inc.php  2016-10-30 14:29:54 UTC (rev 
15915)
@@ -2402,18 +2402,16 @@
                                        $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;
                                }
                                else
                                {
-                                       $entry['diff'] = 0;
                                        $deviation = 0;
                                }