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

[FIX] RC2 fix of image embeeding, possibilit to have tmp file name in same milisecond, imporvement of multi header support when cusomizing report, fix of translation getter retunr scr if no translation available 

bzr revid: nicolas.bessi@camptocamp.com-20101022133402-bme1hmy4mtd7maa8
This commit is contained in:
nicolas.bessi@camptocamp.com 2010-10-22 15:34:02 +02:00
parent 2d4c23ef0d
commit fd65d12680
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/report_webkit/report_helper.py
View File

@ -51,7 +51,7 @@ class WebKitHelper(object):
height = 'width="%spx"'%(height)
else :
height = ' '
toreturn = '<img %s %s src="data:image/%s;base64,%s">'%(
toreturn = '<img %s %s src="data:image/%s;base64,%s" />'%(
width,
height,
type,

34
addons/report_webkit/webkit_report.py
View File

@ -84,8 +84,10 @@ class WebKitParser(report_sxw):
_('path to Wkhtmltopdf is not absolute'),
'for path %s'%(path)
)
def generate_pdf(self, comm_path, report_xml, header, footer, html_list):
def generate_pdf(self, comm_path, report_xml, header, footer, html_list, webkit_header=False):
"""Call webkit in order to generate pdf"""
if not webkit_header:
webkit_header = report_xml.webkit_header
tmp_dir = tempfile.gettempdir()
out = report_xml.name+str(time.time())+'.pdf'
out = os.path.join(tmp_dir, out.replace(' ',''))
@ -120,20 +122,22 @@ class WebKitParser(report_sxw):
file_to_del.append(foot_file.name)
command.append("--footer-html '%s'"%(foot_file.name))
if report_xml.webkit_header.margin_top :
command.append('--margin-top %s'%(report_xml.webkit_header.margin_top))
if report_xml.webkit_header.margin_bottom :
command.append('--margin-bottom %s'%(report_xml.webkit_header.margin_bottom))
if report_xml.webkit_header.margin_left :
command.append('--margin-left %s'%(report_xml.webkit_header.margin_left))
if report_xml.webkit_header.margin_right :
command.append('--margin-right %s'%(report_xml.webkit_header.margin_right))
if report_xml.webkit_header.orientation :
command.append("--orientation '%s'"%(report_xml.webkit_header.orientation))
if report_xml.webkit_header.format :
command.append(" --page-size '%s'"%(report_xml.webkit_header.format))
if webkit_header.margin_top :
command.append('--margin-top %s'%(webkit_header.margin_top))
if webkit_header.margin_bottom :
command.append('--margin-bottom %s'%(webkit_header.margin_bottom))
if webkit_header.margin_left :
command.append('--margin-left %s'%(webkit_header.margin_left))
if webkit_header.margin_right :
command.append('--margin-right %s'%(webkit_header.margin_right))
if webkit_header.orientation :
command.append("--orientation '%s'"%(webkit_header.orientation))
if webkit_header.format :
command.append(" --page-size '%s'"%(webkit_header.format))
count = 0
for html in html_list :
html_file = file(os.path.join(tmp_dir, str(time.time()) + '.body.html'), 'w')
html_file = file(os.path.join(tmp_dir, str(time.time()) + str(count) +'.body.html'), 'w')
count += 1
html_file.write(html)
html_file.close()
file_to_del.append(html_file.name)
@ -168,6 +172,8 @@ class WebKitParser(report_sxw):
"""Translate String."""
ir_translation = self.pool.get('ir.translation')
res = ir_translation._get_source(self.parser_instance.cr, self.parser_instance.uid, self.name, 'report', self.localcontext.get('lang', 'en_US'), src)
if not res :
return src
return res
def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False):