[REV] Previous commit loses the inherit_branding context's key
bzr revid: fme@openerp.com-20131128094809-l77nyyqglzha3tuh
This commit is contained in:
parent
2fef12e984
commit
071ef9702b
|
@ -668,11 +668,7 @@ class view(osv.osv):
|
||||||
|
|
||||||
# view used as templates
|
# view used as templates
|
||||||
|
|
||||||
@tools.ormcache(skiparg=2)
|
def read_template(self, cr, uid, id_, context=None):
|
||||||
def read_template(self, cr, uid, id_, lang=None):
|
|
||||||
context = {}
|
|
||||||
if lang:
|
|
||||||
context['lang'] = lang
|
|
||||||
try:
|
try:
|
||||||
id_ = int(id_)
|
id_ = int(id_)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
|
@ -777,7 +773,7 @@ class view(osv.osv):
|
||||||
context = {}
|
context = {}
|
||||||
|
|
||||||
def loader(name):
|
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(
|
return self.pool[engine].render(
|
||||||
cr, uid, id_or_xml_id, values,
|
cr, uid, id_or_xml_id, values,
|
||||||
|
|
Loading…
Reference in New Issue