[MERGE] merged fix on column._domain.

bzr revid: vmt@openerp.com-20120713132226-kqc2muy1htyfkhu9
2012-07-13 15:22:26 +02:00
parent 144c186e46 392b094d9b
commit 8185bbdbe1
1 changed files with 1 additions and 1 deletions
@@ -1677,7 +1677,7 @@ class BaseModel(object):
                        dom = []
                        if column._domain and not isinstance(column._domain, basestring):
                            dom = column._domain
-                        dom += eval(node.get('domain', '[]'), {'uid': user, 'time': time})
+                        dom = dom + eval(node.get('domain', '[]'), {'uid': user, 'time': time})
                        search_context = dict(context)
                        if column._context and not isinstance(column._context, basestring):
                            search_context.update(column._context)