[FIX] use of tail text in preprocessor of report engine
authorDSH (Open ERP) <dsh@tinyerp.com>
Fri, 23 Apr 2010 14:12:24 +0000 (19:42 +0530)
committerDSH (Open ERP) <dsh@tinyerp.com>
Fri, 23 Apr 2010 14:12:24 +0000 (19:42 +0530)
bzr revid: dsh@tinyerp.com-20100423141224-or68i7nmx17l36rj

bin/report/preprocess.py

index 47a088b..794deac 100644 (file)
@@ -15,7 +15,7 @@ class report(object):
         for node in root_node:
             if node.tag == etree.Comment:
                 continue
-            if node.text:
+            if node.text or node.tail:
                 def _sub3(txt):
                     n = node
                     while n.tag != txt.group(2):
@@ -51,9 +51,9 @@ class report(object):
                         n = n.getparent()
                     n.set('rml_loop', txt.group(2))
                     return '[['+txt.group(1)+"''"+txt.group(4)+']]'
-                t = _regex1.sub(_sub1, node.text)
+                t = _regex1.sub(_sub1, node.text or node.tail)
                 if t == " ":
-                    t = _regex11.sub(_sub1, node.text)
+                    t = _regex11.sub(_sub1, node.text  or node.tail)
                 t = _regex3.sub(_sub3, t)
                 node.text = _regex2.sub(_sub2, t)
             self.preprocess_rml(node,type)