Skip to content

Fix debtor postal address in non batch mode #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmprav wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix debtor postal address in non batch mode #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sepaxml/transfer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ def add_payment(self, payment):
del PmtInf_nodes['ReqdExctnDtNode']

PmtInf_nodes['Nm_Dbtr_Node'].text = self._config['name']
if payment.get('address', {}):
if self._config.get('address', {}):
for d, n in ADDRESS_MAPPING:
if self._config['address'].get(d):
n = ET.Element(n)
n.text = self._config['address'][d]
PmtInf_nodes['PstlAdr_Dbtr_Node'].append(n)
for line in self._config.get('lines', []):
for line in self._config['address'].get('lines', []):
n = ET.Element('AdrLine')
n.text = line
PmtInf_nodes['PstlAdr_Dbtr_Node'].append(n)
Expand Down Expand Up @@ -294,8 +294,8 @@ def _add_non_batch(self, TX_nodes, PmtInf_nodes):
PmtInf_nodes['ReqdExctnDtNode'].append(PmtInf_nodes['ReqdExctnDt_Dt_Node'])

PmtInf_nodes['DbtrNode'].append(PmtInf_nodes['Nm_Dbtr_Node'])
if "PstlAdr_Dbtr_Node" in TX_nodes:
PmtInf_nodes['DbtrNode'].append(TX_nodes['PstlAdr_Dbtr_Node'])
if len(PmtInf_nodes['PstlAdr_Dbtr_Node']) > 0:
PmtInf_nodes['DbtrNode'].append(PmtInf_nodes['PstlAdr_Dbtr_Node'])
PmtInf_nodes['PmtInfNode'].append(PmtInf_nodes['DbtrNode'])

PmtInf_nodes['Id_DbtrAcct_Node'].append(PmtInf_nodes['IBAN_DbtrAcct_Node'])
Expand Down
82 changes: 82 additions & 0 deletions tests/transfer/test_non_batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,84 @@ def test_two_debits(strf):
assert clean_ids(xmlpretty.strip()) == clean_ids(SAMPLE_RESULT.strip())


SAMPLE_RESULT_WITH_ADDRESS = b"""
<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.03" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<CstmrCdtTrfInitn>
<GrpHdr>
<MsgId>20260113041500-135e7321ab20</MsgId>
<CreDtTm>2026-01-13T16:15:00</CreDtTm>
<NbOfTxs>1</NbOfTxs>
<CtrlSum>10.12</CtrlSum>
<InitgPty>
<Nm>TestCreditor</Nm>
</InitgPty>
</GrpHdr>
<PmtInf>
<PmtInfId>TestCreditor-5c372d141200</PmtInfId>
<PmtMtd>TRF</PmtMtd>
<BtchBookg>false</BtchBookg>
<NbOfTxs>1</NbOfTxs>
<CtrlSum>10.12</CtrlSum>
<PmtTpInf>
<SvcLvl>
<Cd>SEPA</Cd>
</SvcLvl>
</PmtTpInf>
<ReqdExctnDt>2026-01-13</ReqdExctnDt>
<Dbtr>
<Nm>TestCreditor</Nm>
<PstlAdr>
<Ctry>DE</Ctry>
<AdrLine>Line 1</AdrLine>
<AdrLine>Line 2</AdrLine>
</PstlAdr>
</Dbtr>
<DbtrAcct>
<Id>
<IBAN>NL50BANK1234567890</IBAN>
</Id>
</DbtrAcct>
<DbtrAgt>
<FinInstnId>
<BIC>BANKNL2A</BIC>
</FinInstnId>
</DbtrAgt>
<ChrgBr>SLEV</ChrgBr>
<CdtTrfTxInf>
<PmtId>
<EndToEndId>ebd75e7e649375d91b33dc11ae44c0e1</EndToEndId>
</PmtId>
<Amt>
<InstdAmt Ccy="EUR">10.12</InstdAmt>
</Amt>
<CdtrAgt>
<FinInstnId>
<BIC>BANKNL2A</BIC>
</FinInstnId>
</CdtrAgt>
<Cdtr>
<Nm>Test von Testenstein</Nm>
<PstlAdr>
<Ctry>DE</Ctry>
<AdrLine>Line 1</AdrLine>
<AdrLine>Line 2</AdrLine>
</PstlAdr>
</Cdtr>
<CdtrAcct>
<Id>
<IBAN>NL50BANK1234567890</IBAN>
</Id>
</CdtrAcct>
<RmtInf>
<Ustrd>Test transaction1</Ustrd>
</RmtInf>
</CdtTrfTxInf>
</PmtInf>
</CstmrCdtTrfInitn>
</Document>
"""


def test_sepa_address(strf):
config = {
"name": "TestCreditor",
Expand Down Expand Up @@ -191,3 +269,7 @@ def test_sepa_address(strf):
}
strf = SepaTransfer(config)
strf.add_payment(payment1)
xmlout = strf.export()
xmlpretty = validate_xml(xmlout, "pain.001.001.03")
print(xmlpretty.decode())
assert clean_ids(xmlpretty.strip()) == clean_ids(SAMPLE_RESULT_WITH_ADDRESS.strip())