diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml index 2597ad856322f7c38d223c73a5844cb48d9ce2c7..d36612ae1fc4c3ad0054ac8d26a79389d2674fd4 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewAnnualSalaryReport.xml @@ -90,10 +90,6 @@ query = { \'portal_type\' : \'Pay Sheet Transaction\'\n , \'sort_on\' : (\'delivery.start_date\', \'ASC\')\n }\n \n -# if 0:\n -# print portal_catalog(src__ = 1, **query)\n -# return printed\n -\n \n # DATA GATHERING part\n \n @@ -128,8 +124,8 @@ for p, paysheets in paysheet_par_person.items():\n salary_value = ps_details[salary_type]\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]["url"] = paysheet.getPath()\n - gathered_data[p][start_month]["state"] = paysheet.getSimulationState()\n + gathered_data[p][start_month]["url"] = paysheet.getPath()\n + gathered_data[p][start_month]["state"] = paysheet.getSimulationState()\n \n # Sort by person name\n sorted_data = {}\n diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml index 7fa609c994b837b6a6d880ba343ae7b61fe17163..70e5c4c3e74a64755a0b0fad3398632546612f0c 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_initializePreview.xml @@ -157,17 +157,17 @@ for serv in paysheet_services:\n new_employee_rate = default_values[name][\'employee_rate\']\n new_employer_rate = default_values[name][\'employer_rate\']\n # create a preview line for every salary_range value of the service\n - createPreviewLine( new_id = serv.getId()\n - , new_title = serv.getTitleOrId()\n - , new_base = new_base\n - , new_base_name = context.portal_categories.resolveCategory(base).getTitleOrId()\n - , new_employee_rate = new_employee_rate\n - , new_employer_rate = new_employer_rate\n - , new_service_url = serv.getRelativeUrl()\n - , new_organisation_url = serv.getSource()\n - , new_salary_range_cat = base\n - , new_tax_cat = tax_cat\n - )\n + createPreviewLine( new_id = serv.getId()\n + , new_title = serv.getTitleOrId()\n + , new_base = new_base\n + , new_base_name = context.portal_categories.resolveCategory(base).getTitleOrId()\n + , new_employee_rate = new_employee_rate\n + , new_employer_rate = new_employer_rate\n + , new_service_url = serv.getRelativeUrl()\n + , new_organisation_url = serv.getSource()\n + , new_salary_range_cat = base\n + , new_tax_cat = tax_cat\n + )\n \n # return the list of preview lines\n return l\n