pain - prevent leading space in address block when no zip

This commit is contained in:
Luc De Meyer
2022-12-13 10:25:57 +01:00
parent e2b6a4d0a9
commit 161ddfa0ea

View File

@@ -525,25 +525,28 @@ class AccountPaymentOrder(models.Model):
and (partner.zip or partner.city) and (partner.zip or partner.city)
): ):
adrline2 = etree.SubElement(postal_address, "AdrLine") adrline2 = etree.SubElement(postal_address, "AdrLine")
val = []
if partner.zip: if partner.zip:
val = self._prepare_field( val.append(
"zip", self._prepare_field(
"partner.zip", "zip",
{"partner": partner}, "partner.zip",
70, {"partner": partner},
gen_args=gen_args, 70,
gen_args=gen_args,
)
) )
else:
val = ""
if partner.city: if partner.city:
val += " " + self._prepare_field( val.append(
"city", self._prepare_field(
"partner.city", "city",
{"partner": partner}, "partner.city",
70, {"partner": partner},
gen_args=gen_args, 70,
gen_args=gen_args,
)
) )
adrline2.text = val adrline2.text = " ".join(val)
return True return True
@api.model @api.model