audrius/bank-statement-import
1
0
Fork 1
mirror of https://github.com/OCA/bank-statement-import.git synced 2025-01-20 12:37:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #560 into 14.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2023-04-19 18:10:33 +00:00
parent 48b712a16b 2e2641e56e
commit c35c890191
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
account_statement_import_camt/models/parser.py
View File

@@ -193,12 +193,13 @@ class CamtParser(models.AbstractModel):
)
if party_node:
name_node = node.xpath(
"./ns:RltdPties/ns:%s/ns:Nm" % party_type, namespaces={"ns": ns}
"./ns:RltdPties/ns:{pt}/ns:Nm | ./ns:RltdPties/ns:{pt}/ns:Pty/ns:Nm".format(
pt=party_type
),
namespaces={"ns": ns},
)
if name_node:
self.add_value_from_node(
ns, party_node[0], "./ns:Nm", transaction, "partner_name"
)
transaction["partner_name"] = name_node[0].text
else:
self.add_value_from_node(
ns,
@@ -248,7 +249,7 @@ class CamtParser(models.AbstractModel):
"%s (RltdPties/Nm)"
% _("Partner Name"): transaction.get("partner_name", ""),
"%s (RltdPties/Acct)"
% _("Partner Account Number"): transaction.get("partner_name", ""),
% _("Partner Account Number"): transaction.get("account_number", ""),
"%s (BookgDt)" % _("Transaction Date"): transaction.get("date", ""),
_("Reference"): transaction.get("ref", ""),
_("Communication"): transaction.get("name", ""),

4
account_statement_import_camt/test_files/golden-camt053-txdtls.pydata
View File

@@ -8,7 +8,7 @@
'amount': 2187.0,
'date': '2017-03-22',
'narration': 'Partner Name (RltdPties/Nm): Banque Cantonale Vaudoise\n'
'Partner Account Number (RltdPties/Acct): Banque Cantonale Vaudoise\n'
'Partner Account Number (RltdPties/Acct): CH2222000000123456789\n'
'Transaction Date (BookgDt): 2017-03-22\n'
'Reference: 302388292000011111111111111\n'
'Communication: \n'
@@ -27,7 +27,7 @@
'amount': 1296.0,
'date': '2017-03-22',
'narration': 'Partner Name (RltdPties/Nm): Banque Cantonale Vaudoise\n'
'Partner Account Number (RltdPties/Acct): Banque Cantonale Vaudoise\n'
'Partner Account Number (RltdPties/Acct): CH3333000000123456789\n'
'Transaction Date (BookgDt): 2017-03-22\n'
'Reference: 302388292000022222222222222\n'
'Communication: \n'

8
account_statement_import_camt/test_files/golden-camt053.pydata
View File

@@ -8,7 +8,7 @@
'amount': -754.25,
'date': '2014-01-05',
'narration': 'Partner Name (RltdPties/Nm): INSURANCE COMPANY TESTX\n'
'Partner Account Number (RltdPties/Acct): INSURANCE COMPANY TESTX\n'
'Partner Account Number (RltdPties/Acct): NL46ABNA0499998748\n'
'Transaction Date (BookgDt): 2014-01-05\n'
'Reference: 435005714488-ABNO33052620\n'
'Communication: \n'
@@ -26,7 +26,7 @@
'amount': -564.05,
'date': '2014-01-05',
'narration': 'Partner Name (RltdPties/Nm): Test Customer\n'
'Partner Account Number (RltdPties/Acct): Test Customer\n'
'Partner Account Number (RltdPties/Acct): NL46ABNA0499998748\n'
'Transaction Date (BookgDt): 2014-01-05\n'
'Reference: TESTBANK/NL/20141229/01206408\n'
'Communication: \n'
@@ -48,7 +48,7 @@
'amount': -100.0,
'date': '2014-01-05',
'narration': 'Partner Name (RltdPties/Nm): Test Customer\n'
'Partner Account Number (RltdPties/Acct): Test Customer\n'
'Partner Account Number (RltdPties/Acct): NL46ABNA0499998748\n'
'Transaction Date (BookgDt): 2014-01-05\n'
'Reference: TESTBANK/NL/20141229/01206407\n'
'Communication: \n'
@@ -70,7 +70,7 @@
'amount': 1405.31,
'date': '2014-01-05',
'narration': 'Partner Name (RltdPties/Nm): 3rd party Media\n'
'Partner Account Number (RltdPties/Acct): 3rd party Media\n'
'Partner Account Number (RltdPties/Acct): NL69ABNA0522123643\n'
'Transaction Date (BookgDt): 2014-01-05\n'
'Reference: 115\n'
'Communication: \n'

2
account_statement_import_camt/test_files/golden-camt054.pydata
View File

@@ -8,7 +8,7 @@
'amount': 5.0,
'date': '2022-01-26',
'narration': 'Partner Name (RltdPties/Nm): Test Customer\n'
'Partner Account Number (RltdPties/Acct): Test Customer\n'
'Partner Account Number (RltdPties/Acct): NL46ABNA0499998748\n'
'Transaction Date (BookgDt): 2022-01-26\n'
'Reference: 000000000000000000000000003\n'
'Communication: \n'