changeset 1311ecee55f1 in modules/bank:default details: https://hg.tryton.org/modules/bank?cmd=changeset;node=1311ecee55f1 description: Add bank name and currency code to bank account rec_name
issue8908 review288681002 diffstat: CHANGELOG | 2 ++ bank.py | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diffs (37 lines): diff -r f76e0401cca3 -r 1311ecee55f1 CHANGELOG --- a/CHANGELOG Wed Dec 04 11:09:35 2019 +0100 +++ b/CHANGELOG Sat Jan 11 23:56:16 2020 +0100 @@ -1,3 +1,5 @@ +* Show bank and currency in account record name + Version 5.4.0 - 2019-11-04 * Bug fixes (see mercurial logs for details) * Validate and format BIC diff -r f76e0401cca3 -r 1311ecee55f1 bank.py --- a/bank.py Wed Dec 04 11:09:35 2019 +0100 +++ b/bank.py Sat Jan 11 23:56:16 2020 +0100 @@ -59,11 +59,22 @@ help="Add the numbers which identify the bank account.") def get_rec_name(self, name): - return self.numbers[0].number + name = '%s @ %s' % (self.numbers[0].number, self.bank.rec_name) + if self.currency: + name += ' [%s]' % self.currency.code + return name @classmethod def search_rec_name(cls, name, clause): - return [('numbers',) + tuple(clause[1:])] + if clause[1].startswith('!') or clause[1].startswith('not '): + bool_op = 'AND' + else: + bool_op = 'OR' + return [bool_op, + ('bank.rec_name',) + tuple(clause[1:]), + ('currency',) + tuple(clause[1:]), + ('numbers',) + tuple(clause[1:]), + ] class BankAccountNumber(sequence_ordered(), ModelSQL, ModelView):