Bank Template

modules/purchase_trade/invoice.py

@@ -668,17 +668,17 @@ class Invoice(metaclass=PoolMeta):
     @staticmethod
     def _get_report_bank_address_lines(account):
         address = Invoice._get_report_bank_address(account)
-        full_address = getattr(address, 'full_address', None) if address else ''
-        if not full_address and address:
-            city_line = ' '.join(filter(None, [
-                getattr(address, 'postal_code', None),
-                getattr(address, 'city', None),
-            ]))
-            full_address = '\n'.join(filter(None, [
-                getattr(address, 'name', None),
-                getattr(address, 'street', None),
-                city_line,
-            ]))
+        if not address:
+            return ''
+        city_line = ' '.join(filter(None, [
+            getattr(address, 'postal_code', None),
+            getattr(address, 'city', None),
+        ]))
+        full_address = '\n'.join(filter(None, [
+            getattr(address, 'name', None),
+            getattr(address, 'street', None),
+            city_line,
+        ]))
         return '\n'.join(
             line for line in (full_address or '').splitlines()
             if line.strip())

modules/purchase_trade/tests/test_module.py

@@ -3265,7 +3265,12 @@ class PurchaseTradeTestCase(ModuleTestCase):
 
         address = Mock(
             party_full_name='UBS SWITZERLAND AG',
-            full_address='Case Postale\nCH-1211 Geneve 2',
+            name='Case Postale',
+            street='',
+            postal_code='CH-1211 Geneve 2',
+            city='',
+            full_address='UBS SWITZERLAND AG\nCase Postale\n'
+            'CH-1211 Geneve 2',
         )
         party = Mock(rec_name='UBS')
         party.address_get.return_value = address