[Erp5-report] r9262 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_p...

[nobody at svn.erp5.org]

Author: kevin
Date: Fri Aug 18 17:44:58 2006
New Revision: 9262

URL: http://svn.erp5.org?rev=9262&view=rev
Log:
French payroll rate updated.

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml
    erp5/trunk/bt5/erp5_payroll/bt/change_log
    erp5/trunk/bt5/erp5_payroll/bt/revision
    erp5/trunk/bt5/erp5_payroll/bt/version

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml?rev=9262&r1=9261&r2=9262&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_preCalculation_l10n_fr_2006.xml Fri Aug 18 17:44:58 2006
@@ -301,8 +301,12 @@
 }\n
 \n
 # FNGS\n
+# Employer rate has changed starting from jul, 1st 2006\n
+fngs_employer_rate = 0.25\n
+if stop_date < DateTime(2006, 7, 1):\n
+  fngs_employer_rate = 0.15\n
 default[\'fngs/salaire_brut\'] = \\\n
-{ \'employer_rate\' : 0.25\n
+{ \'employer_rate\' : fngs_employer_rate\n
 , \'employee_rate\' : None\n
 , \'base\'          : gross_salary\n
 }\n
@@ -592,6 +596,7 @@
                             <string>new_name</string>
                             <string>employer_rate</string>
                             <string>employee_rate</string>
+                            <string>fngs_employer_rate</string>
                             <string>employee_share_rate</string>
                             <string>employer_share_rate</string>
                             <string>col_agr</string>

Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=9262&r1=9261&r2=9262&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log Fri Aug 18 17:44:58 2006
@@ -1,3 +1,6 @@
+2006-08-18 Kevin
+* French payroll rate updated.
+
 2006-07-25 jerome
 * put services in a dedicated module, payroll_service_module
 
@@ -58,4 +61,4 @@
 * PaySheetTransaction_preCalculation() now handle ceiling salary year safely.
 
 2005-07-07 Jérome
-* Rename service to service_module.
+* Rename service to service_module.

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=9262&r1=9261&r2=9262&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Fri Aug 18 17:44:58 2006
@@ -1,1 +1,1 @@
-1
+12

Modified: erp5/trunk/bt5/erp5_payroll/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/version?rev=9262&r1=9261&r2=9262&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/version (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/version Fri Aug 18 17:44:58 2006
@@ -1,1 +1,1 @@
-0.1.6
+0.1.7