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 #437 into 13.0

Browse Source 
Signed-off-by dreispt
This commit is contained in:
OCA-git-bot
2022-02-06 18:13:26 +00:00
parent c648e7fb3a d5c3177840
commit e8d313bb8d
3 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
account_bank_statement_import_camt_oca/models/parser.py
View File

@@ -8,7 +8,7 @@ import pytz
from dateutil.parser import isoparse
from lxml import etree
from odoo import fields, models
from odoo import _, fields, models
class CamtParser(models.AbstractModel):
@@ -70,7 +70,7 @@ class CamtParser(models.AbstractModel):
)
# name
self.add_value_from_node(
ns, node, ["./ns:AddtlTxInf"], transaction, "note", join_str="\n"
ns, node, ["./ns:AddtlTxInf"], transaction, "AddtlTxInf", join_str="\n"
)
# eref
self.add_value_from_node(
@@ -222,6 +222,8 @@ class CamtParser(models.AbstractModel):
transactions = []
for entry_node in entry_nodes:
transactions.extend(self.parse_entry(ns, entry_node))
for transaction in transactions:
self._add_line_note(transaction)
result["transactions"] = transactions
result["date"] = None
if transactions:
@@ -230,6 +232,26 @@ class CamtParser(models.AbstractModel):
)[0]["date"]
return result
def _add_line_note(self, transaction):
transaction["note"] = _(
"Partner Name: %s"
"\nPartner Account Number: %s"
"\nTransaction Date: %s"
"\nReference: %s"
"\nCommunication: %s"
) % (
transaction.get("partner_name", "").strip(),
transaction.get("account_number", ""),
transaction.get("date", ""),
transaction.get("ref", "").strip(),
transaction.get("name", "").strip(),
)
AddtlTxInf = transaction.pop("AddtlTxInf", None)
if AddtlTxInf:
transaction["note"] += (
_("\nAdditional Transaction Information: %s") % AddtlTxInf.strip()
)
def check_version(self, ns, root):
"""Validate validity of camt file."""
# Check whether it is camt at all:

10
account_bank_statement_import_camt_oca/test_files/golden-camt053-txdtls.pydata
View File

@@ -8,11 +8,21 @@
'amount': 2187.0,
'date': '2017-03-22',
'name': 'CRÉDIT GROUPÉ BVR TRAITEMENT DU 22.03.2017 NUMÉRO CLIENT 01-70884-3 PAQUET ID: 123456CHCAFEBABE',
'note': 'Partner Name: Banque Cantonale Vaudoise\n'
'Partner Account Number: CH2222000000123456789\n'
'Transaction Date: 2017-03-22\n'
'Reference: 302388292000011111111111111\n'
'Communication: CRÉDIT GROUPÉ BVR TRAITEMENT DU 22.03.2017 NUMÉRO CLIENT 01-70884-3 PAQUET ID: 123456CHCAFEBABE',
'partner_name': 'Banque Cantonale Vaudoise',
'ref': '302388292000011111111111111'},
{'account_number': 'CH3333000000123456789',
'amount': 1296.0,
'date': '2017-03-22',
'name': 'CRÉDIT GROUPÉ BVR TRAITEMENT DU 22.03.2017 NUMÉRO CLIENT 01-70884-3 PAQUET ID: 123456CHCAFEBABE',
'note': 'Partner Name: Banque Cantonale Vaudoise\n'
'Partner Account Number: CH3333000000123456789\n'
'Transaction Date: 2017-03-22\n'
'Reference: 302388292000022222222222222\n'
'Communication: CRÉDIT GROUPÉ BVR TRAITEMENT DU 22.03.2017 NUMÉRO CLIENT 01-70884-3 PAQUET ID: 123456CHCAFEBABE',
'partner_name': 'Banque Cantonale Vaudoise',
'ref': '302388292000022222222222222'}]}])

28
account_bank_statement_import_camt_oca/test_files/golden-camt053.pydata
View File

@@ -8,27 +8,47 @@
'amount': -754.25,
'date': '2014-01-05',
'name': 'Insurance policy 857239PERIOD 01.01.2014 - 31.12.2014',
'note': 'MKB Insurance 859239PERIOD 01.01.2014 - 31.12.2014',
'note': 'Partner Name: INSURANCE COMPANY TESTX\n'
'Partner Account Number: NL46ABNA0499998748\n'
'Transaction Date: 2014-01-05\n'
'Reference: 435005714488-ABNO33052620\n'
'Communication: Insurance policy 857239PERIOD 01.01.2014 - 31.12.2014\n'
'Additional Transaction Information: MKB Insurance 859239PERIOD 01.01.2014 - 31.12.2014',
'partner_name': 'INSURANCE COMPANY TESTX',
'ref': '435005714488-ABNO33052620'},
{'account_number': 'NL46ABNA0499998748',
'amount': -564.05,
'date': '2014-01-05',
'name': 'Direct Debit S14 0410',
'note': 'Direct debit S14 0410 AC07 Rek.nummer blokkade TESTBANK/NL/20141229/01206408',
'note': 'Partner Name: Test Customer\n'
'Partner Account Number: NL46ABNA0499998748\n'
'Transaction Date: 2014-01-05\n'
'Reference: TESTBANK/NL/20141229/01206408\n'
'Communication: Direct Debit S14 0410\n'
'Additional Transaction Information: Direct debit S14 0410 AC07 Rek.nummer blokkade TESTBANK/NL/20141229/01206408',
'partner_name': 'Test Customer',
'ref': 'TESTBANK/NL/20141229/01206408'},
{'account_number': 'NL46ABNA0499998748',
'amount': -100.0,
'date': '2014-01-05',
'name': 'Direct Debit S14 0410',
'note': 'Direct debit S14 0410 AC07 Rek.nummer blokkade TESTBANK/NL/20141229/01206408',
'note': 'Partner Name: Test Customer\n'
'Partner Account Number: NL46ABNA0499998748\n'
'Transaction Date: 2014-01-05\n'
'Reference: TESTBANK/NL/20141229/01206407\n'
'Communication: Direct Debit S14 0410\n'
'Additional Transaction Information: Direct debit S14 0410 AC07 Rek.nummer blokkade TESTBANK/NL/20141229/01206408',
'partner_name': 'Test Customer',
'ref': 'TESTBANK/NL/20141229/01206407'},
{'account_number': 'NL69ABNA0522123643',
'amount': 1405.31,
'date': '2014-01-05',
'name': 'INNDNL2U20140105000217200000708',
'note': '#RD PARTY MEDIA CUSNO 90782 4210773',
'note': 'Partner Name: 3rd party Media\n'
'Partner Account Number: NL69ABNA0522123643\n'
'Transaction Date: 2014-01-05\n'
'Reference: 115\n'
'Communication: INNDNL2U20140105000217200000708\n'
'Additional Transaction Information: #RD PARTY MEDIA CUSNO 90782 4210773',
'partner_name': '3rd party Media',
'ref': '115'}]}])