Merge lp:~serpent-consulting-services/openobject-server/SerpentCS-971627-bug-6.1 into lp:openobject-server/6.1

[Serpent Consulting Services]

[Olivier Dony (Odoo) (odo-openerp)]

Hi,

Thanks for proposing a patch for the remaining issue, however it seems we can apply the same minimalist patch as for bug 955051 and its related merge proposal:
  https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-572802-skh/+merge/100146

This seems somewhat simpler and more readable.

Your merge proposal helped identify that we were talking about the same remaining problem, though, so it was quite useful! :-)

Thanks!

Unmerged revisions

4138. By Serpent Consulting Services on 2012-04-08

[FIX] Base : Corrected name_search() of Address

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2012-03-21 13:55:58 +0000
+++ openerp/addons/base/res/res_partner.py	2012-04-08 23:00:29 +0000
@@ -367,12 +367,24 @@
             # Searching on such a domain can be dramatically inefficient, due to the expansion made
             # for field translations, and the handling of the disjunction by the DB engine itself.
             # So instead, we search field by field until the search limit is reached.
-            while len(ids) < limit and fields:
-                f = fields.pop(0)
+            # Either way, if limit is not specified, we search till all the necessary fields
+            # have gone under the radar of search
+            
+            def _search_address(f, ids):
                 new_ids = self.search(cr, user, [(f, operator, name)] + args, limit=limit, context=context)
                 # extend ids with the ones in new_ids that are not in ids yet (and keep order)
                 old_ids = set(ids)
                 ids.extend([id for id in new_ids if id not in old_ids])
+                return ids
+            
+            if limit is None:
+                #This could have been called 
+                for f in fields:
+                    ids =_search_address(f, ids)
+            
+            while len(ids) < limit and fields:
+                f = fields.pop(0)
+                ids =_search_address(f, ids)
 
         ids = ids[:limit]
         return self.name_get(cr, user, ids, context=context)