Merge remote-tracking branch 'upstream/master' into zope4py2

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountItemList.py

@@ -70,12 +70,14 @@ bank_account_list = [brain.getObject() for brain in sorted(
 )]
 
 
-def getItemList(bank_account):
+def getItemList(bank_account, warning=False):
   reference = bank_account.getReference()
   title = bank_account.getTitle() or bank_account.getSourceFreeText() or bank_account.getSourceTitle()
   label = title
   if reference != title:
     label = '{} - {}'.format(reference, title)
+  if warning:
+    label = '??? ({})'.format(label)
   return (label, bank_account.getRelativeUrl())
 
 
@@ -98,6 +100,6 @@ if base_category is not None:
       translateString(
         'Invalid bank account from ${entity_title}',
         mapping={'entity_title': current_value.getParentTitle()}), None))
-    item_list.append(getItemList(current_value))
+    item_list.append(getItemList(current_value, warning=True))
 
 return item_list

bt5/erp5_accounting/TestTemplateItem/portal_components/test.erp5.testAccounting.py

@@ -4988,7 +4988,7 @@ class TestTransactions(AccountingTestCase):
       [
         ('', ''),
         ('Invalid bank account from Client 1', None),
-        ('client_1 bank account', client_1_bank_account.getRelativeUrl()),
+        ('??? (client_1 bank account)', client_1_bank_account.getRelativeUrl()),
       ],
     )
 
@@ -5013,7 +5013,7 @@ class TestTransactions(AccountingTestCase):
       [
         ('', ''),
         ('Invalid bank account from Client 1', None),
-        ('client_1 bank account', client_1_bank_account.getRelativeUrl()),
+        ('??? (client_1 bank account)', client_1_bank_account.getRelativeUrl()),
       ],
     )