[Fmsystem-commits] [16139] more on integration

[sigurdne]

Revision: 16139
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16139
Author:   sigurdne
Date:     2017-01-04 12:16:21 +0000 (Wed, 04 Jan 2017)
Log Message:
-----------
more on integration

Modified Paths:
--------------
    trunk/property/inc/class.soproject.inc.php
    trunk/property/inc/class.uiwo_hour.inc.php
    trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
    trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2017-01-03 18:37:09 UTC (rev 
16138)
+++ trunk/property/inc/class.soproject.inc.php  2017-01-04 12:16:21 UTC (rev 
16139)
@@ -879,7 +879,8 @@
                        {
                                $project = array
                                        (
-                                       'project_id' => $this->db->f('id'),
+                                       'id' => $project_id,
+                                       'project_id' => 
$this->db->f('id'),//consider this one
                                        'project_type_id' => 
$this->db->f('project_type_id'),
                                        'title' => $this->db->f('title'),
                                        'name' => $this->db->f('name'),

Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php  2017-01-03 18:37:09 UTC (rev 
16138)
+++ trunk/property/inc/class.uiwo_hour.inc.php  2017-01-04 12:16:21 UTC (rev 
16139)
@@ -1332,7 +1332,7 @@
                                }
                                else
                                {
-                                       
if(!$this->_validate_purchase_grant($workorder_id, $project['ecodimb'] ? 
$project['ecodimb'] : $workorder['ecodimb']))
+                                       
if(!$this->_validate_purchase_grant($workorder_id, $project['ecodimb'] ? 
$project['ecodimb'] : $workorder['ecodimb'], $project['id']))
                                        {
                                                
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 
'property.uiwo_hour.view',
                                                        'workorder_id' => 
$workorder_id, 'from' => phpgw::get_var('from')));

Modified: trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
===================================================================
--- trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php      
2017-01-03 18:37:09 UTC (rev 16138)
+++ trunk/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php      
2017-01-04 12:16:21 UTC (rev 16139)
@@ -88,10 +88,10 @@
 
 
                        $DetailInfo = array();
-//                     $DetailInfo[] = array(
-//                             'TaxCode' => $param['tax_code'] // Moms kode
-//                     );
                        $DetailInfo[] = array(
+                               'TaxCode' => $param['tax_code'] // Moms kode
+                       );
+                       $DetailInfo[] = array(
                                'ReferenceCode' => array(
                                        'Code' => 'A0',
                                        'Value' => $param['dim0'] // Art

Modified: 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
===================================================================
--- 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php    
    2017-01-03 18:37:09 UTC (rev 16138)
+++ 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php    
    2017-01-04 12:16:21 UTC (rev 16139)
@@ -34,9 +34,16 @@
 //     if (!$workorder['order_sent'])
        {
                $exporter_ordre = new lag_agresso_ordre_fra_workorder();
-               $exporter_ordre->transfer($project, $workorder);
+               try
+               {
+                       $exporter_ordre->transfer($project, $workorder);
+               }
+               catch (Exception $exc)
+               {
+                       phpgwapi_cache::message_set($exc->getMessage(), 
'error');
+               }
+
        }
-
        class lag_agresso_ordre_fra_workorder
        {
                var $debug = false;