odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch saas-3 up to c5775e5

This commit is contained in:
Denis Ledoux 2015-01-22 14:45:16 +01:00
parent 8598231763 c5775e56d3
commit e9d1d7aac0
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/point_of_sale/wizard/pos_details.xml
View File

@ -12,7 +12,7 @@
<field name="date_start"/> <field name="date_start"/>
<field name="date_end"/> <field name="date_end"/>
</group> </group>
<field name="user_ids"/> <field name="user_ids" domain="[('share', '=', False)]"/>
<footer> <footer>
<button name="print_report" type="object" string="Print Report" class="oe_highlight"/> <button name="print_report" type="object" string="Print Report" class="oe_highlight"/>
or or

11
openerp/report/render/rml2pdf/trml2pdf.py
View File

@ -32,6 +32,7 @@ import os
import logging import logging
from lxml import etree from lxml import etree
import base64 import base64
from distutils.version import LooseVersion
from reportlab.platypus.doctemplate import ActionFlowable from reportlab.platypus.doctemplate import ActionFlowable
from openerp.tools.safe_eval import safe_eval as eval from openerp.tools.safe_eval import safe_eval as eval
from reportlab.lib.units import inch,cm,mm from reportlab.lib.units import inch,cm,mm
@ -178,6 +179,7 @@ class _rml_styles(object,):
'justify':reportlab.lib.enums.TA_JUSTIFY 'justify':reportlab.lib.enums.TA_JUSTIFY
} }
data['alignment'] = align.get(node.get('alignment').lower(), reportlab.lib.enums.TA_LEFT) data['alignment'] = align.get(node.get('alignment').lower(), reportlab.lib.enums.TA_LEFT)
data['splitLongWords'] = 0
return data return data
def _table_style_get(self, style_node): def _table_style_get(self, style_node):
@ -773,8 +775,15 @@ class _rml_flowable(object):
if extra_style: if extra_style:
style.__dict__.update(extra_style) style.__dict__.update(extra_style)
result = [] result = []
tag_text = ''
plain_text = ''
for i in self._textual(node).split('\n'): for i in self._textual(node).split('\n'):
result.append(platypus.Paragraph(i, style, **(utils.attr_get(node, [], {'bulletText':'str'})))) 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'}))))
return result return result
elif node.tag=='barCode': elif node.tag=='barCode':
try: try: