[Fmsystem-commits] [10968] Property: budget handling

[Sigurd Nes]

Revision: 10968
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10968
Author:   sigurdne
Date:     2013-03-05 18:57:52 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
Property: budget handling

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

Modified: trunk/property/inc/class.sobudget.inc.php
===================================================================
--- trunk/property/inc/class.sobudget.inc.php   2013-03-05 12:03:55 UTC (rev 
10967)
+++ trunk/property/inc/class.sobudget.inc.php   2013-03-05 18:57:52 UTC (rev 
10968)
@@ -651,7 +651,7 @@
                                $_taxcode[$this->db->f('id')] = 
$this->db->f('percent');
                        }
 
-                       $sql = "SELECT fm_workorder.id AS id, 
sum(fm_orders_paid_or_pending_view.amount) AS actual_cost,fm_location1.mva,"
+                       $sql = "SELECT DISTINCT fm_workorder.id AS id, 
sum(fm_orders_paid_or_pending_view.amount) AS actual_cost,fm_location1.mva,"
                                . " fm_b_account.{$b_account_field} as 
{$b_account_field}, district_id, fm_workorder.ecodimb"
                                . " FROM fm_workorder"
                                . " {$this->join} fm_workorder_status ON 
fm_workorder.status = fm_workorder_status.id"
@@ -684,7 +684,7 @@
                        }
 
 
-                       $sql = "SELECT fm_workorder.id, 
fm_workorder_status.closed, fm_workorder.budget, 
fm_workorder.combined_cost,fm_location1.mva,fm_workorder.start_date,"
+                       $sql = "SELECT DISTINCT fm_workorder.id, 
fm_workorder_status.closed, fm_workorder.budget, 
fm_workorder.combined_cost,fm_location1.mva,fm_workorder.start_date,"
                                . " fm_b_account.{$b_account_field} as 
{$b_account_field}, district_id, fm_workorder.ecodimb"
                                . " FROM fm_workorder"
                                . " {$this->join} fm_workorder_status ON 
fm_workorder.status = fm_workorder_status.id"