[Fmsystem-commits] [10677] property: budget listing

[Sigurd Nes]

Revision: 10677
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10677
Author:   sigurdne
Date:     2013-01-16 08:35:25 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
property: budget listing

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

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2013-01-15 20:33:58 UTC (rev 
10676)
+++ trunk/property/inc/class.soproject.inc.php  2013-01-16 08:35:25 UTC (rev 
10677)
@@ -756,7 +756,8 @@
                                                {
                                                        
$this->db2->query("SELECT sum(fm_workorder_budget.budget) AS budget,"
                                                         . " 
sum(fm_workorder_budget.combined_cost) AS combined_cost"
-                                                        . " FROM 
fm_workorder_budget WHERE year = {$filter_year} AND order_id =" . 
$this->db->f('id'),__LINE__,__FILE__);
+//                                                      . " FROM 
fm_workorder_budget WHERE year = {$filter_year} AND order_id =" . 
$this->db->f('id'),__LINE__,__FILE__);
+                                                        . " FROM 
fm_workorder_budget WHERE active =1 AND order_id =" . 
$this->db->f('id'),__LINE__,__FILE__);
                                                         
$this->db2->next_record();
 
                                                        $_combined_cost = 
$this->db2->f('combined_cost');