From d16c57035dfad46464ea01c7aabcd6ad40c48b5d Mon Sep 17 00:00:00 2001 From: fka-odoo Date: Thu, 26 Jun 2014 14:44:11 +0530 Subject: [PATCH] [FIX] improved date format in fiche de paie report --- addons/l10n_fr_hr_payroll/report/fiche_paye.py | 1 + openerp/report/report_sxw.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.py b/addons/l10n_fr_hr_payroll/report/fiche_paye.py index daa7c6fd6ac..0b6506ca284 100755 --- a/addons/l10n_fr_hr_payroll/report/fiche_paye.py +++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.py @@ -29,6 +29,7 @@ class fiche_paye_parser(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(fiche_paye_parser, self).__init__(cr, uid, name, context) self.localcontext.update({ + 'lang': "fr_FR", 'get_payslip_lines': self.get_payslip_lines, 'get_total_by_rule_category': self.get_total_by_rule_category, 'get_employer_line': self.get_employer_line, diff --git a/openerp/report/report_sxw.py b/openerp/report/report_sxw.py index f0eccb836a6..493d0b6b37e 100644 --- a/openerp/report/report_sxw.py +++ b/openerp/report/report_sxw.py @@ -239,8 +239,10 @@ class rml_parse(object): def _get_lang_dict(self): pool_lang = self.pool.get('res.lang') lang = self.localcontext.get('lang', 'en_US') or 'en_US' - lang_ids = pool_lang.search(self.cr,self.uid,[('code','=',lang)])[0] - lang_obj = pool_lang.browse(self.cr,self.uid,lang_ids) + lang_ids = pool_lang.search(self.cr,self.uid,[('code','=',lang)]) + if not lang_ids: + lang_ids = pool_lang.search(self.cr,self.uid,[('code','=','en_US')]) + lang_obj = pool_lang.browse(self.cr,self.uid,lang_ids[0]) self.lang_dict.update({'lang_obj':lang_obj,'date_format':lang_obj.date_format,'time_format':lang_obj.time_format}) self.default_lang[lang] = self.lang_dict.copy() return True