[Fmsystem-commits] [13801] Syncromind: Merge 13792:13800 from trunk

[Sigurd Nes]

Revision: 13801
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13801
Author:   sigurdne
Date:     2015-08-28 10:37:36 +0000 (Fri, 28 Aug 2015)
Log Message:
-----------
Syncromind: Merge 13792:13800 from trunk

Modified Paths:
--------------
    branches/dev-syncromind/rental/inc/class.socontract.inc.php
    branches/dev-syncromind/sms/bin/default/set_workorder_status.php

Property Changed:
----------------
    branches/dev-syncromind/


Property changes on: branches/dev-syncromind
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399,13401-13432,13434-13481,13483-13506,13542-13602,13604-13653,13656-13668,13670-13689,13691-13726,13731-13773,13775,13778-13791
   + /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399,13401-13432,13434-13481,13483-13506,13542-13602,13604-13653,13656-13668,13670-13689,13691-13726,13731-13773,13775,13778-13791,13793-13800

Modified: branches/dev-syncromind/rental/inc/class.socontract.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.socontract.inc.php 2015-08-28 
10:34:40 UTC (rev 13800)
+++ branches/dev-syncromind/rental/inc/class.socontract.inc.php 2015-08-28 
10:37:36 UTC (rev 13801)
@@ -1042,13 +1042,14 @@
        $success_parties = true;
        $success_price_items = true;
 
-       //composites
+       $db2 = clone($this->db);
+               //composites
        $this->db->query($q_composites);
        while($this->db->next_record()){
                $composite_id = 
$this->unmarshal($this->db->f('composite_id'),'int');
                $composite_id = $this->marshal($composite_id, 'int');
                $sql = "INSERT INTO rental_contract_composite (contract_id, 
composite_id) VALUES ({$contract_id}, {$composite_id})";
-               $result_composites = $this->db->query($sql);
+               $result_composites = $db2->query($sql);
                if($result_composites){
                        //noop
                }
@@ -1057,7 +1058,7 @@
                }
        }
 
-       //parties
+               //parties
         $this->db->query($q_parties);
        while($this->db->next_record()){
                $party_id = $this->unmarshal($this->db->f('party_id'),'int');
@@ -1065,7 +1066,7 @@
                $is_payer = $this->unmarshal($this->db->f('is_payer'),'bool');
                $is_payer = $this->marshal($is_payer ? 'true' : 'false','bool');
                $sql = "INSERT INTO rental_contract_party (contract_id, 
party_id, is_payer) VALUES ({$contract_id}, {$party_id}, {$is_payer})";
-               $result_parties = $this->db->query($sql);
+               $result_parties = $db2->query($sql);
                if($result_parties){
                        //noop
                }
@@ -1096,7 +1097,7 @@
                $is_one_time = 
$this->unmarshal($this->db->f('is_one_time'),'bool');
                $is_one_time = $this->marshal($is_one_time ? 'true' : 
'false','bool');
                $sql = "INSERT INTO rental_contract_price_item (price_item_id, 
contract_id, title, area, count, agresso_id, is_area, price, total_price, 
is_one_time, date_start, date_end) VALUES ({$price_item_id}, {$contract_id}, 
{$title}, {$area}, {$count}, {$agresso_id}, {$is_area}, {$price}, 
{$total_price}, {$is_one_time}, null, null)";
-               $result_price_items = $this->db->query($sql);
+               $result_price_items = $db2->query($sql);
                if($result_price_items){
                        //noop
                }

Modified: branches/dev-syncromind/sms/bin/default/set_workorder_status.php
===================================================================
--- branches/dev-syncromind/sms/bin/default/set_workorder_status.php    
2015-08-28 10:34:40 UTC (rev 13800)
+++ branches/dev-syncromind/sms/bin/default/set_workorder_status.php    
2015-08-28 10:37:36 UTC (rev 13801)
@@ -67,7 +67,7 @@
 
                                $this->db->query("SELECT count(fm_workorder.id) 
AS closed_orders_at_project"
                                . " FROM fm_workorder"
-                               . " {$this->join} fm_workorder_status ON 
(fm_workorder.status = fm_workorder_status.id)"
+                               . " JOIN fm_workorder_status ON 
(fm_workorder.status = fm_workorder_status.id)"
                                . " WHERE project_id= {$project_id}"
                                . " AND (fm_workorder_status.closed = 1 OR 
fm_workorder_status.delivered = 1)", __LINE__, __FILE__);
 
@@ -76,7 +76,7 @@
 
                                $this->db->query("SELECT 
fm_project_status.closed AS closed_project, fm_project.status as old_status"
                                . " FROM fm_project"
-                               . " {$this->join} fm_project_status ON 
(fm_project.status = fm_project_status.id)"
+                               . " JOIN fm_project_status ON 
(fm_project.status = fm_project_status.id)"
                                . " WHERE fm_project.id= {$project_id}", 
__LINE__, __FILE__);
 
                                $this->db->next_record();