[Erp5-report] r27997 - in /erp5/trunk/bt5/erp5_payroll_l10n_fr: SkinTemplateItem/portal_ski...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jul 7 16:00:38 CEST 2009
Author: fabien
Date: Tue Jul 7 16:00:36 2009
New Revision: 27997
URL: http://svn.erp5.org?rev=27997&view=rev
Log:
don't get Description from Model dependence tree but only from paysheet. If nothing is found, nothing is displayed
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=27997&r1=27996&r2=27997&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 Jul 7 16:00:36 2009
@@ -231,8 +231,7 @@
and getPaymentConditionText(context) or \'\',\n
\'price_currency\': getPriceCurrencyId(context.getPriceCurrencyReference() or \'\'),\n
\'year\': str(context.getStartDate() is not None and context.getStartDate().year() or \'\'),\n
- \'description\': getFieldAsLineList(context.getDescription() or\n
- model.getModelIneritanceEffectiveProperty(context, \'description\') or \'\'),\n
+ \'description\': getFieldAsLineList(context.getDescription() or \'\'),\n
\'year_to_date_gross_salary\': year_to_date_gross_salary,\n
\'year_to_date_slice_a\': year_to_date_slice_a,\n
\'year_to_date_worked_hour_count\': year_to_date_worked_hour_count,\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=27997&r1=27996&r2=27997&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll_l10n_fr/bt/revision [utf8] Tue Jul 7 16:00:36 2009
@@ -1,1 +1,1 @@
-101
+104
More information about the Erp5-report
mailing list