From 078de097c8e5d3ce9171b704571a17672a8edd7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Wed, 26 Sep 2018 11:30:42 +0200 Subject: [PATCH] [IMP] improve Postal Address block Use TwnNm for city and PstlCd for zip. --- .../models/account_payment_order.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/account_banking_pain_base/models/account_payment_order.py b/account_banking_pain_base/models/account_payment_order.py index c1daa6a72..a6e5f886b 100644 --- a/account_banking_pain_base/models/account_payment_order.py +++ b/account_banking_pain_base/models/account_payment_order.py @@ -423,6 +423,16 @@ class AccountPaymentOrder(models.Model): partner = partner_bank.partner_id if partner.country_id: postal_address = etree.SubElement(party, 'PstlAdr') + if partner.zip: + pstcd = etree.SubElement(postal_address, 'PstCd') + pstcd.text = self._prepare_field( + 'Postal Code', 'partner.zip', + {'partner': partner}, 16, gen_args=gen_args) + if partner.city: + twnnm = etree.SubElement(postal_address, 'TwnNm') + twnnm.text = self._prepare_field( + 'Town Name', 'partner.city', + {'partner': partner}, 35, gen_args=gen_args) country = etree.SubElement(postal_address, 'Ctry') country.text = self._prepare_field( 'Country', 'partner.country_id.code', @@ -432,11 +442,6 @@ class AccountPaymentOrder(models.Model): adrline1.text = self._prepare_field( 'Adress Line1', 'partner.street', {'partner': partner}, 70, gen_args=gen_args) - if partner.city and partner.zip: - adrline2 = etree.SubElement(postal_address, 'AdrLine') - adrline2.text = self._prepare_field( - 'Address Line2', "partner.zip + ' ' + partner.city", - {'partner': partner}, 70, gen_args=gen_args) self.generate_party_id(party, party_type, partner)