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

[qdp (OpenERP)]

_process_text escaping char for xml + small code cleaning

[lp:~openerp-dev/openobject-server/trunk-bug-885299-qdp]

3780. By Quentin (OpenERP) <email address hidden> on 2011-11-04

[FIX] rml2pdf: _process_text escaping char for xml

=== modified file 'openerp/report/render/rml2pdf/trml2pdf.py'
--- openerp/report/render/rml2pdf/trml2pdf.py	2011-09-19 23:34:07 +0000
+++ openerp/report/render/rml2pdf/trml2pdf.py	2011-11-04 16:02:25 +0000
@@ -610,11 +610,10 @@
             for key in txt_n.attrib.keys():
                 if key in ('rml_except', 'rml_loop', 'rml_tag'):
                     del txt_n.attrib[key]
-            if True or not self._textual(n).isspace():
-                if not n.tag == 'bullet':
-                    txt_n.text = utils.xml2str(self._textual(n))
-                txt_n.tail = n.tail and utils._process_text(self, n.tail.replace('\n','')) or ''
-                rc1 += etree.tostring(txt_n)
+            if not n.tag == 'bullet':
+                txt_n.text = utils.xml2str(self._textual(n))
+            txt_n.tail = n.tail and utils.xml2str(utils._process_text(self, n.tail.replace('\n',''))) or ''
+            rc1 += etree.tostring(txt_n)
         return rc1
 
     def _table(self, node):
 
=== 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-04 16:02:25 +0000
@@ -110,6 +110,12 @@
             yield n
 
 def _process_text(self, txt):
+        '''
+        Translate a text and escape it for xml.
+
+        :param txt: text, varchar to process
+        :return: translated and escaped text
+        '''
         if not self.localcontext:
             return str2xml(txt)
         if not txt:
@@ -130,10 +136,10 @@
                 except Exception:
                     pass
                 if isinstance(txt, basestring):
-                    result += str2xml(txt)
+                    result += txt
                 elif txt and (txt is not None) and (txt is not False):
                     result += ustr(txt)
-        return result
+        return str2xml(result)
 
 def text_get(node):
     return ''.join([ustr(n.text) for n in node])