Merge lp:~therp-nl/ocb-server/6.1_lp1425545_enhanced_flowable_linebreak into lp:ocb-server/6.1

[Ronald Portier (Therp)]

Backport report rendering improvement from 7.0

[Stefan Rijnhart (Opener) (stefan-opener)]

This change looks like a proper backport of the upstream change in https://github.com/OCA/OCB/commit/25f5329deb4068ac737bf7ffdfe54046a46221da + https://github.com/OCA/OCB/commit/c62a75a5f3eb08f5fefe69706858a438361cb73d, except that it undoes the OCB-specific change in http://bazaar.launchpad.net/~ocb/ocb-server/6.1/revision/4324. Is this intentional, i.e. is the fix from rev. 4324 included in the upstream change?

review: Needs Information

Unmerged revisions

4332. By Ronald Portier (Therp) on 2015-02-25

[FIX] Backport odoo/oca 7.0 rendering fix.

=== modified file 'openerp/report/render/rml2pdf/trml2pdf.py'
--- openerp/report/render/rml2pdf/trml2pdf.py	2013-09-10 14:15:41 +0000
+++ openerp/report/render/rml2pdf/trml2pdf.py	2015-02-25 16:10:22 +0000
@@ -32,6 +32,7 @@
 import logging
 from lxml import etree
 import base64
+from distutils.version import LooseVersion
 from reportlab.platypus.doctemplate import ActionFlowable
 from openerp.tools.safe_eval import safe_eval as eval
 from reportlab.lib.units import inch,cm,mm
@@ -741,18 +742,11 @@
             style = self.styles.para_style_get(node)
             if extra_style:
                 style.__dict__.update(extra_style)
-            result = []
-            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'}))
-                    )
-                )
+            text_node = self._textual(node).strip().replace('\n\n', '\n').replace('\n', '<br/>')
+            instance = platypus.Paragraph(text_node, style, **(utils.attr_get(node, [], {'bulletText':'str'})))
+            result = [instance]
+            if LooseVersion(reportlab.Version) > LooseVersion('3.0') and not instance.getPlainText().strip() and instance.text.strip():
+                result.append(platypus.Paragraph('&nbsp;<br/>', style, **(utils.attr_get(node, [], {'bulletText': 'str'}))))
             return result
         elif node.tag=='barCode':
             try: