Commit b300c36d authored by Fabien Morin's avatar Fabien Morin

we don't have to round the value there and correct some mistakes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25442 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d9409df7
...@@ -87,8 +87,8 @@ for line in line_list: \n ...@@ -87,8 +87,8 @@ for line in line_list: \n
\'source_section_title\': line.getSourceSectionTitle(),\n \'source_section_title\': line.getSourceSectionTitle(),\n
\'title\' : line.getTitle(),\n \'title\' : line.getTitle(),\n
\'payroll_service\' : getattr(line, \'payroll_service\', None),\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 \'employer_share_total_price\' : getattr(line, \'employer_share_total_price\', None),\n
\'employee_share_total_price\' : round(getattr(line, \'employee_share_total_price\', 0), precision) or None\n \'employee_share_total_price\' : getattr(line, \'employee_share_total_price\', None),\n
}\n }\n
\n \n
addProperties(line=line, line_dict=line_dict, property_list=property_list)\n addProperties(line=line, line_dict=line_dict, property_list=property_list)\n
...@@ -145,7 +145,6 @@ return line_dict_list\n ...@@ -145,7 +145,6 @@ return line_dict_list\n
<string>line</string> <string>line</string>
<string>getattr</string> <string>getattr</string>
<string>None</string> <string>None</string>
<string>round</string>
<string>line_dict</string> <string>line_dict</string>
</tuple> </tuple>
</value> </value>
......
...@@ -67,7 +67,7 @@ from Products.ERP5Type.Message import translateString\n ...@@ -67,7 +67,7 @@ from Products.ERP5Type.Message import translateString\n
\n \n
portal = context.getPortalObject();\n portal = context.getPortalObject();\n
paysheet_line_list = context.contentValues(portal_type=\'Pay Sheet Line\')\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 precision = context.getPriceCurrencyValue().getQuantityPrecision()\n
else:\n else:\n
precision = 2\n precision = 2\n
...@@ -238,6 +238,7 @@ return line_list\n ...@@ -238,6 +238,7 @@ return line_list\n
<string>context</string> <string>context</string>
<string>portal</string> <string>portal</string>
<string>paysheet_line_list</string> <string>paysheet_line_list</string>
<string>None</string>
<string>precision</string> <string>precision</string>
<string>line_list</string> <string>line_list</string>
<string>_getiter_</string> <string>_getiter_</string>
...@@ -250,7 +251,6 @@ return line_list\n ...@@ -250,7 +251,6 @@ return line_list\n
<string>str</string> <string>str</string>
<string>translated_base_application_list</string> <string>translated_base_application_list</string>
<string>payroll_service</string> <string>payroll_service</string>
<string>None</string>
<string>base_contribution_list</string> <string>base_contribution_list</string>
<string>causality</string> <string>causality</string>
<string>base_application</string> <string>base_application</string>
......
...@@ -73,7 +73,6 @@ portal = context.getPortalObject();\n ...@@ -73,7 +73,6 @@ portal = context.getPortalObject();\n
portal_simulation = portal.portal_simulation\n portal_simulation = portal.portal_simulation\n
\n \n
base_amount = portal.portal_categories.base_amount\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 base_contribution_uid_list = [getattr(base_amount, category, None).getUid() for category in base_contribution_list]\n
\n \n
params = {\n params = {\n
......
345 346
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment