Merge lp:~therp-nl/ocb-addons/6.1_fix_analytic_account_name_search into lp:ocb-addons/6.1

[Holger Brunn (Therp)]

[IMP] backported lp:openobject-addons rev 8463,8464

In 6.1, there can be too few results from autocomplete in many2one fields to account.analytic.account if there is a domain involved. This is caused by the fact that we have multiple searches with the limit of 8 in effect of which only the last applies the domain. So if the first eight results from the previous search don't match, bad luck for you.

Given that there is some other stuff wrong with this part of the function too, I backported what 7.0 does:
http://bazaar.launchpad.net/~openerp/openobject-addons/trunk/revision/8464

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks!

You seem to have missed the line

    name = name2.strip()

Otherwise fine.

review: Needs Fixing

[Holger Brunn (Therp) (hbrunn)]

Thank for point that out! This line is missing on purpose. But I tried to be smarter than I am, now it's okay.

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks!

review: Approve

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review)

=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2012-02-16 18:01:11 +0000
+++ analytic/analytic.py	2013-07-09 14:55:30 +0000
@@ -263,18 +263,15 @@
         if name:
             account = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
             if not account:
-                names=map(lambda i : i.strip(),name.split('/'))
-                for i in range(len(names)):
-                    dom=[('name', operator, names[i])]
-                    if i>0:
-                        dom+=[('id','child_of',account)]
-                    account = self.search(cr, uid, dom, limit=limit, context=context)
-                newacc = account
-                while newacc:
-                    newacc = self.search(cr, uid, [('parent_id', 'in', newacc)], limit=limit, context=context)
-                    account += newacc
-                if args:
-                    account = self.search(cr, uid, [('id', 'in', account)] + args, limit=limit, context=context)
+                dom = []
+                for name2 in map(lambda i : i.strip(),name.split('/')):
+                    account = self.search(
+                            cr, uid, 
+                            dom + [('name', 'ilike', name2)] + args,
+                            limit=limit, context=context)
+                    if not account:
+                        break
+                    dom = [('parent_id','in',account)]
         else:
             account = self.search(cr, uid, args, limit=limit, context=context)
         return self.name_get(cr, uid, account, context=context)