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

base_contribution has to be set on pay sheet movements. This will be a major

refactoring, so for now we keep on with base_amount on pay sheet movement, but
for the base_contribution instead of the base_application.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21660 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6b3d7848
...@@ -352,6 +352,7 @@ class PaySheetTransaction(Invoice): ...@@ -352,6 +352,7 @@ class PaySheetTransaction(Invoice):
int_index = model_line.getFloatIndex() int_index = model_line.getFloatIndex()
base_amount_list = model_line.getBaseAmountList() base_amount_list = model_line.getBaseAmountList()
resource = service.getRelativeUrl() resource = service.getRelativeUrl()
base_participation_list = service.getBaseAmountList()
# get the service provider, either on the model line, or using the # get the service provider, either on the model line, or using the
# annotation line reference. # annotation line reference.
...@@ -484,8 +485,8 @@ class PaySheetTransaction(Invoice): ...@@ -484,8 +485,8 @@ class PaySheetTransaction(Invoice):
cell_list.append(cell_dict) cell_list.append(cell_dict)
# update the base_participation # update the base_participation
base_participation_list = service.getBaseAmountList(base=1)
for base_participation in base_participation_list: for base_participation in base_participation_list:
base_participation = 'base_amount/%s' %s base_participation
if quantity: if quantity:
if base_amount_dict.has_key(base_participation) and \ if base_amount_dict.has_key(base_participation) and \
base_amount_dict[base_participation].has_key(share): base_amount_dict[base_participation].has_key(share):
...@@ -508,7 +509,9 @@ class PaySheetTransaction(Invoice): ...@@ -508,7 +509,9 @@ class PaySheetTransaction(Invoice):
source_section=source_section, source_section=source_section,
int_index=int_index, int_index=int_index,
desc=desc, desc=desc,
base_amount_list=base_amount_list, # TODO: this is base_contribution,
# not base_amount
base_amount_list=base_participation_list,
cell_list=cell_list, cell_list=cell_list,
categories=categories) categories=categories)
pay_sheet_line_list.append(pay_sheet_line) pay_sheet_line_list.append(pay_sheet_line)
......
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