Commit e9b049d0 authored by Jean-Paul Smets's avatar Jean-Paul Smets

Various bugfixes for inventory calculation and quantities


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1230 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5de9e6a5
...@@ -66,6 +66,7 @@ class Resource(XMLMatrix, CoreResource, Variated): ...@@ -66,6 +66,7 @@ class Resource(XMLMatrix, CoreResource, Variated):
, PropertySheet.Price , PropertySheet.Price
, PropertySheet.Resource , PropertySheet.Resource
, PropertySheet.Reference , PropertySheet.Reference
, PropertySheet.FlowCapacity
) )
# Factory Type Information # Factory Type Information
...@@ -494,13 +495,14 @@ a service in a public administration).""" ...@@ -494,13 +495,14 @@ a service in a public administration)."""
security.declareProtected(Permissions.AccessContentsInformation, 'getNextNegativeInventoryDate') security.declareProtected(Permissions.AccessContentsInformation, 'getNextNegativeInventoryDate')
def getNextNegativeInventoryDate(self, from_date = DateTime(), section = None, node = None, def getNextNegativeInventoryDate(self, from_date = None, section = None, node = None,
node_category=None, section_category=default_section_category, simulation_state=None, node_category=None, section_category=default_section_category, simulation_state=None,
variation_text = None, variation_text = None,
ignore_variation=0, **kw): ignore_variation=0, **kw):
""" """
Returns list of inventory grouped by section or site Returns list of inventory grouped by section or site
""" """
if from_date is None: from_date = DateTime()
# Get Movement List # Get Movement List
result = self.Resource_getInventoryHistoryList( resource_uid = [self.getUid()], result = self.Resource_getInventoryHistoryList( resource_uid = [self.getUid()],
resource=None, resource=None,
...@@ -540,25 +542,14 @@ a service in a public administration).""" ...@@ -540,25 +542,14 @@ a service in a public administration)."""
# Do nothing by default # Do nothing by default
pass pass
security.declareProtected( Permissions.ModifyPortalContent, '_setVariationCategoryList' ) security.declareProtected( Permissions.ModifyPortalContent, 'updateSupplyMatrix' )
def _setVariationCategoryList(self, value): def updateSupplyMatrix(self):
""" """
Define the indices provided Define the indices provided
one list per index (kw) one list per index (kw)
Any number of list can be provided Any number of list can be provided
""" """
exclude_category = []
try:
other_variations = self.searchFolder(portal_type = variation_type_list)
except:
other_variations = []
if len(other_variations) > 0:
for o_brain in other_variations:
o = o_brain.getObject()
for v in o.getVariationBaseCategoryList():
exclude_category.append('%s/%s' % (v, o.getRelativeUrl()))
Variated._setVariationCategoryList(self, filter(lambda x: x not in exclude_category, value))
# Update the cell range automatically # Update the cell range automatically
# This is far from easy and requires some specific wizzardry # This is far from easy and requires some specific wizzardry
base_id = 'path' base_id = 'path'
...@@ -597,13 +588,14 @@ a service in a public administration).""" ...@@ -597,13 +588,14 @@ a service in a public administration)."""
value.sort() value.sort()
for pid in self.contentIds(filter={'portal_type': 'Predicate'}): for pid in self.contentIds(filter={'portal_type': 'Predicate'}):
self.deleteContent(pid) self.deleteContent(pid)
value = value + [None] if len(value) > 0:
value = [None] + value + [None]
for i in range(0, len(value) - 1): for i in range(0, len(value) - 1):
p = self.newContent(id = 'quantity_range_%s' % i, portal_type = 'Predicate') p = self.newContent(id = 'quantity_range_%s' % i, portal_type = 'Predicate')
p.setCriterionPropertyList(('quantity', )) p.setCriterionPropertyList(('quantity', ))
p.setCriterion('quantity', min=value[i], max=value[i+1]) p.setCriterion('quantity', min=value[i], max=value[i+1])
p.setTitle('%s <= quantity < %s' % (repr(value[i]),repr(value[i+1]))) p.setTitle('%s <= quantity < %s' % (repr(value[i]),repr(value[i+1])))
self._setVariationCategoryList(self.getVariationRangeCategoryList(root=0)) self.updateSupplyMatrix()
# Predicate handling # Predicate handling
security.declareProtected(Permissions.AccessContentsInformation, 'asPredicate') security.declareProtected(Permissions.AccessContentsInformation, 'asPredicate')
......
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