[Erp5-report] r33968 jm - /erp5/trunk/products/ERP5/mixin/amount_generator.py

[nobody at svn.erp5.org]

Author: jm
Date: Mon Mar 22 19:52:15 2010
New Revision: 33968

URL: http://svn.erp5.org?rev=33968&view=rev
Log:
amount_generator: collect all categories when merging cells

Modified:
    erp5/trunk/products/ERP5/mixin/amount_generator.py   (contents, props changed)

Modified: erp5/trunk/products/ERP5/mixin/amount_generator.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/amount_generator.py?rev=33968&r1=33967&r2=33968&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/amount_generator.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/amount_generator.py [utf8] Mon Mar 22 19:52:15 2010
@@ -217,9 +217,10 @@
             for key in amount_generator_cell.getMappedValuePropertyList():
               # XXX-JPS Make sure handling of list properties can be handled
               property_dict[key] = amount_generator_cell.getProperty(key)
-            property_dict['category_list'] = \
-              amount_generator_cell.getCategoryMembershipList(
-                amount_generator_cell.getMappedValueBaseCategoryList(), base=1)
+            category_list = amount_generator_cell.getCategoryMembershipList(
+              amount_generator_cell.getMappedValueBaseCategoryList(), base=1)
+            if category_list:
+              property_dict.setdefault('category_list', []) += category_list
             property_dict['resource'] = resource
             # For final amounts, base_application and id MUST be defined
             property_dict['base_application'] = getBaseApplication() # Required

Propchange: erp5/trunk/products/ERP5/mixin/amount_generator.py
------------------------------------------------------------------------------
    svn:executable = *