From 0fd0579de12e5acf9c50e3462c7e7869082dbeca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 5 Aug 2012 21:10:40 +0200 Subject: [PATCH] Ensure clause concatination works with tuple vs list (transplanted from 3afd52ed80da5bee8d31ba1659b0849206d7070e) --- move.py | 4 ++-- tax.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/move.py b/move.py index 603d4208cd..adc9059c37 100644 --- a/move.py +++ b/move.py @@ -158,8 +158,8 @@ class Move(ModelSQL, ModelView): def search_rec_name(self, cursor, user, name, clause, context=None): ids = self.search(cursor, user, ['OR', - ('reference',) + clause[1:], - (self._rec_name,) + clause[1:], + ('reference',) + tuple(clause[1:]), + (self._rec_name,) + tuple(clause[1:]), ], context=context) return [('id', 'in', ids)] diff --git a/tax.py b/tax.py index d21b8e1838..4574d71279 100644 --- a/tax.py +++ b/tax.py @@ -254,11 +254,11 @@ class Code(ModelSQL, ModelView): return res def search_rec_name(self, cursor, user, name, clause, context=None): - ids = self.search(cursor, user, [('code',) + clause[1:]], limit=1, + ids = self.search(cursor, user, [('code',) + tuple(clause[1:])], limit=1, order=[], context=context) if ids: - return [('code',) + clause[1:]] - return [('name',) + clause[1:]] + return [('code',) + tuple(clause[1:])] + return [('name',) + tuple(clause[1:])] def delete(self, cursor, user, ids, context=None): if isinstance(ids, (int, long)):