Merge lp:~olivier-laurent/openobject-server/6.1-bug1157048 into lp:openobject-server/6.1

[Olivier Laurent (Acsone)]

The change is similar to:
- lp:~openerp-dev/openobject-server/trunk-opw-576860-port-kbh
- lp:~acl-openerp/openobject-server/6.1-opw-576860-acl
- lp:~openerp-dev/openobject-server/7.0-opw-587565-nep

But it avoids the side effect consisting to produce a blank line on each "technical" empty paragraph found in the rml template itself. Only blank lines coming from user data are taken into account.

Unmerged revisions

4067. By Olivier Laurent (Acsone) on 2013-03-19

FIX: Do not remove empty lines in the pdf result of a rml report

=== modified file 'openerp/report/render/rml2pdf/trml2pdf.py'
--- openerp/report/render/rml2pdf/trml2pdf.py	2012-07-16 07:52:17 +0000
+++ openerp/report/render/rml2pdf/trml2pdf.py	2013-03-19 10:17:10 +0000
@@ -742,7 +742,11 @@
             if extra_style:
                 style.__dict__.update(extra_style)
             result = []
-            for i in self._textual(node).split('\n'):
+            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"> </font>'
                 result.append(platypus.Paragraph(i, style, **(utils.attr_get(node, [], {'bulletText':'str'}))))
             return result
         elif node.tag=='barCode':