Commit 32dd5d33 authored by Jérome Perrin's avatar Jérome Perrin

add Reserved and Current Inventory state list to getListItemUrl for getAvailableInventory

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7046 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d0f96d0f
...@@ -15,6 +15,7 @@ from Products.ZSQLCatalog.zsqlbrain import ZSQLBrain ...@@ -15,6 +15,7 @@ from Products.ZSQLCatalog.zsqlbrain import ZSQLBrain
from DateTime import DateTime from DateTime import DateTime
from ZTUtils import make_query from ZTUtils import make_query
from Products.CMFCore.utils import getToolByName from Products.CMFCore.utils import getToolByName
from zLOG import LOG, PROBLEM
class InventoryBrain(ZSQLBrain): class InventoryBrain(ZSQLBrain):
""" """
...@@ -23,7 +24,7 @@ class InventoryBrain(ZSQLBrain): ...@@ -23,7 +24,7 @@ class InventoryBrain(ZSQLBrain):
# 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 isinstance(simulation_state, str):
simulation_state = [simulation_state] simulation_state = [simulation_state]
result = self.Resource_zGetInventory( result = self.Resource_zGetInventory(
resource_uid=[self.resource_uid], resource_uid=[self.resource_uid],
...@@ -166,27 +167,11 @@ class InventoryListBrain(ZSQLBrain): ...@@ -166,27 +167,11 @@ class InventoryListBrain(ZSQLBrain):
if o is not None: if o is not None:
explanation = o.getExplanationValue() explanation = o.getExplanationValue()
if explanation is not None: if explanation is not None:
return '%s/%s/view' % (self.portal_url.getPortalObject().absolute_url(), return '%s/%s/view' % (
self.portal_url.getPortalObject().absolute_url(),
explanation.getRelativeUrl()) explanation.getRelativeUrl())
else: else:
return '' return ''
# XXX Coramy, to be deleted
# elif cname_id in ('getAggregateList','getAggregateListText',):
# kw = {
# 'list_method_id' : 'Resource_zGetAggregateList',
# 'explanation_uid' : self.explanation_uid,
# 'node_uid' : self.node_uid,
# 'section_uid' : self.section_uid,
# 'variation_text' : self.variation_text,
# 'resource_uid' : self.resource_uid,
# 'reset': 1
# }
# url_params_string = make_query(kw)
# # should be search XXX
# return '%s/piece_tissu?%s ' % (
# self.portal_url.getPortalObject().absolute_url(),
# url_params_string
# )
elif (self.resource_relative_url is not None): elif (self.resource_relative_url is not None):
# A resource is defined, so try to display the movement list # A resource is defined, so try to display the movement list
resource = self.portal_categories.unrestrictedTraverse( resource = self.portal_categories.unrestrictedTraverse(
...@@ -206,11 +191,9 @@ class InventoryListBrain(ZSQLBrain): ...@@ -206,11 +191,9 @@ class InventoryListBrain(ZSQLBrain):
} }
elif cname_id in ('getAvailableInventory', ): elif cname_id in ('getAvailableInventory', ):
query_kw_update = { query_kw_update = {
# XXX FIXME Not consistent with simulation tool.
# 'omit_simulation': 1,
# 'omit_input': 1,
'simulation_state': \ 'simulation_state': \
list(self.getPortalReservedInventoryStateList()) list(self.getPortalReservedInventoryStateList())+\
list(self.getPortalCurrentInventoryStateList())
} }
elif cname_id in ('getFutureInventory', 'inventory', ): elif cname_id in ('getFutureInventory', 'inventory', ):
query_kw_update = { query_kw_update = {
...@@ -231,7 +214,9 @@ class InventoryListBrain(ZSQLBrain): ...@@ -231,7 +214,9 @@ class InventoryListBrain(ZSQLBrain):
resource.absolute_url(), resource.absolute_url(),
form_name, form_name,
make_query(**query_kw)) make_query(**query_kw))
except (AttributeError, KeyError): except (AttributeError, KeyError), e:
LOG('InventoryListBrain', PROBLEM,
'exception caught in getListItemUrl', e)
return '' return ''
def getAggregateListText(self): def getAggregateListText(self):
...@@ -279,12 +264,9 @@ class DeliveryListBrain(InventoryListBrain): ...@@ -279,12 +264,9 @@ class DeliveryListBrain(InventoryListBrain):
# 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 isinstance(simulation_state, str):
simulation_state = [simulation_state] simulation_state = [simulation_state]
if hasattr(self, 'where_expression'): where_expression = getattr(self, 'where_expression', None)
where_expression = self.where_expression
else:
where_expression = None
result = self.Resource_zGetInventory( result = self.Resource_zGetInventory(
resource_uid = [self.resource_uid], resource_uid = [self.resource_uid],
to_date=at_date, to_date=at_date,
......
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