pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] fix regression

Browse Source 
introduced at revno: 3466, revision-id: vmt@openerp.com-20110617072608-5tmwf2g2qb0pwrhk

bzr revid: vmt@openerp.com-20110627104748-hvvc3sb7nmxk85db
This commit is contained in:
Vo Minh Thu
2011-06-27 12:47:48 +02:00
parent 02f3363f91 f6c88941f5
commit a8facfdb38
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/osv/orm.py
+3 -3
View File
@@ -1291,15 +1291,15 @@ class orm_template(object):
res[f]['readonly'] = True
res[f]['states'] = {}
if hasattr(res[f], 'string'):
if 'string' in res[f]:
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
if hasattr(res[f], 'help'):
if 'help' in res[f]:
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
if hasattr(res[f], 'selection'):
if 'selection' in res[f]:
if isinstance(field.selection, (tuple, list)):
sel = field.selection
sel2 = []