Merge lp:~openerp-dev/openobject-server/trunk-bug-885299-nch into lp:openobject-server

Proposed by Naresh(OpenERP)
Status: Rejected
Rejected by: qdp (OpenERP)
Proposed branch: lp:~openerp-dev/openobject-server/trunk-bug-885299-nch
Merge into: lp:openobject-server
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/report/render/rml2pdf/utils.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-bug-885299-nch
Reviewer Review Type Date Requested Status
Vo Minh Thu Pending
OpenERP Core Team Pending
Review via email: mp+81135@code.launchpad.net
To post a comment you must log in.
Revision history for this message
qdp (OpenERP) (qdp) wrote :

that was a good idea, but odo adviced to do it in another way. See: https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-885299-qdp/+merge/81291

I'm rejecting this merge prop

Unmerged revisions

3779. By Naresh(OpenERP)

[FIX]: escape XML entities

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openerp/report/render/rml2pdf/utils.py'
--- openerp/report/render/rml2pdf/utils.py 2011-02-07 12:57:23 +0000
+++ openerp/report/render/rml2pdf/utils.py 2011-11-03 12:00:00 +0000
@@ -119,7 +119,7 @@
119 while sps:119 while sps:
120 # This is a simple text to translate120 # This is a simple text to translate
121 to_translate = tools.ustr(sps.pop(0))121 to_translate = tools.ustr(sps.pop(0))
122 result += tools.ustr(self.localcontext.get('translate', lambda x:x)(to_translate))122 result += str2xml(tools.ustr(self.localcontext.get('translate', lambda x:x)(to_translate)))
123 if sps:123 if sps:
124 try:124 try:
125 txt = None125 txt = None