From 897379fd0d1088fc668e4d008e5e396fc902b8d5 Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Mon, 10 Dec 2007 08:54:05 +0000 Subject: [PATCH] - invert salary_range and tax_category order because of changes the PayrollService_view. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18157 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../PaySheetTransaction_postCalculation.xml | 4 ++-- bt5/erp5_payroll_l10n_fr/bt/revision | 2 +- .../bt/template_catalog_datetime_key_list | 0 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 bt5/erp5_payroll_l10n_fr/bt/template_catalog_datetime_key_list diff --git a/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_postCalculation.xml b/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_postCalculation.xml index 7d8a93f379..5e3684131b 100644 --- a/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_postCalculation.xml +++ b/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_postCalculation.xml @@ -72,8 +72,8 @@ tax_amount = context.PaySheetTransaction_getAmountFromBaseParticipationList(\\\n base_participation_list=(\'non_deductible_tax\', \'deductible_tax\'), \n category_list=\'tax_category/employee_share\')\n \n -new_cell = {\'axe_list\' : [ \'tax_category/employee_share\',\n - \'salary_range/france/forfait\'],\n +new_cell = {\'axe_list\' : [ \'salary_range/france/forfait\',\n + \'tax_category/employee_share\'],\n \'quantity\' : tax_amount,\n \'price\' : 1,}\n \n diff --git a/bt5/erp5_payroll_l10n_fr/bt/revision b/bt5/erp5_payroll_l10n_fr/bt/revision index 6139554210..8783e30511 100644 --- a/bt5/erp5_payroll_l10n_fr/bt/revision +++ b/bt5/erp5_payroll_l10n_fr/bt/revision @@ -1 +1 @@ -52 \ No newline at end of file +53 \ No newline at end of file diff --git a/bt5/erp5_payroll_l10n_fr/bt/template_catalog_datetime_key_list b/bt5/erp5_payroll_l10n_fr/bt/template_catalog_datetime_key_list new file mode 100644 index 0000000000..e69de29bb2 -- 2.30.9