Commit aab3dc83 authored by Jérome Perrin's avatar Jérome Perrin

now that movement group include tax movements, we have to handle them explictly here

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20687 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 85370f42
...@@ -86,8 +86,10 @@ for base_amount in context.getBaseContributionList():\n ...@@ -86,8 +86,10 @@ for base_amount in context.getBaseContributionList():\n
if tax_line not in contributed_tax_line_list:\n if tax_line not in contributed_tax_line_list:\n
contributed_tax_line_list.append(tax_line)\n contributed_tax_line_list.append(tax_line)\n
\n \n
non_tax_movement_type_list = [t for t in context.getPortalMovementTypeList()\n
if t not in context.getPortalTaxMovementTypeList()]\n
other_movement_list = [m for m in context.getExplanationValue().getMovementList(\n other_movement_list = [m for m in context.getExplanationValue().getMovementList(\n
portal_type=context.getPortalMovementTypeList())]\n portal_type=non_tax_movement_type_list)]\n
# 2 for each tax line, calculate the corresponding ratio\n # 2 for each tax line, calculate the corresponding ratio\n
for tax_line in contributed_tax_line_list:\n for tax_line in contributed_tax_line_list:\n
base_total_price = 0\n base_total_price = 0\n
...@@ -182,6 +184,8 @@ return adjusted_tax_line_list\n ...@@ -182,6 +184,8 @@ return adjusted_tax_line_list\n
<string>tax_line</string> <string>tax_line</string>
<string>append</string> <string>append</string>
<string>$append0</string> <string>$append0</string>
<string>t</string>
<string>non_tax_movement_type_list</string>
<string>m</string> <string>m</string>
<string>other_movement_list</string> <string>other_movement_list</string>
<string>base_total_price</string> <string>base_total_price</string>
......
328 329
\ No newline at end of file \ No newline at end of file
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