[Erp5-report] r18266 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Dec 12 14:54:12 CET 2007
Author: fabien
Date: Wed Dec 12 14:54:11 2007
New Revision: 18266
URL: http://svn.erp5.org?rev=18266&view=rev
Log:
remove some round that are not requiered and distorts results
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml
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/PaySheetLine_viewCells/matrixbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox.xml?rev=18266&r1=18265&r2=18266&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox.xml Wed Dec 12 14:54:11 2007
@@ -370,11 +370,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -389,11 +386,8 @@
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -408,11 +402,8 @@
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml?rev=18266&r1=18265&r2=18266&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getAmountFromBaseParticipationList.xml Wed Dec 12 14:54:11 2007
@@ -101,17 +101,18 @@
if category in pay_sheet_line.getVariationCategoryList():\n
cell = pay_sheet_line.getCell(slice, category)\n
total_price = cell.getQuantity() * cell.getPrice()\n
- amount += round(total_price, precision)\n
+ amount += total_price\n
else:\n
for category in category_list:\n
if category in pay_sheet_line.getVariationCategoryList():\n
cell = pay_sheet_line.getCell(category)\n
total_price = cell.getQuantity() * cell.getPrice()\n
- amount += round(total_price, precision)\n
+ amount += total_price\n
\n
break # this permit to add only one time the amount even \n
# if many base_amount are in base_participation_list\n
\n
+amount = round(amount, precision)\n
return amount\n
</string> </value>
</item>
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=18266&r1=18265&r2=18266&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 Wed Dec 12 14:54:11 2007
@@ -95,8 +95,6 @@
line_dict[\'base_name\'] = getattr(line, \'base_name\', None)\n
\n
line_dict[\'base\'] = getattr(line, \'base\', None)\n
- if line_dict[\'base\'] != None:\n
- line_dict[\'base\'] = round(line_dict[\'base\'], precision)\n
\n
line_dict[\'employer_share_rate\'] = getattr(line, \'employer_share_rate\', None)\n
if line_dict[\'employer_share_rate\'] != None:\n
@@ -105,9 +103,6 @@
line_dict[\'employer_share_amount\'] = getattr(line, \'employer_share_amount\', \n
None)\n
\n
- if line_dict[\'employer_share_amount\'] != None:\n
- line_dict[\'employer_share_amount\'] = \\\n
- round(line_dict[\'employer_share_amount\'], precision)\n
line_dict[\'employee_share_rate\'] = getattr(line, \'employee_share_rate\', None)\n
\n
if line_dict[\'employee_share_rate\'] != None:\n
@@ -115,10 +110,6 @@
str(line_dict[\'employee_share_rate\']*100)+\'%\'\n
line_dict[\'employee_share_amount\'] = getattr(line, \'employee_share_amount\', \n
None)\n
-\n
- if line_dict[\'employee_share_amount\'] != None:\n
- line_dict[\'employee_share_amount\'] = \\\n
- round(line_dict[\'employee_share_amount\'], precision)\n
\n
line_dict_list.append(line_dict)\n
\n
@@ -179,7 +170,6 @@
<string>line_dict</string>
<string>_write_</string>
<string>_getitem_</string>
- <string>round</string>
<string>str</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=18266&r1=18265&r2=18266&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Wed Dec 12 14:54:11 2007
@@ -1,1 +1,1 @@
-184
+186
More information about the Erp5-report
mailing list