[Fmsystem-commits] [9839] proprty: caclulation

[Sigurd Nes]

Revision: 9839
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9839
Author:   sigurdne
Date:     2012-08-10 08:39:48 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
proprty: caclulation

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

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2012-08-08 13:42:56 UTC (rev 
9838)
+++ trunk/property/inc/class.soproject.inc.php  2012-08-10 08:39:48 UTC (rev 
9839)
@@ -722,7 +722,7 @@
                                                $project['actual_cost']         
+= $_actual_cost;
                                        }
 
-                                       if($project['budget'] > 0)
+                                       if($project['budget'] >= 0)
                                        {
                                                if($project['combined_cost'] < 
0)
                                                {

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2012-08-08 13:42:56 UTC 
(rev 9838)
+++ trunk/property/inc/class.soworkorder.inc.php        2012-08-10 08:39:48 UTC 
(rev 9839)
@@ -1540,8 +1540,10 @@
 
                function recalculate()
                {
-                       $this->db->query("SELECT id FROM 
fm_workorder",__LINE__,__FILE__);
+                       set_time_limit (0);
 
+                       $this->db->query("SELECT id FROM fm_workorder ORDER BY 
id ASC",__LINE__,__FILE__);
+
                        $orders = array();
                        while ($this->db->next_record())
                        {