Commit 8ce88eff authored by Nicolas Dumazet's avatar Nicolas Dumazet

whitespace only. For readability


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31507 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 65b9cead
...@@ -85,6 +85,7 @@ class TradeCondition(Path, Transformation, XMLMatrix): ...@@ -85,6 +85,7 @@ class TradeCondition(Path, Transformation, XMLMatrix):
existing_movement_list = context.getMovementList() existing_movement_list = context.getMovementList()
aggregated_amount_list = self.getAggregatedAmountList(context=context, aggregated_amount_list = self.getAggregatedAmountList(context=context,
movement_list=movement_list, **kw) movement_list=movement_list, **kw)
modified_reference_list = [] modified_reference_list = []
# check if the existing movements are in aggregated movements # check if the existing movements are in aggregated movements
movement_to_delete_list = [] movement_to_delete_list = []
...@@ -100,17 +101,21 @@ class TradeCondition(Path, Transformation, XMLMatrix): ...@@ -100,17 +101,21 @@ class TradeCondition(Path, Transformation, XMLMatrix):
update_kw = {} update_kw = {}
for p in self.edited_property_list: for p in self.edited_property_list:
update_kw[p] = amount.getProperty(p) update_kw[p] = amount.getProperty(p)
if movement.getProperty('reference') == update_kw['reference'] and\ if movement.getProperty('reference') == update_kw['reference'] and\
movement.getVariationCategoryList() == \ movement.getVariationCategoryList() == \
amount.getVariationCategoryList(): amount.getVariationCategoryList():
movement.edit(**update_kw) movement.edit(**update_kw)
modified_reference_list.append(update_kw['reference']) modified_reference_list.append(update_kw['reference'])
keep_movement = True keep_movement = True
if not keep_movement: if not keep_movement:
movement_to_delete_list.append(movement) movement_to_delete_list.append(movement)
movement_to_add_list = AggregatedAmountList( movement_to_add_list = AggregatedAmountList(
[amount for amount in aggregated_amount_list if [amount for amount in aggregated_amount_list if
amount.getReference() not in modified_reference_list]) amount.getReference() not in modified_reference_list])
return {'movement_to_delete_list' : movement_to_delete_list, return {'movement_to_delete_list' : movement_to_delete_list,
'movement_to_add_list': movement_to_add_list} 'movement_to_add_list': movement_to_add_list}
......
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