[Erp5-report] r7046 - /erp5/trunk/products/ERP5/Extensions/InventoryBrain.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue May 2 23:36:00 CEST 2006
Author: jerome
Date: Tue May 2 23:35:57 2006
New Revision: 7046
URL: http://svn.erp5.org?rev=7046&view=rev
Log:
add Reserved and Current Inventory state list to getListItemUrl for getAvailableInventory
Modified:
erp5/trunk/products/ERP5/Extensions/InventoryBrain.py
Modified: erp5/trunk/products/ERP5/Extensions/InventoryBrain.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Extensions/InventoryBrain.py?rev=7046&r1=7045&r2=7046&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Extensions/InventoryBrain.py (original)
+++ erp5/trunk/products/ERP5/Extensions/InventoryBrain.py Tue May 2 23:35:57 2006
@@ -15,17 +15,18 @@
from DateTime import DateTime
from ZTUtils import make_query
from Products.CMFCore.utils import getToolByName
+from zLOG import LOG, PROBLEM
class InventoryBrain(ZSQLBrain):
"""
Global analysis (all variations and categories)
"""
# Stock management
- def getInventory(self, at_date=None, ignore_variation=0,
+ def getInventory(self, at_date=None, ignore_variation=0,
simulation_state=None, **kw):
- if type(simulation_state) is type('a'):
+ if isinstance(simulation_state, str):
simulation_state = [simulation_state]
- result = self.Resource_zGetInventory(
+ result = self.Resource_zGetInventory(
resource_uid=[self.resource_uid],
to_date=at_date, omit_simulation=0,
section_category=self.getPortalDefaultSectionCategory(),
@@ -43,7 +44,7 @@
Returns current inventory
"""
return self.getInventory(
- simulation_state=self.getPortalCurrentInventoryStateList(),
+ simulation_state=self.getPortalCurrentInventoryStateList(),
ignore_variation=1)
def getFutureInventory(self):
@@ -166,34 +167,18 @@
if o is not None:
explanation = o.getExplanationValue()
if explanation is not None:
- return '%s/%s/view' % (self.portal_url.getPortalObject().absolute_url(),
- explanation.getRelativeUrl())
+ return '%s/%s/view' % (
+ self.portal_url.getPortalObject().absolute_url(),
+ explanation.getRelativeUrl())
else:
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):
# A resource is defined, so try to display the movement list
resource = self.portal_categories.unrestrictedTraverse(
self.resource_relative_url)
form_name = 'Resource_viewMovementHistory'
query_kw = {
- 'variation_text': self.variation_text,
+ 'variation_text': self.variation_text,
'selection_name': selection_name,
'selection_index': selection_index,
'domain_name': selection_name,
@@ -206,11 +191,9 @@
}
elif cname_id in ('getAvailableInventory', ):
query_kw_update = {
- # XXX FIXME Not consistent with simulation tool.
-# 'omit_simulation': 1,
-# 'omit_input': 1,
'simulation_state': \
- list(self.getPortalReservedInventoryStateList())
+ list(self.getPortalReservedInventoryStateList())+\
+ list(self.getPortalCurrentInventoryStateList())
}
elif cname_id in ('getFutureInventory', 'inventory', ):
query_kw_update = {
@@ -231,7 +214,9 @@
resource.absolute_url(),
form_name,
make_query(**query_kw))
- except (AttributeError, KeyError):
+ except (AttributeError, KeyError), e:
+ LOG('InventoryListBrain', PROBLEM,
+ 'exception caught in getListItemUrl', e)
return ''
def getAggregateListText(self):
@@ -279,12 +264,9 @@
# Stock management
def getInventory(self, at_date=None, ignore_variation=0,
simulation_state=None, **kw):
- if type(simulation_state) is type('a'):
+ if isinstance(simulation_state, str):
simulation_state = [simulation_state]
- if hasattr(self, 'where_expression'):
- where_expression = self.where_expression
- else:
- where_expression = None
+ where_expression = getattr(self, 'where_expression', None)
result = self.Resource_zGetInventory(
resource_uid = [self.resource_uid],
to_date=at_date,
More information about the Erp5-report
mailing list