diff options
| author | Xavier ALT <xal@openerp.com> | 2012-10-23 15:54:01 +0200 |
|---|---|---|
| committer | Xavier ALT <xal@openerp.com> | 2012-10-23 15:54:01 +0200 |
| commit | 3b375da2efc9b9fd4522fdf26c7c71aa82b2fc8f (patch) | |
| tree | 0e69ff3803239aeb9040f7d69d6b9268f307b5ef | |
| parent | 8a0ed1f779c4ca61a63c9d07cca24c4927c10524 (diff) | |
| parent | 3e16c52bdd2105533428c2425da716aea2b6cce3 (diff) | |
[MERGE] OPW 576804: hr_holidays: fix problem with accentuated chars in 'Leaves by Department' report
bzr revid: xal@openerp.com-20121023135401-0its1ohxsoyvcru2
| -rw-r--r-- | addons/hr_holidays/report/holidays_summary_report.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py index 661bc7d201c..4119dce6e1a 100644 --- a/addons/hr_holidays/report/holidays_summary_report.py +++ b/addons/hr_holidays/report/holidays_summary_report.py @@ -234,7 +234,7 @@ class report_custom(report_rml): emp_xml += emp_create_xml(self, cr, uid, 0, holiday_type, row_id, item['id'], item['name'], som, eom) row_id = row_id +1 - header_xml = ''' + header_xml = u''' <header> <date>%s</date> <company>%s</company> @@ -249,7 +249,10 @@ class report_custom(report_rml): %s %s </report> - ''' % (header_xml,months_xml,date_xml, ustr(emp_xml)) + ''' % (header_xml, + u''.join((ustr(m) for m in months_xml)), + u''.join((ustr(d) for d in date_xml)), + u''.join((ustr(e) for e in emp_xml))) return xml |