From cb009f218b7fc6bca057ac931f17fad3738090ee Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 8 Sep 2011 11:55:44 +0200 Subject: [PATCH] [imp] made ids in report overridable by report action bzr revid: nicolas.vanhoren@openerp.com-20110908095544-77pottqwvarnh2gq --- addons/web/controllers/main.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 5238185f091..922e3ec8e20 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1364,11 +1364,14 @@ class Reports(View): req.context or {}, action[ "context"])) report_data = {} + report_ids = context["active_ids"] if 'report_type' in action: report_data['report_type'] = action['report_type'] - if 'datas' in action and 'form' in action['datas']: - report_data['form'] = action['datas']['form'] - report_ids = context["active_ids"] + if 'datas' in action: + if 'form' in action['datas']: + report_data['form'] = action['datas']['form'] + if 'ids' in action['datas']: + report_ids = action['datas']['ids'] report_id = report_srv.report( req.session._db, req.session._uid, req.session._password, action["report_name"], report_ids,