Odoo Server (MOVED TO GITHUB)

Merge lp:~kangol/openobject-server/6.0-empty-image-rl25 into lp:openobject-server/6.0

  1. 6.0-empty-image-rl25
  2. Merge into 6.0
Proposed by Christophe Simonis (OpenERP)
Status: Merged
Merged at revision: 3418
Proposed branch: lp:~kangol/openobject-server/6.0-empty-image-rl25
Merge into: lp:openobject-server/6.0
Diff against target: 12 lines (+1/-1)
1 file modified
bin/report/render/rml2pdf/trml2pdf.py (+1/-1)
To merge this branch: bzr merge lp:~kangol/openobject-server/6.0-empty-image-rl25
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+59894@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/report/render/rml2pdf/trml2pdf.py'
2--- bin/report/render/rml2pdf/trml2pdf.py 2011-01-04 10:13:35 +0000
3+++ bin/report/render/rml2pdf/trml2pdf.py 2011-05-04 10:03:16 +0000
4@@ -451,7 +451,7 @@
5 res = utils._regex.findall(node.text)
6 for key in res:
7 newtext = eval(key, {}, self.localcontext)
8- node.text = newtext
9+ node.text = newtext or ''
10 image_data = None
11 if node.text:
12 image_data = base64.decodestring(node.text)