merge

2009-11-12 00:21:32 +01:00
parent eb9303cf73 3fa3be1fe2
commit 29bf2e68e3
1 changed files with 3 additions and 1 deletions
@@ -169,9 +169,11 @@ class Party(ModelSQL, ModelView):
        args2 = []
        i = 0
        while i < len(args):
-            ids = self.search(cursor, user, [('code', '=', args[i][2])],
+            ids = self.search(cursor, user, [('code', args[i][1], args[i][2])],
                    context=context)
            if ids:
+                ids += self.search(cursor, user,
+                        [('name', args[i][1], args[i][2])], context=context)
                args2.append(('id', 'in', ids))
            else:
                args2.append(('name', args[i][1], args[i][2]))