[Fmsystem-commits] [11070] more on logistic

[Sigurd Nes]

Revision: 11070
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11070
Author:   sigurdne
Date:     2013-04-23 12:47:38 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
more on logistic 

Modified Paths:
--------------
    trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php

Modified: trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php  
2013-04-23 11:07:43 UTC (rev 11069)
+++ trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php  
2013-04-23 12:47:38 UTC (rev 11070)
@@ -298,6 +298,7 @@
                        }
 
 //                     $accounts = 
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 'logistic');
+                       $allocation_suggestions = array();
 
                        if($requirement)
                        {
@@ -350,11 +351,25 @@
 
                                        $criterias_array['conditions'][] = 
$condition;
                                }
+
+
+                               $entity_category = 
execMethod('property.soadmin_entity.get_single_category', $location_id);
+
+                               $allocation_suggestions = 
execMethod('property.soentity.get_eav_list', $criterias_array);
+                               
+                               if($entity_category['enable_bulk'])
+                               {
+                                       foreach ($allocation_suggestions as 
&$entry)
+                                       {
+                                               $entry['inventory'] = 
execMethod('property.soentity.get_inventory', array('location_id' => 
$location_id, 'id' => $entry['id']));
+                                       }
+                               }
+
                        }
-                   
-                       $allocation_suggestions = 
execMethod('property.soentity.get_eav_list', $criterias_array);
+//Start fuzzy
 
-//Start fuzzy
+//_debug_array($allocation_suggestions);die();
+
                        $suggestion_ids = array();