[Fmsystem-commits] [16258] more on integration

[sigurdne]

Revision: 16258
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16258
Author:   sigurdne
Date:     2017-02-06 11:15:02 -0500 (Mon, 06 Feb 2017)
Log Message:
-----------
more on integration

Modified Paths:
--------------
    trunk/property/inc/class.uiwo_hour.inc.php
    trunk/property/inc/cron/default/Import_fra_agresso_X205_BK.php
    trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php

Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php  2017-02-06 16:14:42 UTC (rev 
16257)
+++ trunk/property/inc/class.uiwo_hour.inc.php  2017-02-06 16:15:02 UTC (rev 
16258)
@@ -3364,7 +3364,7 @@
                                phpgw::no_access();
                        }
 
-                       $start_from = 45001065;
+                       $start_from = 45001336;
                        $sql = "SELECT id, status FROM fm_workorder WHERE id >= 
$start_from";
                        $db = & $GLOBALS['phpgw']->db;
                        $db->query($sql, __LINE__, __FILE__);

Modified: trunk/property/inc/cron/default/Import_fra_agresso_X205_BK.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_agresso_X205_BK.php      
2017-02-06 16:14:42 UTC (rev 16257)
+++ trunk/property/inc/cron/default/Import_fra_agresso_X205_BK.php      
2017-02-06 16:15:02 UTC (rev 16258)
@@ -736,19 +736,22 @@
                                {
                                        $bilagsnr = 
$this->import_end_file($buffer);
                                        
-                                       $received_amount = 
$this->get_total_received((int)$order_id);
-                                       $order_type = 
$this->bocommon->socommon->get_order_type($order_id);
+                                       
if($this->config->config_data['export']['auto_receive_order'])
+                                       {
+                                               $received_amount = 
$this->get_total_received((int)$order_id);
+                                               $order_type = 
$this->bocommon->socommon->get_order_type($order_id);
 
-                                       switch ($order_type)
-                                       {
-                                               case 'workorder':
-                                                       $received = 
createObject('property.boworkorder')->receive_order( (int)$order_id, 
$received_amount );
-                                                       break;
-                                               case 'ticket':
-                                                       $received = 
createObject('property.botts')->receive_order( (int)$order_id, $received_amount 
);
-                                                       break;
-                                               default:
-                                                       throw new 
Exception('Order type not supported');
+                                               switch ($order_type)
+                                               {
+                                                       case 'workorder':
+                                                               $received = 
createObject('property.boworkorder')->receive_order( (int)$order_id, 
$received_amount );
+                                                               break;
+                                                       case 'ticket':
+                                                               $received = 
createObject('property.botts')->receive_order( (int)$order_id, $received_amount 
);
+                                                               break;
+                                                       default:
+                                                               throw new 
Exception('Order type not supported');
+                                               }
                                        }
 
                                }

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-02-06 16:14:42 UTC (rev 16257)
+++ 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php    
    2017-02-06 16:15:02 UTC (rev 16258)
@@ -329,10 +329,9 @@
                        }
                }
        }
-//     if (!$workorder['order_sent'])
+
        if (!empty($transfer_action) && $transfer_action == 'workorder')
        {
-
                $exporter_ordre = new lag_agresso_ordre_fra_workorder();
                try
                {
@@ -342,5 +341,4 @@
                {
                        phpgwapi_cache::message_set($exc->getMessage(), 
'error');
                }
-
        }