From e06cefb4be20bb930bd8c8460cf876d477f62189 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Fri, 21 Mar 2014 12:17:42 +0100 Subject: [PATCH] [FIX] Correctly separate website variable between report and website_report layouts bzr revid: sle@openerp.com-20140321111742-rzkykk00z6fbum8d --- addons/report/models/report.py | 1 + addons/report/views/layouts.xml | 2 -- addons/website_report/views/layouts.xml | 6 ++++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/report/models/report.py b/addons/report/models/report.py index 79bf41158c0..af231bc12cf 100644 --- a/addons/report/models/report.py +++ b/addons/report/models/report.py @@ -193,6 +193,7 @@ class Report(osv.Model): 'get_digits': self.get_digits, 'render_doc': render_doc, 'editable': True, # Will active inherit_branding + 'res_company': self.pool['res.users'].browse(cr, uid, uid).company_id }) return view_obj.render(cr, uid, template, values, context=context) diff --git a/addons/report/views/layouts.xml b/addons/report/views/layouts.xml index 73c5ce03244..588775fc41e 100644 --- a/addons/report/views/layouts.xml +++ b/addons/report/views/layouts.xml @@ -4,9 +4,7 @@