From 40d9378a2ad928a5f468175ec2dc41c98dd5113a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Tue, 1 Sep 2009 17:00:29 +0000 Subject: [PATCH] - fix getVariationRangeCategoryItemList according to interface - add a no-op setVariationBaseCategoryList, because getVariationBaseCategoryList is not a standard reader anyway git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28732 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5/Document/Amount.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/product/ERP5/Document/Amount.py b/product/ERP5/Document/Amount.py index a2f8e929bb..a6e95515bd 100644 --- a/product/ERP5/Document/Amount.py +++ b/product/ERP5/Document/Amount.py @@ -179,6 +179,14 @@ class Amount(Base, Variated): base_category_list.append(base_category) return base_category_list + security.declareProtected(Permissions.ModifyPortalContent, + 'setVariationBaseCategoryList') + def setVariationBaseCategoryList(self, node_list): + """Do nothing in the case of an amount, because variation base category + list are set on the resource. + """ + pass + security.declareProtected(Permissions.AccessContentsInformation, 'getVariationBaseCategoryItemList') def getVariationBaseCategoryItemList(self,display_id='getTitleOrId',**kw): @@ -212,9 +220,10 @@ class Amount(Base, Variated): self._setVariationValue(variation_value) self.reindexObject() - security.declareProtected(Permissions.AccessContentsInformation, \ + security.declareProtected(Permissions.AccessContentsInformation, 'getVariationRangeCategoryItemList') - def getVariationRangeCategoryItemList(self, **kw): + def getVariationRangeCategoryItemList(self, base_category_list=(), + display_id='getTitleOrId', base=1, current_category=None, **kw): """ Returns possible variation category values for the order line according to the default resource. @@ -225,8 +234,12 @@ class Amount(Base, Variated): """ resource = self.getResourceValue() if resource is not None: + kw['omit_individual_variation'] = 0 result = resource.getVariationCategoryItemList( - omit_individual_variation=0,**kw) + base_category_list=base_category_list, + display_id=display_id, + base=base, + current_category=current_category, **kw) else: result = [] return result -- 2.30.9