[IMP] Email_template module now handles qweb-pdf report in mail attachment
bzr revid: openerp-sle@openerp-sle.home-20140212212259-sq7mpkt09a0t6v6d
This commit is contained in:
parent
38a9bf0901
commit
999050a9df
|
@ -381,12 +381,18 @@ class email_template(osv.osv):
|
||||||
for res_id in template_res_ids:
|
for res_id in template_res_ids:
|
||||||
attachments = []
|
attachments = []
|
||||||
report_name = self.render_template(cr, uid, template.report_name, template.model, res_id, context=context)
|
report_name = self.render_template(cr, uid, template.report_name, template.model, res_id, context=context)
|
||||||
report_service = report_xml_pool.browse(cr, uid, template.report_template.id, context).report_name
|
report = report_xml_pool.browse(cr, uid, template.report_template.id, context)
|
||||||
|
report_service = report.report_name
|
||||||
# Ensure report is rendered using template's language
|
# Ensure report is rendered using template's language
|
||||||
ctx = context.copy()
|
ctx = context.copy()
|
||||||
if template.lang:
|
if template.lang:
|
||||||
ctx['lang'] = self.render_template_batch(cr, uid, template.lang, template.model, [res_id], context)[res_id] # take 0 ?
|
ctx['lang'] = self.render_template_batch(cr, uid, template.lang, template.model, [res_id], context)[res_id] # take 0 ?
|
||||||
result, format = openerp.report.render_report(cr, uid, [res_id], report_service, {'model': template.model}, ctx)
|
|
||||||
|
if report.report_type in ['qweb-html', 'qweb-pdf']:
|
||||||
|
result, format = self.pool['report'].get_pdf(report, res_id, context=ctx), 'pdf'
|
||||||
|
else:
|
||||||
|
result, format = openerp.report.render_report(cr, uid, [res_id], report_service, {'model': template.model}, ctx)
|
||||||
|
|
||||||
result = base64.b64encode(result)
|
result = base64.b64encode(result)
|
||||||
if not report_name:
|
if not report_name:
|
||||||
report_name = 'report.' + report_service
|
report_name = 'report.' + report_service
|
||||||
|
|
Loading…
Reference in New Issue