Unify account and account template rec_name's searcher

issue10156
review316921003
This commit is contained in:
Sergi Almacellas Abellana committed 2021-03-06 19:15:38 +01:00
1 parent d5081641e5
commit 7291bf8a18
1 file changed
+4 -15
+4 -15
View File
@@ -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()