[MERGE] forward port of branch 7.0 up to revid 5288 mat@openerp.com-20140423150215...

bzr revid: chs@openerp.com-20140424125338-26k5atvtqwmmfv4e

diff --cc openerp/addons/base/res/res_partner_view.xml
Simple merge

diff --cc openerp/addons/base/res/res_users.py
index 1668cbd,69aa273..0912735
--- 1/openerp/addons/base/res/res_users.py
--- 2/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@@ -26,9 -26,9 +26,9 @@@ from lxml.builder import 
  
  import openerp
  from openerp import SUPERUSER_ID
 -from openerp import pooler, tools
 +from openerp import tools
  import openerp.exceptions
- from openerp.osv import fields,osv
+ from openerp.osv import fields,osv, expression
  from openerp.osv.orm import browse_record
  from openerp.tools.translate import _
  

diff --cc openerp/addons/base/test/base_test.yml
Simple merge

diff --cc openerp/tools/convert.py
index 43ee966,870f9d1..2f2dcb4
--- 1/openerp/tools/convert.py
--- 2/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@@ -821,9 -785,9 +821,9 @@@ form: module.record_id""" % (xml_id,
                  # 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.get(rec_model)._all_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),