Merge lp:~initos.com/openobject-server/trunk-bug-1281769 into lp:openobject-server

[Thomas Rehn]

Fixes a column inheritance bug in XML search evaluation.

Unmerged revisions

5087. By Thomas Rehn on 2014-02-18

another column inheritance bug

5086. By Thomas Rehn on 2014-02-18

fixes #1281769, use _all_columns instead of _columns

=== modified file 'openerp/tools/convert.py'
--- openerp/tools/convert.py	2014-01-16 09:17:16 +0000
+++ openerp/tools/convert.py	2014-02-18 20:49:22 +0000
@@ -133,8 +133,8 @@
             ids = pool[f_model].search(cr, uid, q)
             if f_use != 'id':
                 ids = map(lambda x: x[f_use], pool[f_model].read(cr, uid, ids, [f_use]))
-            _cols = pool[f_model]._columns
-            if (f_name in _cols) and _cols[f_name]._type=='many2many':
+            _cols = pool[f_model]._all_columns
+            if (f_name in _cols) and _cols[f_name].column._type=='many2many':
                 return ids
             f_val = False
             if len(ids):
@@ -821,9 +821,9 @@
                 # browse the objects searched
                 s = f_obj.browse(cr, self.uid, f_obj.search(cr, self.uid, q))
                 # column definitions of the "local" object
-                _cols = self.pool[rec_model]._columns
+                _cols = self.pool[rec_model]._all_columns
                 # if the current field is many2many
-                if (f_name in _cols) and _cols[f_name]._type=='many2many':
+                if (f_name in _cols) and _cols[f_name].column._type=='many2many':
                     f_val = [(6, 0, map(lambda x: x[f_use], s))]
                 elif len(s):
                     # otherwise (we are probably in a many2one field),