[Fmsystem-commits] [16480] property: more on budget

[sigurdne]

Revision: 16480
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16480
Author:   sigurdne
Date:     2017-03-25 12:02:54 -0400 (Sat, 25 Mar 2017)
Log Message:
-----------
property: more on budget

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

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2017-03-25 11:57:22 UTC (rev 
16479)
+++ trunk/property/inc/class.soproject.inc.php  2017-03-25 16:02:54 UTC (rev 
16480)
@@ -2250,10 +2250,6 @@
 
                        $project_total_budget = array_sum($project_budget);
 
-                       $sql = "SELECT fm_workorder.id AS order_id, vendor_id"
-                               . " FROM fm_workorder"
-                               . " WHERE project_id = {$project_id}";
-
                        $sql = "SELECT fm_workorder.id AS order_id, 
vendor_id,fm_workorder_status.canceled"
                                . " FROM fm_workorder"
                                . " {$this->join} fm_workorder_status ON 
fm_workorder.status = fm_workorder_status.id"

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2017-03-25 11:57:22 UTC (rev 
16479)
+++ trunk/property/inc/class.uiproject.inc.php  2017-03-25 16:02:54 UTC (rev 
16480)
@@ -1730,7 +1730,7 @@
                                        array('key' => 'budget', 'label' => 
lang('budget'), 'sortable' => false, 'className' => 'right',
                                                'formatter' => 
'JqueryPortico.FormatterAmount0', 'value_footer' => number_format($s_budget, 0, 
$this->decimal_separator, '.')),
                                        array('key' => 'sum_oblications', 
'label' => lang('sum orders'), 'sortable' => false,
-                                               'className' => 'right', 
'formatter' => 'JqueryPortico.FormatterAmount0', 'value_footer' => 
number_format($s_orders, 0, $this->decimal_separator, '.')),
+                                               'className' => 'right', 
'formatter' => 'JqueryPortico.FormatterAmount0', 'value_footer' => 
number_format($sum_oblications, 0, $this->decimal_separator, '.')),
                                        array('key' => 'actual_cost', 'label' 
=> lang('actual cost'), 'sortable' => false,
                                                'className' => 'right', 
'formatter' => 'JqueryPortico.FormatterAmount0', 'value_footer' => 
number_format($s_actual_cost, 0, $this->decimal_separator, '.')),
                                        array('key' => 'diff', 'label' => 
lang('difference'), 'sortable' => false, 'className' => 'right',