[Erp5-report] r28711 - in /erp5/trunk/bt5/erp5_payroll_l10n_fr: SkinTemplateItem/portal_ski...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Sep 1 10:37:08 CEST 2009 

Author: yusuke
Date: Tue Sep  1 10:37:08 2009
New Revision: 28711

URL: http://svn.erp5.org?rev=28711&view=rev
Log:
2009-09-01 yusuke
* tax_category category is renamed to contribution_share category

Modified:
    erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
    erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/change_log
    erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml?rev=28711&r1=28710&r2=28711&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml [utf8] Tue Sep  1 10:37:08 2009
@@ -115,7 +115,7 @@
 \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 @@
 \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 @@
 \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 @@
 \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 @@
     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

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml?rev=28711&r1=28710&r2=28711&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml [utf8] Tue Sep  1 10:37:08 2009
@@ -89,7 +89,7 @@
 \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 @@
     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

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/change_log?rev=28711&r1=28710&r2=28711&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/change_log [utf8] Tue Sep  1 10:37:08 2009
@@ -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

Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision?rev=28711&r1=28710&r2=28711&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] Tue Sep  1 10:37:08 2009
@@ -1,1 +1,1 @@
-106
+112

More information about the Erp5-report mailing list