Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-bug-956798-jam into lp:openobject-server

  1. trunk-bug-956798-jam
  2. Merge into trunk
Proposed by Jigar A.
Status: Work in progress
Proposed branch: lp:~openerp-dev/openobject-server/trunk-bug-956798-jam
Merge into: lp:openobject-server
Diff against target: 23 lines (+2/-4)
1 file modified
openerp/report/render/rml2pdf/trml2pdf.py (+2/-4)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-bug-956798-jam
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+104348@code.launchpad.net

Description of the change

Hello,
MP Contains Bug Fix : lp#956798 Reports give error: coercing to Unicode: need string or buffer, tuple found.
Added the common Utf-8 encoding for all _rml_flowable(flowable) textual processing to handle information global text.
Kindly review this.
Thank You

To post a comment you must log in.

Unmerged revisions

4150. By Jigar A.

[FIX] report engine: consustance encode the string of the tags para, pto, barcode, name, title etc for rml_flowable

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/report/render/rml2pdf/trml2pdf.py'
2--- openerp/report/render/rml2pdf/trml2pdf.py 2012-02-08 01:36:17 +0000
3+++ openerp/report/render/rml2pdf/trml2pdf.py 2012-05-02 09:03:22 +0000
4@@ -279,9 +279,6 @@
5 addMapping(face, 1, 1, fontname) #italic and bold
6
7 def _textual_image(self, node):
8- rc = ''
9- for n in node:
10- rc +=( etree.tostring(n) or '') + n.tail
11 return base64.decodestring(node.tostring())
12
13 def _images(self, el):
14@@ -615,7 +612,8 @@
15 self.title = title
16
17 def _textual(self, node):
18- rc1 = utils._process_text(self, node.text or '')
19+ text = node.text and node.text.encode('utf-8') or ''
20+ rc1 = utils._process_text(self, text)
21 for n in utils._child_get(node,self):
22 txt_n = copy.deepcopy(n)
23 for key in txt_n.attrib.keys():