[MERGE]

bzr revid: nch@tinyerp.com-20090629061710-ab6oydkwswc6d8mh

2 files changed, 6 insertions, 0 deletions

diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index 7efda11382b..cae88ac5eef 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -236,16 +236,19 @@ class _rml_canvas(object):
     def _drawString(self, node):
         v = utils.attr_get(node, ['x','y'])
         text=self._textual(node, **v)
+        text = utils.xml2str(text)
         self.canvas.drawString(text=text, **v)
 
     def _drawCenteredString(self, node):
         v = utils.attr_get(node, ['x','y'])
         text=self._textual(node, **v)
+        text = utils.xml2str(text)
         self.canvas.drawCentredString(text=text, **v)
 
     def _drawRightString(self, node):
         v = utils.attr_get(node, ['x','y'])
         text=self._textual(node, **v)
+        text = utils.xml2str(text)
         self.canvas.drawRightString(text=text, **v)
 
     def _rect(self, node):
diff --git a/bin/report/render/rml2pdf/utils.py b/bin/report/render/rml2pdf/utils.py
index 65fb2366c9a..b7f81ec24e4 100644
--- a/bin/report/render/rml2pdf/utils.py
+++ b/bin/report/render/rml2pdf/utils.py
@@ -47,6 +47,9 @@ _regex = re.compile('\[\[(.+?)\]\]')
 def str2xml(s):
     return s.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
 
+def xml2str(s):
+    return s.replace('&amp;','&').replace('&lt;','<').replace('&gt;','>')
+
 def _child_get(node, self=None, tagname=None):
     for n in node:
         if self and self.localcontext and n.get('rml_loop', False):