diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py index 6d046f57de7..c6cc2344b09 100644 --- a/bin/addons/base/ir/ir_actions.py +++ b/bin/addons/base/ir/ir_actions.py @@ -518,7 +518,7 @@ class actions_server(osv.osv): result = self.pool.get(action.action_id.type).read(cr, uid, action.action_id.id, context=context) return result - if action.state=='python': + if action.state=='code': localdict = { 'self': self.pool.get(action.model_id.model), 'context': context, diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 21029248635..719b4cdf857 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -181,14 +181,12 @@ class browse_record(object): fffields = map(lambda x: x[0], ffields) datas = self._table.read(self._cr, self._uid, ids, fffields, context=self._context, load="_classic_write") if self._fields_process: - lang = self._context.get('lang', 'en_US') or 'en_US' - lang_obj = self.pool.get('res.lang').browse(self._cr, self._uid,self.pool.get('res.lang').search(self._cr, self._uid,[('code','=',lang)])[0]) for n, f in ffields: if f._type in self._fields_process: for d in datas: d[n] = self._fields_process[f._type](d[n]) if d[n]: - d[n].set_value(self._cr, self._uid, d[n], self, f, lang_obj) + d[n].set_value(self._cr, self._uid, d[n], self, f) # create browse records for 'remote' objects diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py index ad669a7fece..cd2fc78f3f0 100644 --- a/bin/report/report_sxw.py +++ b/bin/report/report_sxw.py @@ -65,12 +65,18 @@ rml2sxw = { } class _format(object): - def set_value(self, cr, uid, name, object, field, lang_obj): + def set_value(self, cr, uid, name, object, field): #super(_date_format, self).__init__(self) + pool_lang = pooler.get_pool(cr.dbname).get('res.lang') self.object = object self._field = field self.name = name - self.lang_obj = lang_obj + lang = self.object._context.get('lang', 'en_US') or 'en_US' + lids = pool_lang.search(cr, uid,[('code','=',lang)]) + if lids: + self.lang_obj = pool_lang.browse(cr, uid,lids[0]) + else: + self.lang_obj = False class _float_format(float, _format):