odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REV] Previous commit loses the inherit_branding context's key 

bzr revid: fme@openerp.com-20131128094809-l77nyyqglzha3tuh
This commit is contained in:
Fabien Meghazi 2013-11-28 10:48:09 +01:00
parent 2fef12e984
commit 071ef9702b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openerp/addons/base/ir/ir_ui_view.py
View File

@ -668,11 +668,7 @@ class view(osv.osv):
# view used as templates
@tools.ormcache(skiparg=2)
def read_template(self, cr, uid, id_, lang=None):
context = {}
if lang:
context['lang'] = lang
def read_template(self, cr, uid, id_, context=None):
try:
id_ = int(id_)
except ValueError:
@ -777,7 +773,7 @@ class view(osv.osv):
context = {}
def loader(name):
return self.read_template(cr, uid, name, context['lang'])
return self.read_template(cr, uid, name, context=context)
return self.pool[engine].render(
cr, uid, id_or_xml_id, values,