Merge lp:~therp-nl/openobject-server/7.0-lp1260743_print_empty_lines into lp:openobject-server/7.0

[Ronald Portier (Therp)]

Print empty lines when generating rml reports.

Fixes lp:1260743.

Unmerged revisions

5173. By Ronald Portier (Therp) on 2013-12-16

[FIX] Fixes lp1260743.
    Make sure empty lines in lay-out are really printed.
    Some of this code is aready present in community branch, but not
    functional because of missing   entity reference. Printing a
    space is not enough, even when embedded in (dummy) <font> tag.

=== modified file 'openerp/report/render/rml2pdf/trml2pdf.py'
--- openerp/report/render/rml2pdf/trml2pdf.py	2013-11-19 18:53:53 +0000
+++ openerp/report/render/rml2pdf/trml2pdf.py	2013-12-16 12:32:56 +0000
@@ -782,8 +782,17 @@
             if extra_style:
                 style.__dict__.update(extra_style)
             result = []
-            for i in self._textual(node).split('\n'):
-                result.append(platypus.Paragraph(i, style, **(utils.attr_get(node, [], {'bulletText':'str'}))))
+            textuals = self._textual(node).split('\n')                         
+            keep_empty_lines = (len(textuals) > 1) and len(node.text.strip())  
+            for i in textuals:                                                 
+                if keep_empty_lines and len(i.strip()) == 0:                   
+                    i = '<font color="white">&nbsp;</font>'                    
+                result.append(
+                    platypus.Paragraph(
+                        i, style, **(
+                            utils.attr_get(node, [], {'bulletText':'str'}))
+                    )
+                )
             return result
         elif node.tag=='barCode':
             try: