From 6d50f2b494ce9fbdf4043ac22ab309bb47b3b24c Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Tue, 10 Mar 2009 13:55:27 +0000 Subject: [PATCH] revert the category change git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25943 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ..._net_pay.xml => salaire_net_imposable.xml} | 9 +++++---- ...ansaction_getOtherInformationsDataDict.xml | 20 +++++++++---------- .../payroll_odt_macro.xml | 4 ++-- bt5/erp5_payroll_l10n_fr/bt/change_log | 1 - bt5/erp5_payroll_l10n_fr/bt/revision | 2 +- .../bt/template_path_list | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) rename bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/{taxable_net_pay.xml => salaire_net_imposable.xml} (80%) diff --git a/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/taxable_net_pay.xml b/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/salaire_net_imposable.xml similarity index 80% rename from bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/taxable_net_pay.xml rename to bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/salaire_net_imposable.xml index 28bfaa5f04..85c6cdce78 100644 --- a/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/taxable_net_pay.xml +++ b/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/salaire_net_imposable.xml @@ -13,8 +13,9 @@ <key> <string>categories</string> </key> <value> <tuple> - <string>base_amount/taxable_net_pay</string> - <string>base_amount/taxable_net_pay</string> + <string>base_amount/salaire_net_imposable</string> + <string>base_amount/salaire_net_imposable</string> + <string>base_amount/salaire_net_imposable</string> </tuple> </value> </item> @@ -32,7 +33,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>taxable_net_pay</string> </value> + <value> <string>salaire_net_imposable</string> </value> </item> <item> <key> <string>int_index</string> </key> @@ -50,7 +51,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Taxable Net Pay</string> </value> + <value> <string>Salaire net imposable</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml b/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml index 8dcb700103..f0c626d2fc 100644 --- a/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml +++ b/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml @@ -121,13 +121,13 @@ def getPriceCurrencyId(currency):\n s += \'%s: %s\' % (translateString(\'Price Currency\'), currency)\n return s\n \n -taxable_net_pay = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n - base_contribution=\'base_contribution/base_amount/taxable_net_pay\',\n +salaire_net_imposable = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n + base_contribution=\'base_contribution/base_amount/salaire_net_imposable\',\n tax_category=\'tax_category/employee_share\')\n -def getTaxableNetPayId(taxable_net_pay):\n +def getTaxableNetPayId(salaire_net_imposable):\n s = \'\'\n - if taxable_net_pay:\n - s += \'%s: %s\' % (translateString(\'Taxable Net Pay\'), taxable_net_pay)\n + if salaire_net_imposable:\n + s += \'%s: %s\' % (translateString(\'Taxable Net Pay\'), salaire_net_imposable)\n return s\n \n total_employee_tax = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n @@ -211,11 +211,11 @@ year_to_date_bonus_worked_hour_amount = context.PaySheetTransaction_getYearToDat base_contribution=\'base_contribution/base_amount/overtime\', \\\n tax_category=\'tax_category/employee_share\') or 0\n \n -taxable_net_pay = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n - base_contribution=\'base_contribution/base_amount/taxable_net_pay\',\n +salaire_net_imposable = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n + base_contribution=\'base_contribution/base_amount/salaire_net_imposable\',\n tax_category=\'tax_category/employee_share\')\n year_to_date_taxable_net_salary = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n - paysheet=context, base_contribution_list=\'taxable_net_pay\') + taxable_net_pay\n + paysheet=context, base_contribution_list=\'salaire_net_imposable\') + salaire_net_imposable\n \n def unicodeDict(d):\n for k, v in d.items():\n @@ -258,7 +258,7 @@ data_dict = {\n \'bonus_worked_hour_count\': bonus_worked_hour_count,\n \'absence_hour_count\': 0, #XXX currently absence hour are not take into \n # account in payroll\n - \'taxable_net_pay\': getTaxableNetPayId(taxable_net_pay),\n + \'salaire_net_imposable\': getTaxableNetPayId(salaire_net_imposable),\n \'total_employee_tax\': getTotalEmployeeTaxId(total_employee_tax),\n \'total_employer_tax\': getTotalEmployerTaxId(total_employer_tax),\n }\n @@ -316,7 +316,7 @@ return unicodeDict(data_dict)\n <string>getCareerCoefficientId</string> <string>getHiringDateId</string> <string>getPriceCurrencyId</string> - <string>taxable_net_pay</string> + <string>salaire_net_imposable</string> <string>getTaxableNetPayId</string> <string>total_employee_tax</string> <string>getTotalEmployeeTaxId</string> diff --git a/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/payroll_odt_macro.xml b/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/payroll_odt_macro.xml index e78be2816e..dd9cacbaf4 100644 --- a/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/payroll_odt_macro.xml +++ b/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/payroll_odt_macro.xml @@ -136,8 +136,8 @@ tal:condition=\'data_dict/default_payment_condition_payment_text\'\n tal:content=\'python:data_dict["default_payment_condition_payment_text"]\'>Payement: Chèque le 01/12/2009</text:p>\n <text:p text:style-name=\'Table_20_Contents_20_Left\'\n - tal:condition=\'data_dict/taxable_net_pay\'\n - tal:content=\'python:data_dict["taxable_net_pay"]\'>Salaire net imposable: 200 000</text:p>\n + tal:condition=\'data_dict/salaire_net_imposable\'\n + tal:content=\'python:data_dict["salaire_net_imposable"]\'>Salaire net imposable: 200 000</text:p>\n <text:p text:style-name=\'Table_20_Contents_20_Left\'\n tal:condition=\'data_dict/total_employee_tax\'\n tal:content=\'python:data_dict["total_employee_tax"]\'>Total cotisation employé: 200 000</text:p>\n diff --git a/bt5/erp5_payroll_l10n_fr/bt/change_log b/bt5/erp5_payroll_l10n_fr/bt/change_log index 6e43abbc5e..4b773ef634 100644 --- a/bt5/erp5_payroll_l10n_fr/bt/change_log +++ b/bt5/erp5_payroll_l10n_fr/bt/change_log @@ -1,5 +1,4 @@ 2009-03-10 fabien -* rename salaire_net_imposabe base_amount into taxable_net_pay * add a macro used to display localised information in a part of the payslip * increment version number because of the new style of the payslip diff --git a/bt5/erp5_payroll_l10n_fr/bt/revision b/bt5/erp5_payroll_l10n_fr/bt/revision index 3ca9062a11..8bfa2f5ecd 100644 --- a/bt5/erp5_payroll_l10n_fr/bt/revision +++ b/bt5/erp5_payroll_l10n_fr/bt/revision @@ -1 +1 @@ -84 \ No newline at end of file +86 \ No newline at end of file diff --git a/bt5/erp5_payroll_l10n_fr/bt/template_path_list b/bt5/erp5_payroll_l10n_fr/bt/template_path_list index 31b7efd0f9..86d5cb2a35 100644 --- a/bt5/erp5_payroll_l10n_fr/bt/template_path_list +++ b/bt5/erp5_payroll_l10n_fr/bt/template_path_list @@ -1,5 +1,5 @@ portal_categories/base_amount/base_csg -portal_categories/base_amount/taxable_net_pay +portal_categories/base_amount/salaire_net_imposable portal_categories/salary_range/france portal_categories/salary_range/france/tranche_1 portal_categories/salary_range/france/tranche_2 -- 2.30.9