From bf22132da43d50123cd06eaf610687613db582e4 Mon Sep 17 00:00:00 2001
From: Yusuke Muraoka <yusuke@nexedi.com>
Date: Tue, 1 Sep 2009 08:37:08 +0000
Subject: [PATCH] 2009-09-01 yusuke * tax_category category is renamed to
 contribution_share category

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28711 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 ...aySheetTransaction_getOtherInformationsDataDict.xml | 10 +++++-----
 .../PaySheetTransaction_getYearToDateSlice.xml         |  4 ++--
 bt5/erp5_payroll_l10n_fr/bt/change_log                 |  3 +++
 bt5/erp5_payroll_l10n_fr/bt/revision                   |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

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 f1ba2561c1..28f42452c3 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
@@ -115,7 +115,7 @@ def getPriceCurrencyId(currency):\n
 \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
+    contribution_share=\'contribution_share/employee\')\n
 def getTaxableNetPayId(salaire_net_imposable):\n
   s = \'\'\n
   if salaire_net_imposable:\n
@@ -124,7 +124,7 @@ def getTaxableNetPayId(salaire_net_imposable):\n
 \n
 total_employee_tax = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
     base_contribution=\'base_contribution/base_amount/total_deductions\',\n
-    tax_category=\'tax_category/employee_share\')\n
+    contribution_share=\'contribution_share/employee\')\n
 def getTotalEmployeeTaxId(total_employee_tax):\n
   s = \'\'\n
   if total_employee_tax:\n
@@ -134,7 +134,7 @@ def getTotalEmployeeTaxId(total_employee_tax):\n
 \n
 total_employer_tax = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
     base_contribution=\'base_contribution/base_amount/total_deductions\',\n
-    tax_category=\'tax_category/employer_share\')\n
+    contribution_share=\'contribution_share/employer\')\n
 def getTotalEmployerTaxId(total_employer_tax):\n
   s = \'\'\n
   if total_employer_tax:\n
@@ -177,7 +177,7 @@ def getPaymentConditionText(paysheet):\n
 \n
 gross_salary = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
     base_contribution=\'base_contribution/base_amount/gross_salary\',\n
-    tax_category=\'tax_category/employee_share\')\n
+    contribution_share=\'contribution_share/employee\')\n
 year_to_date_gross_salary = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
     paysheet=context, base_contribution_list=\'gross_salary\') + gross_salary\n
 \n
@@ -199,7 +199,7 @@ year_to_date_bonus_worked_hour_amount = context.PaySheetTransaction_getYearToDat
     paysheet=context, base_contribution_list=\'overtime\') + \\\n
     context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
     base_contribution=\'base_contribution/base_amount/overtime\', \\\n
-    tax_category=\'tax_category/employee_share\') or 0\n
+    contribution_share=\'contribution_share/employee\') or 0\n
 \n
 year_to_date_taxable_net_salary = context.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
     paysheet=context, base_contribution_list=\'salaire_net_imposable\') + salaire_net_imposable\n
diff --git a/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml b/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
index afd61a5190..a6a47e7b38 100644
--- a/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
+++ b/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
@@ -89,7 +89,7 @@ plafond_min = slice.getQuantityRangeMin()\n
 \n
 gross_salary = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
     base_contribution=\'base_contribution/base_amount/gross_salary\',\n
-    tax_category=\'tax_category/employee_share\')\n
+    contribution_share=\'contribution_share/employee\')\n
 \n
 if gross_salary < plafond_max:\n
   slice_amount = gross_salary - plafond_min\n
@@ -107,7 +107,7 @@ for paysheet in paysheet_list :\n
     plafond_min = slice.getQuantityRangeMin()\n
     gross_salary=paysheet.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
         base_contribution=\'base_contribution/base_amount/gross_salary\',\n
-        tax_category=\'tax_category/employee_share\')\n
+        contribution_share=\'contribution_share/employee\')\n
     slice_amount = 0\n
     if gross_salary < plafond_max:\n
       slice_amount = gross_salary - plafond_min\n
diff --git a/bt5/erp5_payroll_l10n_fr/bt/change_log b/bt5/erp5_payroll_l10n_fr/bt/change_log
index 4b773ef634..654fb85505 100644
--- a/bt5/erp5_payroll_l10n_fr/bt/change_log
+++ b/bt5/erp5_payroll_l10n_fr/bt/change_log
@@ -1,3 +1,6 @@
+2009-09-01 yusuke
+* tax_category category is renamed to contribution_share category
+
 2009-03-10 fabien
 * 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 3fbd193e4a..d25720879e 100644
--- a/bt5/erp5_payroll_l10n_fr/bt/revision
+++ b/bt5/erp5_payroll_l10n_fr/bt/revision
@@ -1 +1 @@
-106
\ No newline at end of file
+112
\ No newline at end of file
-- 
2.30.9