[Fmsystem-commits] [15072] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15072
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15072
Author:   sigurdne
Date:     2016-05-13 12:06:19 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.soworkorder.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.soworkorder.inc.php    
2016-05-13 12:06:16 UTC (rev 15071)
+++ branches/dev-syncromind-2/property/inc/class.soworkorder.inc.php    
2016-05-13 12:06:19 UTC (rev 15072)
@@ -928,7 +928,7 @@
                                        'key_deliver' => 
$this->db->f('key_deliver'),
                                        'key_responsible' => 
$this->db->f('key_responsible'),
                                        'charge_tenant' => 
$this->db->f('charge_tenant'),
-                                       'descr' => 
stripslashes($this->db->f('descr')),
+                                       'descr' => $this->db->f('descr',true),
                                        'status' => $this->db->f('status'),
                                        'calculation' => 
$this->db->f('calculation'),
                                        'b_account_id' => 
(int)$this->db->f('account_id'),
@@ -968,7 +968,12 @@
                                        'tax_code' => $this->db->f('tax_code'),
                                        'unspsc_code' => 
$this->db->f('unspsc_code'),
                                        'service_id' => 
$this->db->f('service_id'),
-                               );
+                                       'building_part' => 
$this->db->f('building_part'),
+                                       'order_dim1' => 
$this->db->f('order_dim1'),
+                                       'order_sent' => 
$this->db->f('order_sent'),
+                                       'order_received' => 
$this->db->f('order_received'),
+                                       'order_received_percent' => 
$this->db->f('order_received_percent')
+                                       );
 
                                $sql = "SELECT periodization_id,"
                                        . " sum(fm_workorder_budget.budget) AS 
budget, sum(fm_workorder_budget.combined_cost) AS combined_cost,"
@@ -1262,6 +1267,8 @@
                                $workorder['tax_code'],
                                $workorder['unspsc_code'],
                                $workorder['service_id'],
+                               $workorder['building_part'],
+                               $workorder['order_dim1'],
                                isset($workorder['vendor_email']) && 
is_array($workorder['vendor_email']) ? implode(',', $workorder['vendor_email']) 
: ''
                        );
 
@@ -1271,7 +1278,7 @@
                                . 
"tender_received,inspection_on_completion,status,"
                                . 
"descr,budget,combined_cost,account_id,rig_addition,addition,key_deliver,key_fetch,vendor_id,charge_tenant,"
                                . 
"user_id,ecodimb,category,billable_hours,contract_sum,approved,continuous,fictive_periodization,"
-                               . "contract_id, tax_code, unspsc_code, 
service_id, mail_recipients  $cols) "
+                               . "contract_id, tax_code, unspsc_code, 
service_id,building_part, order_dim1, mail_recipients  $cols) "
                                . "VALUES ( {$values} {$vals})", __LINE__, 
__FILE__);
 
                        $this->db->query("INSERT INTO fm_orders (id,type) 
VALUES ({$id},'workorder')");
@@ -1413,6 +1420,8 @@
                                'tax_code' => $workorder['tax_code'],
                                'unspsc_code' => $workorder['unspsc_code'],
                                'service_id' => $workorder['service_id'],
+                               'building_part' => $workorder['building_part'],
+                               'order_dim1' => $workorder['order_dim1'],
                                'mail_recipients' => 
isset($workorder['vendor_email']) && is_array($workorder['vendor_email']) ? 
implode(',', $workorder['vendor_email']) : '',
                        );