[Erp5-report] r25663 - /erp5/trunk/products/ERP5/Document/
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Feb 23 15:52:59 CET 2009
Author: jerome
Date: Mon Feb 23 15:52:58 2009
New Revision: 25663
URL: http://svn.erp5.org?rev=25663&view=rev
Log:
- fix a bug with CategoryBudgetVariation of type movement, it was returning the
first category when using movement axis, even if this category was not for
this base_category
- calculate axis only once
- remove wrong XXX
Modified:
erp5/trunk/products/ERP5/Document/CategoryBudgetVariation.py
erp5/trunk/products/ERP5/Document/NodeBudgetVariation.py
Modified: erp5/trunk/products/ERP5/Document/CategoryBudgetVariation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/CategoryBudgetVariation.py?rev=25663&r1=25662&r2=25663&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/CategoryBudgetVariation.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/CategoryBudgetVariation.py [utf8] Mon Feb 23 15:52:58 2009
@@ -74,24 +74,21 @@
def getInventoryQueryDict(self, budget_cell):
""" Query dict to pass to simulation query
"""
- if not self.getInventoryAxis():
+ axis = self.getInventoryAxis()
+ if not axis:
return dict()
base_category = self.getProperty('variation_base_category')
if not base_category:
return dict()
- # XXX pass base_category= ...
for criterion_category in budget_cell.getMembershipCriterionCategoryList():
if '/' not in criterion_category: # safe ...
continue
criterion_base_category, category_url = criterion_category.split('/', 1)
-
- # Different possible inventory axis here
- axis = self.getInventoryAxis()
- if axis == 'movement':
- return {'default_%s_uid' % base_category:
- self.getPortalObject().portal_categories.getCategoryUid(criterion_category)}
-
if criterion_base_category == base_category:
+ # Different possible inventory axis here
+ if axis == 'movement':
+ return {'default_%s_uid' % base_category:
+ self.getPortalObject().portal_categories.getCategoryUid(criterion_category)}
return {axis: criterion_category}
return dict()
Modified: erp5/trunk/products/ERP5/Document/NodeBudgetVariation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/NodeBudgetVariation.py?rev=25663&r1=25662&r2=25663&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/NodeBudgetVariation.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/NodeBudgetVariation.py [utf8] Mon Feb 23 15:52:58 2009
@@ -99,18 +99,17 @@
def getInventoryQueryDict(self, budget_cell):
""" Query dict to pass to simulation query
"""
- if not self.getInventoryAxis():
+ axis = self.getInventoryAxis()
+ if not axis:
return dict()
base_category = self.getProperty('variation_base_category')
if not base_category:
return dict()
- # TODO: pass base_category_list instead of stupidly iterating !
for criterion_category in budget_cell.getMembershipCriterionCategoryList():
if '/' not in criterion_category: # safe ...
continue
criterion_base_category, node_url = criterion_category.split('/', 1)
if criterion_base_category == base_category:
- axis = self.getInventoryAxis()
if axis == 'movement':
axis = 'default_%s' % base_category
axis = '%s_uid' % axis
More information about the Erp5-report
mailing list