[Fmsystem-commits] [11930] property: use combined cost as budget when budget is not given

[Sigurd Nes]

Revision: 11930
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11930
Author:   sigurdne
Date:     2014-04-30 07:43:10 +0000 (Wed, 30 Apr 2014)
Log Message:
-----------
property: use combined cost as budget when budget is not given

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

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2014-04-29 12:33:25 UTC 
(rev 11929)
+++ trunk/property/inc/class.soworkorder.inc.php        2014-04-30 07:43:10 UTC 
(rev 11930)
@@ -1837,7 +1837,7 @@
                                (
                                        'order_id'               => $order_id,
                                        'start_period'   => date('Ym', 
$this->db->f('start_date')), //bigint
-                                       'budget'                 => $budget,
+                                       'budget'                 => $budget ? 
$budget : $combined_cost,
                                        'combined_cost'  => $combined_cost,
                                        'year'                   => $year,
                                        'month'                  => $month,
@@ -1858,7 +1858,7 @@
                                }
                                if($continuous)
                                {
-                                       $sum_year_budget[$year] += $budget;
+                                       $sum_year_budget[$year] += $budget ? 
$budget : $combined_cost;
                                        $sum_year_combined_cost[$year] += 
$combined_cost;
                                }
                        }