Commit ec4e0aad authored by Romain Courteaud's avatar Romain Courteaud

Make consistent with SimulationTool.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5036 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ea1bde4d
...@@ -23,7 +23,7 @@ class InventoryBrain(ZSQLBrain): ...@@ -23,7 +23,7 @@ class InventoryBrain(ZSQLBrain):
Global analysis (all variations and categories) Global analysis (all variations and categories)
""" """
# Stock management # Stock management
def getInventory(self, at_date = None, ignore_variation=0, def getInventory(self, at_date=None, ignore_variation=0,
simulation_state=None, **kw): simulation_state=None, **kw):
if type(simulation_state) is type('a'): if type(simulation_state) is type('a'):
simulation_state = [simulation_state] simulation_state = [simulation_state]
...@@ -96,7 +96,7 @@ class InventoryListBrain(ZSQLBrain): ...@@ -96,7 +96,7 @@ class InventoryListBrain(ZSQLBrain):
""" """
Returns the inventory Returns the inventory
""" """
simulation_tool = getToolByName(self,'portal_simulation') simulation_tool = getToolByName(self, 'portal_simulation')
return simulation_tool.getInventory( return simulation_tool.getInventory(
node=self.node_relative_url, node=self.node_relative_url,
variation_text=self.variation_text, variation_text=self.variation_text,
...@@ -106,7 +106,7 @@ class InventoryListBrain(ZSQLBrain): ...@@ -106,7 +106,7 @@ class InventoryListBrain(ZSQLBrain):
""" """
Returns current inventory Returns current inventory
""" """
simulation_tool = getToolByName(self,'portal_simulation') simulation_tool = getToolByName(self, 'portal_simulation')
return simulation_tool.getCurrentInventory( return simulation_tool.getCurrentInventory(
node=self.node_relative_url, node=self.node_relative_url,
variation_text=self.variation_text, variation_text=self.variation_text,
...@@ -198,6 +198,7 @@ class InventoryListBrain(ZSQLBrain): ...@@ -198,6 +198,7 @@ class InventoryListBrain(ZSQLBrain):
'variation_text': self.variation_text, 'variation_text': self.variation_text,
'selection_name': selection_name, 'selection_name': selection_name,
'selection_index': selection_index, 'selection_index': selection_index,
'domain_name': selection_name,
} }
# Add parameters to query_kw # Add parameters to query_kw
query_kw_update = {} query_kw_update = {}
...@@ -207,8 +208,9 @@ class InventoryListBrain(ZSQLBrain): ...@@ -207,8 +208,9 @@ class InventoryListBrain(ZSQLBrain):
} }
elif cname_id in ('getAvailableInventory', ): elif cname_id in ('getAvailableInventory', ):
query_kw_update = { query_kw_update = {
'omit_simulation': 1, # XXX FIXME Not consistent with simulation tool.
'omit_input': 1, # 'omit_simulation': 1,
# 'omit_input': 1,
'simulation_state': \ 'simulation_state': \
list(self.getPortalReservedInventoryStateList()) list(self.getPortalReservedInventoryStateList())
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment