[Erp5-report] r45041 luke - /erp5/trunk/products/Vifib/Tool/SlapTool.py

[nobody at svn.erp5.org]

Author: luke
Date: Mon Apr  4 13:54:17 2011
New Revision: 45041

URL: http://svn.erp5.org?rev=45041&view=rev
Log:
 - revert 45036, as the newest packing list with given state shall work

Modified:
    erp5/trunk/products/Vifib/Tool/SlapTool.py

Modified: erp5/trunk/products/Vifib/Tool/SlapTool.py
URL: http://svn.erp5.org/erp5/trunk/products/Vifib/Tool/SlapTool.py?rev=45041&r1=45040&r2=45041&view=diff
==============================================================================
--- erp5/trunk/products/Vifib/Tool/SlapTool.py [utf8] (original)
+++ erp5/trunk/products/Vifib/Tool/SlapTool.py [utf8] Mon Apr  4 13:54:17 2011
@@ -415,6 +415,7 @@ class SlapTool(BaseTool):
 
       elif movement.getResource() == \
               portal_preferences.getPreferredInstanceCleanupResource():
+
         if movement.getSimulationState() in ('confirmed', 'started', 'stopped'):
           slap_partition._need_modification = 1
 
@@ -720,14 +721,25 @@ class SlapTool(BaseTool):
       service = portal.restrictedTraverse(service_relative_url)
       service_uid_list.append(service.getUid())
 
+    # Get associated software release
+    state_list = []
+    state_list.extend(portal.getPortalCurrentInventoryStateList())
+    state_list.extend(portal.getPortalReservedInventoryStateList())
+    state_list.extend(portal.getPortalTransitInventoryStateList())
+
     # Use getTrackingList
-    return portal.portal_catalog.getResultValue(
+    catalog_result = portal.portal_catalog(
       portal_type='Sale Packing List Line',
+      simulation_state=state_list,
       aggregate_relative_url=computer_partition_document.getRelativeUrl(),
       default_resource_uid=service_uid_list,
       sort_on=(('movement.start_date', 'DESC'),),
       limit=1,
     )
+    if len(catalog_result):
+      return catalog_result[0].getObject()
+    else:
+      return None
 
   def _reportComputerUsage(self, computer, usage):
     """Stores usage report of a computer."""