Merge lp:~openerp-dev/openobject-addons/6.0-opw-17108-skh into lp:openobject-addons/6.0

[Somesh Khare]

Hello,

In the hr_holidays module when print the Report : "Leaves by department", Currently it prints accentuated chars in ascii. Example: "é" is displayed "\xe9".

I have fixed this issue for holidays_summary_report.py in the report.

Thanks,
skh

[lp:~openerp-dev/openobject-addons/6.0-opw-17108-skh]

4827. By Raphael Collet (OpenERP) on 2011-09-16

[MERGE] base_contact : Added space between name and street in the Address of a contact (Case:17182)

[Raphael Collet (OpenERP) (rco-openerp)]

Okay.

review: Approve

[lp:~openerp-dev/openobject-addons/6.0-opw-17108-skh]

4828. By Raphael Collet (OpenERP) on 2011-09-16

[MERGE] hr_holidays: Accented characters are not printed in report : Leaves by department (Case 17108)

=== modified file 'hr_holidays/report/holidays_summary_report.py'
--- hr_holidays/report/holidays_summary_report.py	2011-08-29 08:01:14 +0000
+++ hr_holidays/report/holidays_summary_report.py	2011-09-16 06:01:26 +0000
@@ -21,6 +21,7 @@
 
 import datetime
 import time
+import string
 
 from osv import fields, osv
 from report.interface import report_rml
@@ -243,7 +244,7 @@
         %s
         %s
         </report>
-        ''' % (header_xml,months_xml,date_xml, ustr(emp_xml))
+        ''' % (header_xml,months_xml,string.join(date_xml), ustr(emp_xml))
 
         return xml