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

[nobody at svn.erp5.org]

Author: kevin
Date: Wed Aug 23 17:50:43 2006
New Revision: 9363

URL: http://svn.erp5.org?rev=9363&view=rev
Log:
Fix bad comparison on pre_calculation scripts.

Added:
    erp5/trunk/bt5/erp5_payroll/bt/id_generator
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=9363&r1=9362&r2=9363&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 Wed Aug 23 17:50:43 2006
@@ -303,7 +303,7 @@
 # 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
+if start_date >= DateTime(2006, 7, 1):\n
   fngs_employer_rate = 0.15\n
 default[\'fngs/salaire_brut\'] = \\\n
 { \'employer_rate\' : fngs_employer_rate\n
@@ -462,7 +462,7 @@
 # }\n
 \n
 # Syntec convention\n
-# TOD0: We can\'t take the decision based on the CollectiveAgreementTitle since each\n
+# TODO: We can\'t take the decision based on the CollectiveAgreementTitle since each\n
 #       employee has the right to choose if they want benefit from the insurance or not.\n
 #       We can use instead the social_contract property of the (near-)future HR-related stuff.\n
 col_agr = employee.getCareerCollectiveAgreementTitle()\n

Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=9363&r1=9362&r2=9363&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log Wed Aug 23 17:50:43 2006
@@ -1,3 +1,6 @@
+2006-08-23 Kevin
+* Fix bad comparison on pre_calculation.
+
 2006-08-18 Kevin
 * French payroll rate updated.
 

Added: erp5/trunk/bt5/erp5_payroll/bt/id_generator
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/id_generator?rev=9363&view=auto
==============================================================================
    (empty)

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=9363&r1=9362&r2=9363&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Wed Aug 23 17:50:43 2006
@@ -1,1 +1,1 @@
-15
+20

Modified: erp5/trunk/bt5/erp5_payroll/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/version?rev=9363&r1=9362&r2=9363&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/version (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/version Wed Aug 23 17:50:43 2006
@@ -1,1 +1,1 @@
-0.1.7
+0.1.8