From 66cfbfd2818fbaa333f8ac72fb7f51e0ca1cdeb8 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Fri, 13 Apr 2007 14:07:02 +0000 Subject: [PATCH] Fix getCurrentInventoryState, getFutureInventoryState, getCurrentInventoryList, getFutureInventoryList, in order to have the same behaviour than getInventory. getAvailableInventoryState and getAvailableInventoryList still need to be fixed. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14071 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5/Tool/SimulationTool.py | 34 ++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/product/ERP5/Tool/SimulationTool.py b/product/ERP5/Tool/SimulationTool.py index 6ddcb6e715..3a772079ad 100644 --- a/product/ERP5/Tool/SimulationTool.py +++ b/product/ERP5/Tool/SimulationTool.py @@ -608,7 +608,7 @@ class SimulationTool(BaseTool): security.declareProtected(Permissions.AccessContentsInformation, 'getCurrentInventory') def getCurrentInventory(self, omit_transit=1, - transit_simulation_state=None,**kw): + transit_simulation_state=None, **kw): """ Returns current inventory """ @@ -630,7 +630,7 @@ class SimulationTool(BaseTool): """ current_inventory = self.getCurrentInventory(**kw) kw['simulation_state'] = self.getPortalReservedInventoryStateList() - reserved_inventory = self.getInventory(omit_input=1,**kw) + reserved_inventory = self.getInventory(omit_input=1, **kw) return current_inventory+reserved_inventory security.declareProtected(Permissions.AccessContentsInformation, @@ -672,12 +672,20 @@ class SimulationTool(BaseTool): security.declareProtected(Permissions.AccessContentsInformation, 'getCurrentInventoryList') - def getCurrentInventoryList(self, **kw): + def getCurrentInventoryList(self, omit_transit=1, + transit_simulation_state=None, **kw): """ Returns list of current inventory grouped by section or site """ - kw['simulation_state'] = self.getPortalCurrentInventoryStateList() - return self.getInventoryList(**kw) + kw['simulation_state'] = self.getPortalCurrentInventoryStateList() + \ + self.getPortalTransitInventoryStateList() + if transit_simulation_state is None: + transit_simulation_state = self.getPortalTransitInventoryStateList() + + return self.getInventoryList( + omit_transit=omit_transit, + transit_simulation_state=transit_simulation_state, + **kw) security.declareProtected(Permissions.AccessContentsInformation, 'getAvailableInventoryList') @@ -685,6 +693,7 @@ class SimulationTool(BaseTool): """ Returns list of current inventory grouped by section or site """ + # XXX Current calculation is not consistent with getAvailableInventory kw['simulation_state'] = tuple( list(self.getPortalReservedInventoryStateList()) + \ list(self.getPortalCurrentInventoryStateList())) @@ -698,6 +707,7 @@ class SimulationTool(BaseTool): """ kw['simulation_state'] = tuple( list(self.getPortalFutureInventoryStateList()) + \ + list(self.getPortalTransitInventoryStateList()) + \ list(self.getPortalReservedInventoryStateList()) + \ list(self.getPortalCurrentInventoryStateList())) return self.getInventoryList(**kw) @@ -727,12 +737,18 @@ class SimulationTool(BaseTool): security.declareProtected(Permissions.AccessContentsInformation, 'getCurrentInventoryStat') - def getCurrentInventoryStat(self, **kw): + def getCurrentInventoryStat(self, omit_transit=1, + transit_simulation_state=None, **kw): """ Returns statistics of current inventory grouped by section or site """ - kw['simulation_state'] = self.getPortalCurrentInventoryStateList() - return self.getInventoryStat(**kw) + kw['simulation_state'] = self.getPortalCurrentInventoryStateList() + \ + self.getPortalTransitInventoryStateList() + if transit_simulation_state is None: + transit_simulation_state = self.getPortalTransitInventoryStateList() + return self.getInventoryStat(omit_transit=omit_transit, + transit_simulation_state=transit_simulation_state, + **kw) security.declareProtected(Permissions.AccessContentsInformation, 'getAvailableInventoryStat') @@ -740,6 +756,7 @@ class SimulationTool(BaseTool): """ Returns statistics of current inventory grouped by section or site """ + # XXX Current calculation is not consistent with getAvailableInventory kw['simulation_state'] = tuple( list(self.getPortalReservedInventoryStateList()) + \ list(self.getPortalCurrentInventoryStateList())) @@ -753,6 +770,7 @@ class SimulationTool(BaseTool): """ kw['simulation_state'] = tuple( list(self.getPortalFutureInventoryStateList()) + \ + list(self.getPortalTransitInventoryStateList()) + \ list(self.getPortalReservedInventoryStateList()) + \ list(self.getPortalCurrentInventoryStateList())) return self.getInventoryStat(**kw) -- 2.30.9