Mirror/odoo_account_ebics
2
0
Fork 0
mirror of https://github.com/brain-tec/account_ebics.git synced 2024-11-23 20:52:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #69 from Noviat/16-fix-multi-bank-account-camt

Browse Source 
[16.0]account_ebics - fix for multi-statement/multi-bank-acccount cam…
This commit is contained in:
Luc De Meyer 2023-02-24 00:23:29 +01:00 committed by GitHub
commit 9c6c4e4d58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
account_ebics/models/ebics_file.py
View File

@ -209,12 +209,12 @@ class EbicsFile(models.Model):
self.note_process += "\n" self.note_process += "\n"
if error_cnt: if error_cnt:
self.note_process += ( self.note_process += (
_("Number of errors detected during import: %s: ") % error_cnt _("Number of errors detected during import: %s") % error_cnt
) )
self.note_process += "\n" self.note_process += "\n"
if warning_cnt: if warning_cnt:
self.note_process += ( self.note_process += (
_("Number of watnings detected during import: %s: ") % warning_cnt _("Number of warnings detected during import: %s") % warning_cnt
) )
if st_cnt: if st_cnt:
self.note_process += "\n\n" self.note_process += "\n\n"
@ -410,6 +410,7 @@ class EbicsFile(models.Model):
res = {"statement_ids": [], "notifications": []} res = {"statement_ids": [], "notifications": []}
try: try:
with self.env.cr.savepoint(): with self.env.cr.savepoint():
transactions = False
msg_hdr = _("{} : Import failed for file %(fn)s:\n", fn=self.name) msg_hdr = _("{} : Import failed for file %(fn)s:\n", fn=self.name)
file_data = base64.b64decode(self.data) file_data = base64.b64decode(self.data)
root = etree.fromstring(file_data, parser=etree.XMLParser(recover=True)) root = etree.fromstring(file_data, parser=etree.XMLParser(recover=True))
@ -460,6 +461,19 @@ class EbicsFile(models.Model):
), ),
] ]
) )
if not journal:
message = msg_hdr.format(_("Error"))
message += _(
"No financial journal found for Account Number %(nbr)s, "
"Currency %(cc)s",
nbr=acc_number,
cc=currency_code,
)
res["notifications"].append(
{"type": "error", "message": message}
)
continue
journal_currency = ( journal_currency = (
journal.currency_id or journal.company_id.currency_id journal.currency_id or journal.company_id.currency_id
) )
@ -477,9 +491,16 @@ class EbicsFile(models.Model):
continue continue
root_new = deepcopy(root) root_new = deepcopy(root)
entries = False
for j, el in enumerate(root_new[0].findall("ns:Stmt", ns), start=1): for j, el in enumerate(root_new[0].findall("ns:Stmt", ns), start=1):
if j != i: if j != i:
el.getparent.remove(el) el.getparent().remove(el)
else:
entries = el.findall("ns:Ntry", ns)
if not entries:
continue
transactions = True
data = base64.b64encode(etree.tostring(root_new)) data = base64.b64encode(etree.tostring(root_new))
if author == "oca": if author == "oca":
@ -504,6 +525,12 @@ class EbicsFile(models.Model):
if notifications: if notifications:
res["notifications"].append(act["context"]["notifications"]) res["notifications"].append(act["context"]["notifications"])
if not transactions:
message = _(
"Warning:\nNo transactions found in file %(fn)s.", fn=self.name
)
res["notifications"].append({"type": "warning", "message": message})
except UserError as e: except UserError as e:
message = msg_hdr.format(_("Error")) message = msg_hdr.format(_("Error"))
message += "".join(e.args) message += "".join(e.args)