[Erp5-report] r21660 - /erp5/trunk/products/ERP5/Document/PaySheetTransaction.py

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Jun 17 17:51:45 2008
New Revision: 21660

URL: http://svn.erp5.org?rev=21660&view=rev
Log:
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.

Modified:
    erp5/trunk/products/ERP5/Document/PaySheetTransaction.py

Modified: erp5/trunk/products/ERP5/Document/PaySheetTransaction.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PaySheetTransaction.py?rev=21660&r1=21659&r2=21660&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaySheetTransaction.py (original)
+++ erp5/trunk/products/ERP5/Document/PaySheetTransaction.py Tue Jun 17 17:51:45 2008
@@ -352,6 +352,7 @@
       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 @@
           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 @@
                                             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)