[Fmsystem-commits] [8916] property: fix sql

[Sigurd Nes]

Revision: 8916
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8916
Author:   sigurdne
Date:     2012-02-17 10:18:55 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
property: fix sql

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

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2012-02-17 10:16:06 UTC (rev 
8915)
+++ trunk/property/inc/class.soproject.inc.php  2012-02-17 10:18:55 UTC (rev 
8916)
@@ -1346,7 +1346,7 @@
                        $config->read();
                        $tax = 1+(($config->config_data['fm_tax'])/100);
 
-                       $sql = "SELECT fm_workorder.id, EXTRACT(YEAR from 
to_timestamp(start_date) ) as year, calculation, budget, contract_sum"
+                       $sql = "SELECT fm_workorder.id, EXTRACT(YEAR from 
to_timestamp(start_date) ) as year, sum(calculation) as calculation, 
sum(budget) as budget, sum(contract_sum) as contract_sum"
                        . " FROM fm_workorder"
                        . " {$this->join} fm_workorder_status ON 
fm_workorder.status  = fm_workorder_status.id"
                        . " WHERE project_id = {$project_id} AND 
(fm_workorder_status.closed IS NULL OR fm_workorder_status.closed != 1)"