[Fmsystem-commits] [8999] property: list amount as ordered

[Sigurd Nes]

Revision: 8999
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8999
Author:   sigurdne
Date:     2012-03-20 18:04:19 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
property: list amount as ordered

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-03-20 14:44:53 UTC (rev 
8998)
+++ trunk/property/inc/class.soproject.inc.php  2012-03-20 18:04:19 UTC (rev 
8999)
@@ -671,9 +671,11 @@
                                $this->db->query($sql_workder);
                                while ($this->db->next_record())
                                {
+                                       $closed = false;
                                        if($this->db->f('closed'))
                                        {
                                                $_sum = 0;
+                                               $closed = true;
                                        }
                                        else if($this->db->f('contract_sum') > 
0)
                                        {
@@ -693,7 +695,17 @@
                                        }
 
                                        $_actual_cost = 
(int)$this->db->f('actual_cost');
-                                       $project['combined_cost']       += 
($_sum - $_actual_cost);
+
+                                       if($closed)
+                                       {
+                                               $__actual_cost = 0;
+                                       }
+                                       else
+                                       {
+                                               $__actual_cost = $_actual_cost;
+                                       }
+                                       
+                                       $project['combined_cost']       += 
($_sum - $__actual_cost);
                                        $project['actual_cost']         += 
$_actual_cost;
                                        $project['billable_hours']      += 
(int)$this->db->f('billable_hours');
                                }