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

Proposed by Nehal Panchal (OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6938
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-577520-nep
Merge into: lp:openobject-addons/6.1
Diff against target: 11 lines (+1/-0)
1 file modified
hr_holidays/report/ (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-577520-nep
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email:

Description of the change


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.


To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :


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 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.

Naresh Soni

Unmerged revisions

6938. By Nehal Panchal (OpenERP)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_holidays/report/'
2--- hr_holidays/report/ 2011-10-16 01:28:00 +0000
3+++ hr_holidays/report/ 2012-08-09 07:11:20 +0000
4@@ -194,6 +194,7 @@
6 date_xml.append('</days>')
7 date_xml.append('<cols>3.5cm%s,0.4cm</cols>\n' % (',0.4cm' * (60)))
8+ date_xml = ''.join(date_xml)
10 st='<cols_months>3.5cm'
11 for m in range(1,len(width_dict)+1):