Merge lp:~openerp-dev/openobject-server/saas-1-partner_name_search-chs into lp:~openerp/openobject-server/saas-1

[Christophe Simonis (OpenERP)]

Unmerged revisions

4874. By Christophe Simonis (OpenERP) on 2013-05-07

[FIX] res.partner: name_search: do not alter "args" argument

4873. By Christophe Simonis (OpenERP) on 2013-05-06

[FIX] res.partner: name_search: must join domain with "&" on case of negative search

4872. By Christophe Simonis (OpenERP) on 2013-05-06

[FIX] res.partner: name_create() must write explicitly "name" instead of _rec_name (which is readonly)

4871. By Christophe Simonis (OpenERP) on 2013-05-06

[FIX] res.partner: rewrite name_search to use display_name field instead of doing a (wrong) sql query

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2013-05-28 10:27:33 +0000
+++ openerp/addons/base/res/res_partner.py	2013-06-12 09:24:49 +0000
@@ -167,6 +167,7 @@
 class res_partner(osv.osv, format_address):
     _description = 'Partner'
     _name = "res.partner"
+    _rec_name = 'display_name'
 
     def _address_display(self, cr, uid, ids, name, args, context=None):
         res = {}
@@ -579,7 +580,7 @@
             raise osv.except_osv(_('Warning'), _("Couldn't create contact without email address !"))
         if not name and email:
             name = email
-        rec_id = self.create(cr, uid, {self._rec_name: name or email, 'email': email or False}, context=context)
+        rec_id = self.create(cr, uid, {'name': name or email, 'email': email or False}, context=context)
         return self.name_get(cr, uid, [rec_id], context)[0]
 
     def _search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False, access_rights_uid=None):
@@ -591,31 +592,15 @@
         return super(res_partner, self)._search(cr, user, args, offset=offset, limit=limit, order=order, context=context,
                                                 count=count, access_rights_uid=access_rights_uid)
 
-    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
+    def _name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=100, name_get_uid=None):
         if not args:
             args = []
-        if name and operator in ('=', 'ilike', '=ilike', 'like', '=like'):
-            # search on the name of the contacts and of its company
-            search_name = name
-            if operator in ('ilike', 'like'):
-                search_name = '%%%s%%' % name
-            if operator in ('=ilike', '=like'):
-                operator = operator[1:]
-            query_args = {'name': search_name}
-            limit_str = ''
-            if limit:
-                limit_str = ' limit %(limit)s'
-                query_args['limit'] = limit
-            cr.execute('''SELECT partner.id FROM res_partner partner
-                          LEFT JOIN res_partner company ON partner.parent_id = company.id
-                          WHERE partner.email ''' + operator +''' %(name)s
-                             OR partner.name || ' (' || COALESCE(company.name,'') || ')'
-                          ''' + operator + ' %(name)s ' + limit_str, query_args)
-            ids = map(lambda x: x[0], cr.fetchall())
-            ids = self.search(cr, uid, [('id', 'in', ids)] + args, limit=limit, context=context)
-            if ids:
-                return self.name_get(cr, uid, ids, context)
-        return super(res_partner,self).name_search(cr, uid, name, args, operator=operator, context=context, limit=limit)
+        args = args[:]
+        if not (name == '' and operator == 'ilike'):    # will match all, do not slow down research with no-op filter
+            joiner = '&' if operator in openerp.osv.expression.NEGATIVE_TERM_OPERATORS else '|'
+            args += [joiner, (self._rec_name, operator, name), ('email', operator, name)]
+        ids = self._search(cr, uid, args, limit=limit, context=context, access_rights_uid=name_get_uid or uid)
+        return self.name_get(cr, name_get_uid or uid, ids, context)
 
     def find_or_create(self, cr, uid, email, context=None):
         """ Find a partner with the given ``email`` or use :py:method:`~.name_create`