Merge lp:~therp-nl/ocb-server/7.0_lp1260743_print_empty_lines into lp:ocb-server

[Ronald Portier (Therp)]

Fixes lp1260743: empty lines are not printed.

[lp:~therp-nl/ocb-server/7.0_lp1260743_print_empty_lines]

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

[FIX] Fixes lp1260743: empty lines are not printed.
    Extra formatting improvement keeps this fix in line with proposed
    merge on standard openerp branch, to prevent conflict when/if merge
    on standard accepted.

[Lara (Therp) (lfreeke)]

Tested and approved

review: Approve (test)

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

review: Approve (code review)

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

Thanks! This actually improves on https://code.launchpad.net/~olivier-laurent/openobject-server/6.1-bug1157048/+merge/154031, which either only works in other cases or has only worked before.

I'm hesitant about the changes in whitespace. I know that the OpenERP core dev team does not like unnecessary changes, so to increase the chances of this change being merged in upstream, I would like to ask you to remove them.

review: Needs Fixing

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

Sorry, I'm taking my objection back. I had not noticed that the code that you improved is actually touched in the change to upstream, which warrants the refactoring.

review: Approve

[Olivier Laurent (Acsone) (olivier-laurent)]

> Thanks! This actually improves on https://code.launchpad.net/~olivier-laurent
> /openobject-server/6.1-bug1157048/+merge/154031, which either only works in
> other cases or has only worked before.

Just FYI... my proposal was based on reportlab 2.5. A behaviour change in reportlab 2.6 made this proposal without effects !

Tested with the 2 versions of reportlab.

(with version 2.6, "technical" blank lines of the rml template are also removed rendering the pdf result less clear !)

review: Approve

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

Thanks Olivier for the clarification!

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

=== modified file 'openerp/report/render/rml2pdf/trml2pdf.py'
--- openerp/report/render/rml2pdf/trml2pdf.py	2013-11-20 15:12:37 +0000
+++ openerp/report/render/rml2pdf/trml2pdf.py	2013-12-16 13:05:24 +0000
@@ -786,8 +786,13 @@
             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'}))))
+                    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: