From 161ddfa0eaa075c2d3ba01ce9e392bbdc792d314 Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
Date: Tue, 13 Dec 2022 10:25:57 +0100
Subject: [PATCH] pain - prevent leading space in address block when no zip

---
 .../models/account_payment_order.py           | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/account_banking_pain_base/models/account_payment_order.py b/account_banking_pain_base/models/account_payment_order.py
index f75bc99da..820d2fe7e 100644
--- a/account_banking_pain_base/models/account_payment_order.py
+++ b/account_banking_pain_base/models/account_payment_order.py
@@ -525,25 +525,28 @@ class AccountPaymentOrder(models.Model):
                 and (partner.zip or partner.city)
             ):
                 adrline2 = etree.SubElement(postal_address, "AdrLine")
+                val = []
                 if partner.zip:
-                    val = self._prepare_field(
-                        "zip",
-                        "partner.zip",
-                        {"partner": partner},
-                        70,
-                        gen_args=gen_args,
+                    val.append(
+                        self._prepare_field(
+                            "zip",
+                            "partner.zip",
+                            {"partner": partner},
+                            70,
+                            gen_args=gen_args,
+                        )
                     )
-                else:
-                    val = ""
                 if partner.city:
-                    val += " " + self._prepare_field(
-                        "city",
-                        "partner.city",
-                        {"partner": partner},
-                        70,
-                        gen_args=gen_args,
+                    val.append(
+                        self._prepare_field(
+                            "city",
+                            "partner.city",
+                            {"partner": partner},
+                            70,
+                            gen_args=gen_args,
+                        )
                     )
-                adrline2.text = val
+                adrline2.text = " ".join(val)
         return True
 
     @api.model