From ca2855bb19e869fa1b9ec2fa4c43635204614d80 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 21 Dec 2012 17:12:07 +0100 Subject: [PATCH] [IMP] simplified name_search on analytic bzr revid: fp@tinyerp.com-20121221161207-doqu92tu4vxct6q6 --- addons/analytic/analytic.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index c9454c340f0..39754268a49 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -299,18 +299,7 @@ class account_analytic_account(osv.osv): if name: account_ids = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context) if not account_ids: - 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_ids)] - account_ids = self.search(cr, uid, dom, limit=limit, context=context) - newacc = account_ids - while newacc: - newacc = self.search(cr, uid, [('parent_id', 'in', newacc)], limit=limit, context=context) - account_ids += newacc - if args: - account_ids = self.search(cr, uid, [('id', 'in', account_ids)] + args, limit=limit, context=context) + account_ids = self.search(cr, uid, [('name', 'ilike', name)] + args, limit=limit, context=context) else: account_ids = self.search(cr, uid, args, limit=limit, context=context) return self.name_get(cr, uid, account_ids, context=context)