[Erp5-report] r13029 - /erp5/trunk/products/ERP5/Tool/SimulationTool.py

[nobody at svn.erp5.org]

Author: seb
Date: Mon Feb 26 13:36:40 2007
New Revision: 13029

URL: http://svn.erp5.org?rev=13029&view=rev
Log:
do not return the inventory wich is in transit state in getCurrentInventory

Modified:
    erp5/trunk/products/ERP5/Tool/SimulationTool.py

Modified: erp5/trunk/products/ERP5/Tool/SimulationTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/SimulationTool.py?rev=13029&r1=13028&r2=13029&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/SimulationTool.py (original)
+++ erp5/trunk/products/ERP5/Tool/SimulationTool.py Mon Feb 26 13:36:40 2007
@@ -607,12 +607,19 @@
 
     security.declareProtected(Permissions.AccessContentsInformation,
                               'getCurrentInventory')
-    def getCurrentInventory(self, **kw):
+    def getCurrentInventory(self, omit_transit=1,
+                            transit_simulation_state=None,**kw):
       """
       Returns current inventory
       """
-      kw['simulation_state'] = self.getPortalCurrentInventoryStateList()
-      return self.getInventory(**kw)
+      kw['simulation_state'] = self.getPortalCurrentInventoryStateList() + \
+                               self.getPortalTransitInventoryStateList()
+      if transit_simulation_state is None:
+        self.getPortalTransitInventoryStateList()
+      current_inventory = self.getInventory(omit_transit=omit_transit,
+                                  transit_simulation_state=transit_simulation_state,
+                                  **kw)
+      return current_inventory
 
     security.declareProtected(Permissions.AccessContentsInformation,
                               'getAvailableInventory')
@@ -634,6 +641,7 @@
       """
       kw['simulation_state'] = tuple(
                    list(self.getPortalFutureInventoryStateList()) + \
+                   list(self.getPortalTransitInventoryStateList()) + \
                    list(self.getPortalReservedInventoryStateList()) + \
                    list(self.getPortalCurrentInventoryStateList()))
       return self.getInventory(**kw)