[Fmsystem-commits] [12095] property: close project on last order

[Sigurd Nes]

Revision: 12095
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12095
Author:   sigurdne
Date:     2014-09-17 11:03:52 +0000 (Wed, 17 Sep 2014)
Log Message:
-----------
property: close project on last order

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

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2014-09-17 10:40:39 UTC (rev 
12094)
+++ trunk/property/inc/class.soinvoice.inc.php  2014-09-17 11:03:52 UTC (rev 
12095)
@@ -979,6 +979,7 @@
                                                        {
                                                                
$historylog_workorder->add($entry, $id, $status_code[$entry]);
                                                                
$GLOBALS['phpgw']->db->query("UPDATE fm_workorder set 
status='{$status_code[$entry]}' WHERE id = {$id}");
+                                                               
execMethod('property.soworkorder.check_project_status', $id);
                                                                
$receipt['message'][] = array('msg' => lang('Workorder %1 is %2', $id, 
$status_code[$entry]));
                                                        }
                                                        break;

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2014-09-17 10:40:39 UTC 
(rev 12094)
+++ trunk/property/inc/class.soworkorder.inc.php        2014-09-17 11:03:52 UTC 
(rev 12095)
@@ -1615,8 +1615,14 @@
                        return $receipt;
                }
 
+               /**
+                * Close project if all orders is closed
+                * @param integer $order_id
+                * @return boolean true if mother project is closed as a result 
on all orders closed
+                */
                public function check_project_status($order_id)
                {
+                       $ret = false;
                        $config = CreateObject('phpgwapi.config', 'property');
                        $config->read_repository();
 
@@ -1649,8 +1655,10 @@
 
                                        $historylog_project->add('S', 
$project_id, $project_status_on_last_order_closed, $old_status);
                                        $historylog_project->add('RM', 
$project_id, 'Status endret ved at siste bestilling er avsluttet');
+                                       $ret = true;
                                }
                        }
+                       return $ret;
                }
 
                function delete($workorder_id)