[Fmsystem-commits] [11763] admin: formattingproperty: update project budget based on orders

[Sigurd Nes]

Revision: 11763
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11763
Author:   sigurdne
Date:     2014-02-27 14:04:27 +0000 (Thu, 27 Feb 2014)
Log Message:
-----------
admin: formattingproperty: update project budget based on orders

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  2014-02-27 10:33:00 UTC (rev 
11762)
+++ trunk/property/inc/class.soproject.inc.php  2014-02-27 14:04:27 UTC (rev 
11763)
@@ -3070,11 +3070,11 @@
                        $project_id              = (int) $project_id;
                        $year                    = $year ? (int) $year : 
date('Y');
                        $current_year    = date('Y');
-                       $activate                = true;
+                       $activate                = false;
 
-                       if($year < $current_year)
+                       if($year == $current_year)
                        {
-                               $activate = false;
+                               $activate = true;
                        }
 
                        $ids = array();

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2014-02-27 10:33:00 UTC 
(rev 11762)
+++ trunk/property/inc/class.soworkorder.inc.php        2014-02-27 14:04:27 UTC 
(rev 11763)
@@ -2391,7 +2391,23 @@
                protected function _update_project_budget($project_id, $year)
                {
                        $soproject = CreateObject('property.soproject');
-                       
$soproject->check_and_update_project_budget($project_id, $year);
+
+                       $years  = array();
+                       $ids    = array();
+                       $this->db->query("SELECT id FROM fm_workorder WHERE 
project_id = {$project_id}", __LINE__, __FILE__);
+                       while($this->db->next_record())
+                       {
+                               $ids[] = $this->db->f('id');
+                       }
+                       $this->db->query("SELECT DISTINCT year FROM 
fm_workorder_budget WHERE order_id IN (" . implode(',', $ids) . ')', __LINE__, 
__FILE__);
+                       while ($this->db->next_record())
+                       {
+                               $years[] = $this->db->f('year');
+                       }
+                       foreach($years as $_year)
+                       {
+                               
$soproject->check_and_update_project_budget($project_id, $_year);
+                       }
                }
 
                /**