[Erp5-report] r25942 - in /erp5/trunk/bt5/erp5_payroll_l10n_fr: PathTemplateItem/portal_cat...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 10 14:55:18 CET 2009
Author: fabien
Date: Tue Mar 10 14:55:13 2009
New Revision: 25942
URL: http://svn.erp5.org?rev=25942&view=rev
Log:
revert the category change
Added:
erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/salaire_net_imposable.xml
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/payroll_odt_macro.xml
erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/change_log
erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision
erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_path_list
Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/salaire_net_imposable.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/salaire_net_imposable.xml?rev=25942&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/salaire_net_imposable.xml (added)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/PathTemplateItem/portal_categories/base_amount/salaire_net_imposable.xml [utf8] Tue Mar 10 14:55:13 2009
@@ -1,0 +1,59 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="Category" module="Products.ERP5Type.Document.Category"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>base_amount/salaire_net_imposable</string>
+ <string>base_amount/salaire_net_imposable</string>
+ <string>base_amount/salaire_net_imposable</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>codification</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>salaire_net_imposable</string> </value>
+ </item>
+ <item>
+ <key> <string>int_index</string> </key>
+ <value> <int>102</int> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Category</string> </value>
+ </item>
+ <item>
+ <key> <string>short_title</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Salaire net imposable</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
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=25942&r1=25941&r2=25942&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 Mar 10 14:55:13 2009
@@ -121,13 +121,13 @@
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
- s = \'\'\n
- if taxable_net_pay:\n
- s += \'%s: %s\' % (translateString(\'Taxable Net Pay\'), taxable_net_pay)\n
+def getTaxableNetPayId(salaire_net_imposable):\n
+ s = \'\'\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 @@
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 @@
\'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 @@
<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>
Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/payroll_odt_macro.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/payroll_odt_macro.xml?rev=25942&r1=25941&r2=25942&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/payroll_odt_macro.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/payroll_odt_macro.xml [utf8] Tue Mar 10 14:55:13 2009
@@ -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
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=25942&r1=25941&r2=25942&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 Mar 10 14:55:13 2009
@@ -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
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=25942&r1=25941&r2=25942&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] Tue Mar 10 14:55:13 2009
@@ -1,1 +1,1 @@
-84
+86
Modified: erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_path_list?rev=25942&r1=25941&r2=25942&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_path_list [utf8] Tue Mar 10 14:55:13 2009
@@ -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
More information about the Erp5-report
mailing list