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

[nobody at svn.erp5.org]

Author: seb
Date: Tue Nov 14 16:09:17 2006
New Revision: 11296

URL: http://svn.erp5.org?rev=11296&view=rev
Log:
make getAvailableInventory working

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=11296&r1=11295&r2=11296&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/SimulationTool.py (original)
+++ erp5/trunk/products/ERP5/Tool/SimulationTool.py Tue Nov 14 16:09:17 2006
@@ -617,14 +617,12 @@
     def getAvailableInventory(self, **kw):
       """
       Returns available inventory
-      (current inventory - reserved)
-      """
-    #XXX This code is wrong, look at
-    # zope/Products/ERP5/Extensions/InventoryBrain.py for a more complete one
-      kw['simulation_state'] = tuple(
-                    list(self.getPortalReservedInventoryStateList()) + \
-                    list(self.getPortalCurrentInventoryStateList()))
-      return self.getInventory(**kw)
+      (current inventory - reserved_inventory)
+      """
+      current_inventory = self.getCurrentInventory(**kw)
+      kw['simulation_state'] = self.getPortalReservedInventoryStateList()
+      reserved_inventory = self.getInventory(omit_input=1,**kw)
+      return current_inventory+reserved_inventory
 
     security.declareProtected(Permissions.AccessContentsInformation,
                               'getFutureInventory')