From 9fab65afb8182a77aed9e69dd0464d1a414f81ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Nov 2013 12:31:02 +0100 Subject: [PATCH] Fix search_rec_name's - balance can not be used for searching rec_name because of incompatible type. - missing search_rec_name for line as get_rec_name is overridden. review1791002 (transplanted from 94010e1b19bff925a32e38317dec006b0de08926) --- statement.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/statement.py b/statement.py index 15f2e1daa8..2f783596fb 100644 --- a/statement.py +++ b/statement.py @@ -180,12 +180,6 @@ class Statement(Workflow, ModelSQL, ModelView): @classmethod def search_rec_name(cls, name, clause): - statements = cls.search(['OR', - ('start_balance',) + tuple(clause[1:]), - ('end_balance',) + tuple(clause[1:]), - ]) - if statements: - return [('id', 'in', [s.id for s in statements])] return [('journal',) + tuple(clause[1:])] def get_end_balance(self, name): @@ -446,6 +440,10 @@ class Line(ModelSQL, ModelView): def get_rec_name(self, name): return self.statement.rec_name + @classmethod + def search_rec_name(cls, name, clause): + return [('statement.rec_name',) + tuple(clause[1:])] + @classmethod def copy(cls, lines, default=None): if default is None: