Commit 049dd675 authored by Julien Muchembled's avatar Julien Muchembled

amount_generator: collect all categories when merging cells

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33968 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a525bdbe
...@@ -217,9 +217,10 @@ class AmountGeneratorMixin: ...@@ -217,9 +217,10 @@ class AmountGeneratorMixin:
for key in amount_generator_cell.getMappedValuePropertyList(): for key in amount_generator_cell.getMappedValuePropertyList():
# XXX-JPS Make sure handling of list properties can be handled # XXX-JPS Make sure handling of list properties can be handled
property_dict[key] = amount_generator_cell.getProperty(key) property_dict[key] = amount_generator_cell.getProperty(key)
property_dict['category_list'] = \ category_list = amount_generator_cell.getCategoryMembershipList(
amount_generator_cell.getCategoryMembershipList(
amount_generator_cell.getMappedValueBaseCategoryList(), base=1) amount_generator_cell.getMappedValueBaseCategoryList(), base=1)
if category_list:
property_dict.setdefault('category_list', []) += category_list
property_dict['resource'] = resource property_dict['resource'] = resource
# For final amounts, base_application and id MUST be defined # For final amounts, base_application and id MUST be defined
property_dict['base_application'] = getBaseApplication() # Required property_dict['base_application'] = getBaseApplication() # Required
......
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