Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-771657-mtr into lp:openobject-addons

  1. trunk-bug-771657-mtr
  2. Merge into trunk
Proposed by Meera Trambadia (OpenERP)
Status: Merged
Merged at revision: 4678
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-771657-mtr
Merge into: lp:openobject-addons
Diff against target: 11 lines (+1/-0)
1 file modified
hr_attendance/report/timesheet.py (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-771657-mtr
Reviewer Review Type Date Requested Status
Mustufa Rangwala (Open ERP) (community) Approve
qdp (OpenERP) Pending
Review via email: mp+59218@code.launchpad.net

Description of the change

hr_attendance:- In 'Weekly Attendance Report',encoded xml content with utf8. --fixes lp:771657

To post a comment you must log in.
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) wrote :

It was due to ascii char in employee address...

Université de Liège..

thanks,
mra

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_attendance/report/timesheet.py'
2--- hr_attendance/report/timesheet.py 2011-02-10 11:26:15 +0000
3+++ hr_attendance/report/timesheet.py 2011-04-27 13:27:27 +0000
4@@ -109,6 +109,7 @@
5 %s
6 </report>
7 ''' % '\n'.join(user_xml)
8+ xml = tools.ustr(xml).encode('utf8')
9 return self.post_process_xml_data(cr, uid, xml, context)
10
11 report_custom('report.hr.attendance.allweeks', 'hr.employee', '', 'addons/hr_attendance/report/timesheet.xsl')

Subscribers

People subscribed via source and target branches

to all changes: