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

[MERGE] fields_view_get: avoid messing up selection fields' _domain attributes, courtesy of Stefan Rijnhart (Therp) 

lp bug: https://launchpad.net/bugs/1081092 fixed

bzr revid: odo@openerp.com-20121120132230-7xb6d2xxwcgn7ipn
This commit is contained in:
Olivier Dony 2012-11-20 14:22:30 +01:00
parent f0ef9bda04 d924cec182
commit caa51abb34
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/osv/orm.py
View File

@ -1782,7 +1782,7 @@ class BaseModel(object):
# TODO: find a way to remove this hack, by allow dynamic domains
dom = []
if column._domain and not isinstance(column._domain, basestring):
dom = column._domain
dom = list(column._domain)
dom += eval(node.get('domain', '[]'), {'uid': user, 'time': time})
search_context = dict(context)
if column._context and not isinstance(column._context, basestring):