[MERGE] latest trunk

[odoo/odoo.git] / openerp / report / preprocess.py

diff --git a/openerp/report/preprocess.py b/openerp/report/preprocess.py
index 78703cb..e681860 100644 (file)
--- a/openerp/report/preprocess.py
+++ b/openerp/report/preprocess.py
@@ -65,13 +65,14 @@ class report(object):
                     if type =='html2html':
                         match = html_parents
                     if txt.group(3):
-                        match = [txt.group(3)]
-                        if match[0].startswith("'"):
-                            match[0] = match[0][1:-1]
-                    n2= node
-                    while n2.tag not in match:
-                        n2 = n2.getparent()
-                    n2.set('rml_loop', txt.group(2))
+                        group_3 = txt.group(3)
+                        if group_3.startswith("'") or group_3.startswith('"'):
+                            group_3 = group_3[1:-1]
+                        match = [group_3]
+                    n = node
+                    while n.tag not in match:
+                        n = n.getparent()
+                    n.set('rml_loop', txt.group(2))
                     return '[['+txt.group(1)+"''"+txt.group(4)+']]'
                 t = _regex1.sub(_sub1, node.text or node.tail)
                 if t == " ":
@@ -99,3 +100,5 @@ if __name__=='__main__':
     result = a.preprocess_rml(node)
     print etree.tostring(result)
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: