[Erp5-report] r19736 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Mar  6 16:49:10 2008
New Revision: 19736

URL: http://svn.erp5.org?rev=19736&view=rev
Log:
also export *_total_price in PaySheetTransaction_getLineListAsDict

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml?rev=19736&r1=19735&r2=19736&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml Thu Mar  6 16:49:10 2008
@@ -80,7 +80,8 @@
 \n
     #XXX this is a hack wich should be removed when the OOoTemplate will be\n
     # rewireted\n
-    if line_dict[property] is not None and property.endswith(\'_price\'):\n
+    if line_dict[property] is not None and property in (\'employee_share_price\',\n
+                                                        \'employer_share_price\'):\n
       line_dict[property] = \'%s %%\' % (float(line_dict[property])*100)\n
   return line_dict\n
 \n
@@ -92,8 +93,10 @@
                   \'base\',\n
                   \'employer_share_price\',\n
                   \'employer_share_quantity\',\n
+                  \'employer_share_total_price\',\n
                   \'employee_share_price\',\n
                   \'employee_share_quantity\',\n
+                  \'employee_share_total_price\',\n
                   \'causality\',\n
                 ]\n
 for line in line_list: \n

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=19736&r1=19735&r2=19736&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Thu Mar  6 16:49:10 2008
@@ -1,1 +1,1 @@
-218
+219