From dc746d634803c44b08cc51db73516ed52954d50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Tue, 17 Jun 2008 15:51:45 +0000
Subject: [PATCH] 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
---
product/ERP5/Document/PaySheetTransaction.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/product/ERP5/Document/PaySheetTransaction.py b/product/ERP5/Document/PaySheetTransaction.py
index 0818818c73..afef4d350a 100644
--- a/product/ERP5/Document/PaySheetTransaction.py
+++ b/product/ERP5/Document/PaySheetTransaction.py
@@ -352,6 +352,7 @@ class PaySheetTransaction(Invoice):
int_index = model_line.getFloatIndex()
base_amount_list = model_line.getBaseAmountList()
resource = service.getRelativeUrl()
+ base_participation_list = service.getBaseAmountList()
# get the service provider, either on the model line, or using the
# annotation line reference.
@@ -484,8 +485,8 @@ class PaySheetTransaction(Invoice):
cell_list.append(cell_dict)
# update the base_participation
- base_participation_list = service.getBaseAmountList(base=1)
for base_participation in base_participation_list:
+ base_participation = 'base_amount/%s' %s base_participation
if quantity:
if base_amount_dict.has_key(base_participation) and \
base_amount_dict[base_participation].has_key(share):
@@ -508,7 +509,9 @@ class PaySheetTransaction(Invoice):
source_section=source_section,
int_index=int_index,
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,
categories=categories)
pay_sheet_line_list.append(pay_sheet_line)
--
2.30.9