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

[nobody at svn.erp5.org]

Author: fabien
Date: Wed Feb  4 11:11:29 2009
New Revision: 25442

URL: http://svn.erp5.org?rev=25442&view=rev
Log:
we don't have to round the value there and correct some mistakes

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.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=25442&r1=25441&r2=25442&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml [utf8] Wed Feb  4 11:11:29 2009
@@ -87,8 +87,8 @@
       \'source_section_title\': line.getSourceSectionTitle(),\n
       \'title\'  : line.getTitle(),\n
       \'payroll_service\' : getattr(line, \'payroll_service\', None),\n
-      \'employer_share_total_price\' : round(getattr(line, \'employer_share_total_price\', 0), precision) or None,\n
-      \'employee_share_total_price\' : round(getattr(line, \'employee_share_total_price\', 0), precision) or None\n
+      \'employer_share_total_price\' : getattr(line, \'employer_share_total_price\', None),\n
+      \'employee_share_total_price\' : getattr(line, \'employee_share_total_price\', None),\n
       }\n
 \n
   addProperties(line=line, line_dict=line_dict, property_list=property_list)\n
@@ -145,7 +145,6 @@
                             <string>line</string>
                             <string>getattr</string>
                             <string>None</string>
-                            <string>round</string>
                             <string>line_dict</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml?rev=25442&r1=25441&r2=25442&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml [utf8] Wed Feb  4 11:11:29 2009
@@ -67,7 +67,7 @@
 \n
 portal = context.getPortalObject();\n
 paysheet_line_list = context.contentValues(portal_type=\'Pay Sheet Line\')\n
-if context.getPriceCurrencyValue():\n
+if context.getPriceCurrencyValue() is not None:\n
   precision = context.getPriceCurrencyValue().getQuantityPrecision()\n
 else:\n
   precision = 2\n
@@ -238,6 +238,7 @@
                             <string>context</string>
                             <string>portal</string>
                             <string>paysheet_line_list</string>
+                            <string>None</string>
                             <string>precision</string>
                             <string>line_list</string>
                             <string>_getiter_</string>
@@ -250,7 +251,6 @@
                             <string>str</string>
                             <string>translated_base_application_list</string>
                             <string>payroll_service</string>
-                            <string>None</string>
                             <string>base_contribution_list</string>
                             <string>causality</string>
                             <string>base_application</string>

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml?rev=25442&r1=25441&r2=25442&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.xml [utf8] Wed Feb  4 11:11:29 2009
@@ -73,7 +73,6 @@
 portal_simulation = portal.portal_simulation\n
 \n
 base_amount = portal.portal_categories.base_amount\n
-context.log(base_contribution_list)\n
 base_contribution_uid_list = [getattr(base_amount, category, None).getUid() for category in base_contribution_list]\n
 \n
 params = {\n

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=25442&r1=25441&r2=25442&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Wed Feb  4 11:11:29 2009
@@ -1,1 +1,1 @@
-345
+346