diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index c1329eb5a4e..3f0fad1c8a0 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -449,7 +449,7 @@ class email_template(osv.osv): ctx['lang'] = self.render_template_batch(cr, uid, template.lang, template.model, [res_id], context)[res_id] # take 0 ? if report.report_type in ['qweb-html', 'qweb-pdf']: - result, format = self.pool['report'].get_pdf(report, res_id, context=ctx), 'pdf' + result, format = self.pool['report'].get_pdf(cr, uid, [res_id], report_service, context=ctx), 'pdf' else: result, format = openerp.report.render_report(cr, uid, [res_id], report_service, {'model': template.model}, ctx) diff --git a/addons/report/models/report.py b/addons/report/models/report.py index ccb892d56d7..2275a46ae93 100644 --- a/addons/report/models/report.py +++ b/addons/report/models/report.py @@ -224,8 +224,13 @@ class Report(osv.Model): if context is None: context = {} - ids = [int(i) for i in ids.split(',')] - ids = list(set(ids)) + if isinstance(ids, str): + ids = [int(i) for i in ids.split(',')] + if isinstance(ids, list): + ids = list(set(ids)) + if isinstance(ids, int): + ids = [ids] + report = self._get_report_from_name(cr, uid, report_name) report_obj = self.pool[report.model] docs = report_obj.browse(cr, uid, ids, context=context)