Skip to content

Commit

Permalink
[IMP] simplified name_search on analytic
Browse files Browse the repository at this point in the history
  • Loading branch information
fpodoo committed Dec 21, 2012
1 parent 65405e9 commit ca2855b
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions addons/analytic/analytic.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,18 +299,7 @@ def name_search(self, cr, uid, name, args=None, operator='ilike', context=None,
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)
Expand Down

0 comments on commit ca2855b

Please sign in to comment.