Merge lp:~openerp-dev/openobject-addons/6.1-opw-577520-nep into lp:openobject-addons/6.1

[Nehal Panchal (OpenERP)]

Hello,

If you give Leave Type in different language rather than English(e.g French) and print the report "Employee's Holidays" in English, It will not encode the Leave Type.

This fixes the issue.

Thanks

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-577520-port-mma/+merge/135061 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6938. By Nehal Panchal (OpenERP) on 2012-08-09

[FIX] hr_holidays : Fixed the encoding issue of Leave Type which is in different language than English

=== modified file 'hr_holidays/report/holidays_summary_report.py'
--- hr_holidays/report/holidays_summary_report.py	2011-10-16 01:28:00 +0000
+++ hr_holidays/report/holidays_summary_report.py	2012-08-09 07:11:20 +0000
@@ -194,6 +194,7 @@
 
         date_xml.append('</days>')
         date_xml.append('<cols>3.5cm%s,0.4cm</cols>\n' % (',0.4cm' * (60)))
+        date_xml = ''.join(date_xml)
 
         st='<cols_months>3.5cm'
         for m in range(1,len(width_dict)+1):