From 7291bf8a1840137fc36901671a3aa9b1d63ba8c8 Mon Sep 17 00:00:00 2001 From: Sergi Almacellas Abellana Date: Sat, 6 Mar 2021 19:15:38 +0100 Subject: [PATCH] Unify account and account template rec_name's searcher issue10156 review316921003 --- account.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/account.py b/account.py index bd0f9271ff..cc7e6302c2 100644 --- a/account.py +++ b/account.py @@ -531,8 +531,11 @@ def AccountMixin(template=False): bool_op = 'AND' else: bool_op = 'OR' + code_value = clause[2] + if clause[1].endswith('like'): + code_value = lstrip_wildcard(clause[2]) return [bool_op, - ('code',) + tuple(clause[1:]), + ('code', clause[1], code_value) + tuple(clause[3:]), (cls._rec_name,) + tuple(clause[1:]), ] @@ -1054,20 +1057,6 @@ class Account(AccountMixin(), ActivePeriodMixin, tree(), ModelSQL, ModelView): 'party_required', 'general_ledger_balance'}): setattr(self, field, getattr(self.parent, field)) - @classmethod - def search_rec_name(cls, name, clause): - if clause[1].startswith('!') or clause[1].startswith('not '): - bool_op = 'AND' - else: - bool_op = 'OR' - code_value = clause[2] - if clause[1].endswith('like'): - code_value = lstrip_wildcard(clause[2]) - return [bool_op, - ('code', clause[1], code_value) + tuple(clause[3:]), - (cls._rec_name,) + tuple(clause[1:]), - ] - @classmethod def check_second_currency(cls, accounts): pool = Pool()