[MERGE] OPW 576804: hr_holidays: fix problem with accentuated chars in 'Leaves by...

bzr revid: xal@openerp.com-20121023135401-0its1ohxsoyvcru2

diff --cc addons/hr_holidays/report/holidays_summary_report.py
index 661bc7d,b839b06..4119dce
--- 1/addons/hr_holidays/report/holidays_summary_report.py
--- 2/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@@ -234,7 -232,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 -247,7 +249,10 @@@
          %s
          %s
          </report>
-         ''' % (header_xml,months_xml,date_xml, ustr(emp_xml))
 -        ''' % (header_xml,months_xml,ustr(''.join(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