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

[REF] Clean 

bzr revid: stephane@tinyerp.com-20081215114839-v3ixe1ktg1xhkd3r
This commit is contained in:
Stephane Wirtel 2008-12-15 12:48:39 +01:00
parent 577e96bb53
commit 73736db39d
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/osv/orm.py
View File

@ -709,8 +709,7 @@ class orm_template(object):
translation_obj = self.pool.get('ir.translation')
model_access_obj = self.pool.get('ir.model.access')
for parent in self._inherits:
res.update(self.pool.get(parent).fields_get(cr, user, fields,
context))
res.update(self.pool.get(parent).fields_get(cr, user, fields, context))
for f in self._columns.keys():
if fields and f not in fields:
continue
@ -727,12 +726,10 @@ class orm_template(object):
and getattr(self._columns[f], arg):
res[f][arg] = getattr(self._columns[f], arg)
res_trans = translation_obj._get_source(cr, user,
self._name + ',' + f, 'field', context.get('lang', False) or 'en_US')
res_trans = translation_obj._get_source(cr, user, self._name + ',' + f, 'field', context.get('lang', False) or 'en_US')
if res_trans:
res[f]['string'] = res_trans
help_trans = translation_obj._get_source(cr, user,
self._name + ',' + f, 'help', context.get('lang', False) or 'en_US')
help_trans = translation_obj._get_source(cr, user, self._name + ',' + f, 'help', context.get('lang', False) or 'en_US')
if help_trans:
res[f]['help'] = help_trans
@ -744,9 +741,7 @@ class orm_template(object):
for (key, val) in sel:
val2 = None
if val:
val2 = translation_obj._get_source(cr, user,
self._name + ',' + f, 'selection',
context.get('lang', False) or 'en_US', val)
val2 = translation_obj._get_source(cr, user, self._name + ',' + f, 'selection', context.get('lang', False) or 'en_US', val)
sel2.append((key, val2 or val))
sel = sel2
res[f]['selection'] = sel