[Fmsystem-commits] [12008] property: fetch ecodimb from project rather than order

[Sigurd Nes]

Revision: 12008
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12008
Author:   sigurdne
Date:     2014-06-06 07:58:37 +0000 (Fri, 06 Jun 2014)
Log Message:
-----------
property: fetch ecodimb from project rather than order

Modified Paths:
--------------
    trunk/property/inc/class.soinvoice.inc.php
    trunk/property/inc/cron/default/Import_fra_agresso_X205.php

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2014-06-05 08:44:58 UTC (rev 
12007)
+++ trunk/property/inc/class.soinvoice.inc.php  2014-06-06 07:58:37 UTC (rev 
12008)
@@ -2145,7 +2145,7 @@
                        $order_info      = array();
                        $toarray         = array();
                        $order_id        = (int) $order_id;
-                       $sql             = "SELECT 
fm_workorder.location_code,fm_workorder.vendor_id,fm_workorder.account_id,fm_workorder.ecodimb,fm_workorder.category,
 fm_workorder.user_id,fm_workorder.title"
+                       $sql             = "SELECT 
fm_workorder.location_code,fm_workorder.vendor_id,fm_workorder.account_id,fm_project.ecodimb,fm_workorder.category,
 fm_workorder.user_id,fm_workorder.title"
                        . " FROM fm_workorder {$this->join} fm_project ON 
fm_workorder.project_id = fm_project.id WHERE fm_workorder.id = {$order_id}";
                        $this->db->query($sql, __LINE__, __FILE__);
                        if($this->db->next_record())

Modified: trunk/property/inc/cron/default/Import_fra_agresso_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_agresso_X205.php 2014-06-05 
08:44:58 UTC (rev 12007)
+++ trunk/property/inc/cron/default/Import_fra_agresso_X205.php 2014-06-06 
07:58:37 UTC (rev 12008)
@@ -738,7 +738,7 @@
                        $order_info = array();
                        $toarray = array();
                        $order_id = (int) $order_id;
-                       $sql = "SELECT 
fm_workorder.location_code,fm_workorder.vendor_id,fm_workorder.account_id,fm_workorder.ecodimb,fm_workorder.category,
 fm_workorder.user_id,fm_workorder.title"
+                       $sql = "SELECT 
fm_workorder.location_code,fm_workorder.vendor_id,fm_workorder.account_id,fm_project.ecodimb,fm_workorder.category,
 fm_workorder.user_id,fm_workorder.title"
                        . " FROM fm_workorder {$this->join} fm_project ON 
fm_workorder.project_id = fm_project.id WHERE fm_workorder.id = {$order_id}";
                        $this->db->query($sql,__LINE__,__FILE__);
                        if(     $this->db->next_record())