[Erp5-report] r28732 - /erp5/trunk/products/ERP5/Document/Amount.py

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Sep  1 19:00:29 2009
New Revision: 28732

URL: http://svn.erp5.org?rev=28732&view=rev
Log:
- fix getVariationRangeCategoryItemList according to interface
- add a no-op setVariationBaseCategoryList, because
  getVariationBaseCategoryList is not a standard reader anyway

Modified:
    erp5/trunk/products/ERP5/Document/Amount.py

Modified: erp5/trunk/products/ERP5/Document/Amount.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Amount.py?rev=28732&r1=28731&r2=28732&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Amount.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Amount.py [utf8] Tue Sep  1 19:00:29 2009
@@ -179,6 +179,14 @@
         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 @@
     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 @@
     """
     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