From 8ca3412c5b433eaae99c64f9acb9aac12d1711e8 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Fri, 14 Oct 2016 13:32:23 +0000 Subject: [PATCH] [UPD] parse more fields as of (#71) * [UPD] parse more fields for MT940 as of https://www.ing.nl/media/ING_ming_mt940s_24_juli_tcm162-46356.pdf p 8ff * [FIX] There is no CR or LF in mt940 data to be parsed. The calling logic from the MT940 parser concatenates all lines from a mt940 tag. --- .../mt940.py | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/account_bank_statement_import_mt940_base/mt940.py b/account_bank_statement_import_mt940_base/mt940.py index 9ddd9ce..3c36f42 100644 --- a/account_bank_statement_import_mt940_base/mt940.py +++ b/account_bank_statement_import_mt940_base/mt940.py @@ -83,14 +83,28 @@ def handle_common_subfields(transaction, subfields): for counterpart_field in ['CNTP', 'BENM', 'ORDP']: if counterpart_field in subfields: get_counterpart(transaction, subfields[counterpart_field]) + if not transaction.message: + transaction.message = '' # REMI: Remitter information (text entered by other party on trans.): if 'REMI' in subfields: - transaction.message = ( - '/'.join(x for x in subfields['REMI'] if x)) + transaction.message += ( + subfields['REMI'][2] + # this might look like + # /REMI/USTD/// + # or + # /REMI/STRD/CUR// + if len(subfields['REMI']) >= 3 and subfields['REMI'][0] in [ + 'STRD', 'USTD' + ] + else + '/'.join(x for x in subfields['REMI'] if x) + ) + # EREF: End-to-end reference + if 'EREF' in subfields: + transaction.message += '/'.join(filter(bool, subfields['EREF'])) # Get transaction reference subfield (might vary): if transaction.eref in subfields: - transaction.eref = ''.join( - subfields[transaction.eref]) + transaction.eref = ''.join(subfields[transaction.eref]) class MT940(object):