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

[sigurdne]

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

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

Modified: branches/dev-syncromind-2/property/inc/hook_settings.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/hook_settings.inc.php        
2016-05-13 12:22:28 UTC (rev 15105)
+++ branches/dev-syncromind-2/property/inc/hook_settings.inc.php        
2016-05-13 12:22:33 UTC (rev 15106)
@@ -269,6 +269,7 @@
        $ecodimb->get_location_info('dimb', false);
        $values_dimb = $ecodimb->read(array('sort' => 'ASC', 'order' => 'id', 
'allrows' => true));
 
+       $_dimb = array();
        foreach ($values_dimb as $entry)
        {
                $_dimb[$entry['id']] = "{$entry['id']} - {$entry['descr']}";
@@ -279,7 +280,22 @@
        unset($_dimb);
        unset($ecodimb);
        unset($values_dimb);
+       unset($entry);
 
+       $sogeneric = CreateObject('property.sogeneric', 'unspsc_code');
+       $_values_unspsc_code = $sogeneric->read(array('allrows' => true));
+       $_unspsc_code = array();
+       foreach ($_values_unspsc_code as &$entry)
+       {
+               $_unspsc_code[$entry['id']] = "{$entry['id']} {$entry['name']}";
+       }
+
+       create_select_box('unspsc code', 'unspsc_code', $_unspsc_code, 'default 
unspsc code');
+       unset($sogeneric);
+       unset($_unspsc_code);
+       unset($entry);
+       unset($_values_unspsc_code);
+
        create_select_box('Workorder Approval From', 'approval_from', 
$_accounts, 'If you need approval from your supervisor for 
projects/workorders');
 
        //      if(!$email_org)