From 126d61796aaa0eb8dbf6375ddfd27905bb7b6e23 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Thu, 3 Apr 2014 17:48:56 +0200 Subject: [PATCH] [FIX] abstract_report: correctly pass the active ids in wrapped_report.set_context, fix analytic journal from ir.ui.menu by setting a consistent context bzr revid: sle@openerp.com-20140403154856-s3i220d6w1yw4e5s --- .../project/wizard/account_analytic_journal_report.py | 5 ++++- addons/report/models/abstract_report.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py index ab7e553435d..f2e406bc3a5 100644 --- a/addons/account/project/wizard/account_analytic_journal_report.py +++ b/addons/account/project/wizard/account_analytic_journal_report.py @@ -54,7 +54,10 @@ class account_analytic_journal_report(osv.osv_memory): 'model': 'account.analytic.journal', 'form': data } - return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticjournal', data=datas, context=context) + context2 = context.copy() + context2['active_model'] = 'account.analytic.journal' + context2['active_ids'] = ids_list + return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticjournal', data=datas, context=context2) def default_get(self, cr, uid, fields, context=None): if context is None: diff --git a/addons/report/models/abstract_report.py b/addons/report/models/abstract_report.py index 730d47287c5..2da32b6c0f6 100644 --- a/addons/report/models/abstract_report.py +++ b/addons/report/models/abstract_report.py @@ -51,7 +51,7 @@ class AbstractReport(osv.AbstractModel): # Generate the old style report wrapped_report = self._wrapped_report_class(cr, uid, '', context=context) - wrapped_report.set_context(objects, data, ids) + wrapped_report.set_context(objects, data, context['active_ids']) # Rendering self._template with the wrapped report instance localcontext as # rendering environment