[Fmsystem-commits] [16703] more on integration

[sigurdne]

Revision: 16703
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16703
Author:   sigurdne
Date:     2017-05-08 05:05:04 -0400 (Mon, 08 May 2017)
Log Message:
-----------
more on integration

Modified Paths:
--------------
    trunk/property/inc/class.uiwo_hour.inc.php
    trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.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-05-05 14:28:04 UTC (rev 
16702)
+++ trunk/property/inc/class.uiwo_hour.inc.php  2017-05-08 09:05:04 UTC (rev 
16703)
@@ -3364,8 +3364,10 @@
                                phpgw::no_access();
                        }
 
-                       $start_from = 45001336;
-                       $sql = "SELECT id, status FROM fm_workorder WHERE id >= 
$start_from";
+//                     $start_from = 45001336;
+//                     $sql = "SELECT id, status FROM fm_workorder WHERE id >= 
$start_from";
+                       $sql = "SELECT id, status FROM fm_workorder WHERE id IN 
(45000012,45000106,45000111,45000114,45000134,45000137,45000138,45000139,45000283,45000332,45000414,45000455,45000456,45000515,45000524,45000525,45000577,45000623,45000624,45000838,45000860,45001028,45001031,45001033,45001297,45001380,45001384,45001407,45001498,45001500,45001521,45001595,45001620,45001712,45001824,45001831,45001861,45001909,45001922,45001958,45001959,45002045,45002084,45002086,45002350,45002481,45002569,45002716,45002854,45002873,45002944,45003056,45003132,45003405,45003626,45003695,45003699,45003701,45003703,45003707,45003752,45003753,45003754,45003816,45003940,45003941,45004107)";
+
                        $db = & $GLOBALS['phpgw']->db;
                        $db->query($sql, __LINE__, __FILE__);
                        $ids = array();

Modified: 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php
===================================================================
--- trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php  
2017-05-05 14:28:04 UTC (rev 16702)
+++ trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php  
2017-05-08 09:05:04 UTC (rev 16703)
@@ -143,6 +143,11 @@
                                $dim3 = 9;
                        }
 
+                       if($dim3 == 9999)
+                       {
+                               $dim3 = 9;
+                       }
+
                        $dim6 = 9;
 
                        if ($_ticket['order_dim1'])

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-05-05 14:28:04 UTC (rev 16702)
+++ 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php    
    2017-05-08 09:05:04 UTC (rev 16703)
@@ -150,6 +150,11 @@
                                        $dim3 = 9;
                                }
 
+                               if($dim3 == 9999)
+                               {
+                                       $dim3 = 9;
+                               }
+
                                $address_element = 
execMethod('property.botts.get_address_element', $location_code);
                                $_address = array();
                                foreach ($address_element as $entry)