From 0f00cc82bb1ca92331eea8005831fc176460e7ad Mon Sep 17 00:00:00 2001
From: Maxime Richez <maxime.richez@saluc.com>
Date: Sat, 11 Jan 2020 23:56:16 +0100
Subject: [PATCH] Add bank name and currency code to bank account rec_name

issue8908
review288681002
---
 CHANGELOG |  2 ++
 bank.py   | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1ef5b9e664..e0d131ff2d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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 --git a/bank.py b/bank.py
index a6c92914f1..dc516a2bc9 100644
--- a/bank.py
+++ b/bank.py
@@ -59,11 +59,22 @@ class BankAccount(DeactivableMixin, ModelSQL, ModelView):
         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):