audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #998 into 14.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2022-12-15 15:50:32 +00:00
parent 5027df2938 161ddfa0ea
commit 44d2684cbc
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
account_banking_pain_base/models/account_payment_order.py
View File

@@ -502,27 +502,6 @@ class AccountPaymentOrder(models.Model):
"""Generate the piece of the XML corresponding to PstlAdr"""
if partner.country_id:
postal_address = etree.SubElement(parent_node, "PstlAdr")
if gen_args.get("pain_flavor").startswith("pain.001.001.") or gen_args.get(
"pain_flavor"
).startswith("pain.008.001."):
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",
@@ -540,7 +519,34 @@ class AccountPaymentOrder(models.Model):
70,
gen_args=gen_args,
)
if (
gen_args.get("pain_flavor").startswith("pain.001.001.")
or gen_args.get("pain_flavor").startswith("pain.008.001.")
and (partner.zip or partner.city)
):
adrline2 = etree.SubElement(postal_address, "AdrLine")
val = []
if partner.zip:
val.append(
self._prepare_field(
"zip",
"partner.zip",
{"partner": partner},
70,
gen_args=gen_args,
)
)
if partner.city:
val.append(
self._prepare_field(
"city",
"partner.city",
{"partner": partner},
70,
gen_args=gen_args,
)
)
adrline2.text = " ".join(val)
return True
@api.model

4
account_banking_sepa_credit_transfer/models/account_payment_method.py
View File

@@ -10,10 +10,10 @@ class AccountPaymentMethod(models.Model):
pain_version = fields.Selection(
selection_add=[
("pain.001.001.02", "pain.001.001.02"),
("pain.001.001.03", "pain.001.001.03 " "(recommended for credit transfer)"),
("pain.001.001.03", "pain.001.001.03 (recommended for credit transfer)"),
("pain.001.001.04", "pain.001.001.04"),
("pain.001.001.05", "pain.001.001.05"),
("pain.001.003.03", "pain.001.003.03 (credit transfer in Germany)"),
("pain.001.003.03", "pain.001.003.03"),
],
ondelete={
"pain.001.001.02": "set null",