From 6d0aecf8913e8da0dfff7df2d14d9a5119b0ed5e 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 --- move.py | 4 ++-- tax.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/move.py b/move.py index 8078634c5c..0ff18c3659 100644 --- a/move.py +++ b/move.py @@ -172,8 +172,8 @@ class Move(ModelSQL, ModelView): def search_rec_name(self, name, clause): ids = self.search(['OR', - ('reference',) + clause[1:], - (self._rec_name,) + clause[1:], + ('reference',) + tuple(clause[1:]), + (self._rec_name,) + tuple(clause[1:]), ]) return [('id', 'in', ids)] diff --git a/tax.py b/tax.py index 875879ec61..6837f28c0f 100644 --- a/tax.py +++ b/tax.py @@ -239,10 +239,10 @@ class Code(ModelSQL, ModelView): return res def search_rec_name(self, name, clause): - ids = self.search([('code',) + clause[1:]], limit=1, order=[]) + ids = self.search([('code',) + tuple(clause[1:])], limit=1, order=[]) if ids: - return [('code',) + clause[1:]] - return [('name',) + clause[1:]] + return [('code',) + tuple(clause[1:])] + return [('name',) + tuple(clause[1:])] def delete(self, ids): if isinstance(ids, (int, long)):