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

[FIX] fields: fix the translations of the labels of inherited fields

This commit is contained in:
Raphael Collet 2014-11-06 16:00:58 +01:00
parent 2da7b11c36
commit 54140331f3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openerp/addons/base/ir/ir_translation.py
View File

@ -400,7 +400,7 @@ class ir_translation(osv.osv):
main_lang = 'en_US'
translatable_fields = []
for k, f in trans_model._fields.items():
if f.translate:
if getattr(f, 'translate', False):
if f.inherited:
parent_id = trans_model.read(cr, uid, [id], [f.related[0]], context=context)[0][f.related[0]][0]
translatable_fields.append({'name': k, 'id': parent_id, 'model': f.base_field.model})
@ -434,7 +434,7 @@ class ir_translation(osv.osv):
if field:
f = trans_model._fields[field]
action['context'] = {
'search_default_name': "%s,%s" % (f.base_field.model, field)
'search_default_name': "%s,%s" % (f.base_field.model_name, field)
}
return action

3
openerp/fields.py
View File

@ -623,7 +623,8 @@ class Field(object):
def _description_string(self, env):
if self.string and env.lang:
name = "%s,%s" % (self.model_name, self.name)
field = self.base_field
name = "%s,%s" % (field.model_name, field.name)
trans = env['ir.translation']._get_source(name, 'field', env.lang)
return trans or self.string
return self.string