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

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Jun 10 17:27:08 2008
New Revision: 21474

URL: http://svn.erp5.org?rev=21474&view=rev
Log:
Support taxes with only employer share, show the base total

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

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml?rev=21474&r1=21473&r2=21474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getPaySheetLineReportSectionLineList.xml Tue Jun 10 17:27:08 2008
@@ -122,6 +122,7 @@
 \n
 employee_total = 0\n
 employer_total = 0\n
+base_total = 0\n
 \n
 i = 0\n
 for inventory in employee_inventory_list:\n
@@ -135,9 +136,19 @@
                employee_share=price,\n
                base=inventory.quantity, )\n
   employee_total += price\n
-\n
-# XXX what about taxes with only employer share ?\n
+  base_total += inventory.quantity\n
+\n
 for inventory in employer_inventory_list:\n
+  if employee.getUid() not in inventory_list:\n
+    inventory_list[employee.getUid()] = Object(id=i,\n
+               employee_career_reference=employee.getCareerReference(),\n
+               employee_title=employee.getTitle(),\n
+               employee_career_function=employee.getCareerFunctionTitle(),\n
+               employee_share=0,\n
+               base=inventory.quantity, )\n
+    base_total += inventory.quantity\n
+    i = i + 1\n
+\n
   price = inventory.total_price or 0\n
   employee = inventory.getDestinationValue()\n
   inventory_list[employee.getUid()].employer_share = price\n
@@ -149,6 +160,7 @@
 \n
 request.set(\'employee_total\', employee_total)\n
 request.set(\'employer_total\', employer_total)\n
+request.set(\'base_total\', base_total)\n
 request.set(\'total\', total)\n
 \n
 invent_list = []\n
@@ -233,6 +245,7 @@
                             <string>inventory_list</string>
                             <string>employee_total</string>
                             <string>employer_total</string>
+                            <string>base_total</string>
                             <string>i</string>
                             <string>_getiter_</string>
                             <string>inventory</string>

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_statPaySheetLineReportSectionLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_statPaySheetLineReportSectionLineList.xml?rev=21474&r1=21473&r2=21474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_statPaySheetLineReportSectionLineList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_statPaySheetLineReportSectionLineList.xml Tue Jun 10 17:27:08 2008
@@ -70,8 +70,9 @@
 request = context.REQUEST\n
 \n
 return [Object(employee_share= request[\'employee_total\'],\n
-              employer_share=request[\'employer_total\'],\n
-              total= request[\'total\']\n
+               employer_share=request[\'employer_total\'],\n
+               base=request[\'base_total\'],\n
+               total= request[\'total\']\n
               )\n
        ]\n
 </string> </value>

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=21474&r1=21473&r2=21474&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Tue Jun 10 17:27:08 2008
@@ -1,1 +1,1 @@
-265
+266