Commit 79ae6a89 authored by Kevin Deldycke's avatar Kevin Deldycke

Minor code layout changes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7734 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent dbf660de
...@@ -90,10 +90,6 @@ query = { \'portal_type\' : \'Pay Sheet Transaction\'\n ...@@ -90,10 +90,6 @@ query = { \'portal_type\' : \'Pay Sheet Transaction\'\n
, \'sort_on\' : (\'delivery.start_date\', \'ASC\')\n , \'sort_on\' : (\'delivery.start_date\', \'ASC\')\n
}\n }\n
\n \n
# if 0:\n
# print portal_catalog(src__ = 1, **query)\n
# return printed\n
\n
\n \n
# DATA GATHERING part\n # DATA GATHERING part\n
\n \n
...@@ -128,8 +124,8 @@ for p, paysheets in paysheet_par_person.items():\n ...@@ -128,8 +124,8 @@ for p, paysheets in paysheet_par_person.items():\n
salary_value = ps_details[salary_type]\n salary_value = ps_details[salary_type]\n
# Render the value the same way it is printed by PaySheetTransaction_viewPaySheetTransactionAsPDF.\n # Render the value the same way it is printed by PaySheetTransaction_viewPaySheetTransactionAsPDF.\n
gathered_data[p][start_month]["salary"] = float(\'%.2f\' % salary_value)\n gathered_data[p][start_month]["salary"] = float(\'%.2f\' % salary_value)\n
gathered_data[p][start_month]["url"] = paysheet.getPath()\n gathered_data[p][start_month]["url"] = paysheet.getPath()\n
gathered_data[p][start_month]["state"] = paysheet.getSimulationState()\n gathered_data[p][start_month]["state"] = paysheet.getSimulationState()\n
\n \n
# Sort by person name\n # Sort by person name\n
sorted_data = {}\n sorted_data = {}\n
......
...@@ -157,17 +157,17 @@ for serv in paysheet_services:\n ...@@ -157,17 +157,17 @@ for serv in paysheet_services:\n
new_employee_rate = default_values[name][\'employee_rate\']\n new_employee_rate = default_values[name][\'employee_rate\']\n
new_employer_rate = default_values[name][\'employer_rate\']\n new_employer_rate = default_values[name][\'employer_rate\']\n
# create a preview line for every salary_range value of the service\n # create a preview line for every salary_range value of the service\n
createPreviewLine( new_id = serv.getId()\n createPreviewLine( new_id = serv.getId()\n
, new_title = serv.getTitleOrId()\n , new_title = serv.getTitleOrId()\n
, new_base = new_base\n , new_base = new_base\n
, new_base_name = context.portal_categories.resolveCategory(base).getTitleOrId()\n , new_base_name = context.portal_categories.resolveCategory(base).getTitleOrId()\n
, new_employee_rate = new_employee_rate\n , new_employee_rate = new_employee_rate\n
, new_employer_rate = new_employer_rate\n , new_employer_rate = new_employer_rate\n
, new_service_url = serv.getRelativeUrl()\n , new_service_url = serv.getRelativeUrl()\n
, new_organisation_url = serv.getSource()\n , new_organisation_url = serv.getSource()\n
, new_salary_range_cat = base\n , new_salary_range_cat = base\n
, new_tax_cat = tax_cat\n , new_tax_cat = tax_cat\n
)\n )\n
\n \n
# return the list of preview lines\n # return the list of preview lines\n
return l\n return l\n
......
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