[Erp5-report] r27533 - in /erp5/trunk/bt5/erp5_payroll_l10n_fr: SkinTemplateItem/portal_ski...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jun 11 16:56:46 CEST 2009
Author: fabien
Date: Thu Jun 11 16:56:45 2009
New Revision: 27533
URL: http://svn.erp5.org?rev=27533&view=rev
Log:
fix a bug
Added:
erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_local_role_list
erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_portal_type_role_list
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/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=27533&r1=27532&r2=27533&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] Thu Jun 11 16:56:45 2009
@@ -181,11 +181,9 @@
\n
year_to_date_slice_a = context.PaySheetTransaction_getYearToDateSlice(\'salary_range/france/tranche_a\')\n
\n
-worked_hour_count = context.getWorkTimeAnnotationLineQuantity() and\\\n
- context.getWorkTimeAnnotationLineQuantity(0)\n
+worked_hour_count = context.getWorkTimeAnnotationLineQuantity(0)\n
year_to_date_worked_hour_count = worked_hour_count + \\\n
context.PaySheetTransaction_getYearToDateWorkTimeSalary() or 0\n
- \n
\n
over_time_small_rate = context.getAnnotationLineFromReference(reference=\'overtime_small_rate\')\n
over_time_big_rate = context.getAnnotationLineFromReference(reference=\'overtime_big_rate\')\n
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=27533&r1=27532&r2=27533&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] Thu Jun 11 16:56:45 2009
@@ -1,1 +1,1 @@
-100
+101
Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_local_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_local_role_list?rev=27533&view=auto
==============================================================================
(empty)
Added: erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_portal_type_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/template_portal_type_role_list?rev=27533&view=auto
==============================================================================
(empty)
More information about the Erp5-report
mailing list