diff options
| author | Anup (OpenERP) <ach@tinyerp.com> | 2010-05-18 16:02:42 +0530 |
|---|---|---|
| committer | Anup (OpenERP) <ach@tinyerp.com> | 2010-05-18 16:02:42 +0530 |
| commit | 94b0ad26df4e0c4a067b89cdc4a481be12a22bf0 (patch) | |
| tree | d3cc35f78cc313ef0679aff9da11d7587ca95827 | |
| parent | bb92ae9dee689e198c6a5368bb75ddcc30ec3a98 (diff) | |
[FIX] use of tail text in preprocessor of report engine
bzr revid: ach@tinyerp.com-20100518103242-dm3zkq214bdqgzhc
| -rw-r--r-- | bin/report/preprocess.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/report/preprocess.py b/bin/report/preprocess.py index 35234bc7ef1..c84ce66b472 100644 --- a/bin/report/preprocess.py +++ b/bin/report/preprocess.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## @@ -35,7 +35,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): @@ -71,9 +71,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) |