OLD 7.0 2015 01 23

Conflict:

diff --cc openerp/report/render/rml2pdf/trml2pdf.py
index c01ff03,61da297..0000000
--- a/openerp/report/render/rml2pdf/trml2pdf.py
+++ b/openerp/report/render/rml2pdf/trml2pdf.py
@@@ -767,17 -769,15 +769,29 @@@ class _rml_flowable(object)
              if extra_style:
                  style.__dict__.update(extra_style)
              result = []
++<<<<<<< HEAD
 +            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'}))
 +                    )
 +                )
++=======
+             tag_text = ''
+             plain_text = ''
+             for i in self._textual(node).split('\n'):
+                 instance = platypus.Paragraph(i, style, **(utils.attr_get(node, [], {'bulletText':'str'})))
+                 plain_text += instance.getPlainText().strip()
+                 tag_text += instance.text.strip()
+                 result.append(instance)
+             if LooseVersion(reportlab.Version) > LooseVersion('3.0') and not plain_text and tag_text:
+                 result.append(platypus.Paragraph('&nbsp;<br/>', style, **(utils.attr_get(node, [], {'bulletText': 'str'}))))
++>>>>>>> odoo/7.0
              return result
          elif node.tag=='barCode':
              try:

resolved by:

git checkout --theirs openerp/report/render/rml2pdf/trml2pdf.py

Committed as https://github.com/OCA/OCB/commit/2377ef416e2465219200ccc79a2ee257e5d2ca6a by @hbrunn