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 branch '16-fix-split-cfonb120' into '16.0'

Browse Source 
[FIX]account_ebics - fix split cfonb120 files

See merge request Noviat/Noviat_Generic/accounting-ebics!62
This commit is contained in:
Luc De Meyer 2024-07-15 20:57:21 +00:00
commit 25f95bdae7
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
account_ebics/__manifest__.py
View File

@ -3,7 +3,7 @@
{ {
"name": "EBICS banking protocol", "name": "EBICS banking protocol",
"version": "16.0.1.10.1", "version": "16.0.1.10.2",
"license": "LGPL-3", "license": "LGPL-3",
"author": "Noviat", "author": "Noviat",
"website": "https://www.noviat.com/", "website": "https://www.noviat.com/",

21
account_ebics/models/ebics_file.py
View File

@ -1,4 +1,4 @@
# Copyright 2009-2023 Noviat. # Copyright 2009-2024 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lgpl). # License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
import base64 import base64
@ -240,7 +240,7 @@ class EbicsFile(models.Model):
if statements: if statements:
statements.write({"import_format": file_format}) statements.write({"import_format": file_format})
statements = self._statement_duplicate_check(res, statements) statements = self._statement_duplicate_check(res, statements)
else: elif not notifications:
notifications.append( notifications.append(
{ {
"type": "warning", "type": "warning",
@ -347,7 +347,8 @@ class EbicsFile(models.Model):
self._check_import_module(import_module) self._check_import_module(import_module)
res = {"statement_ids": [], "notifications": []} res = {"statement_ids": [], "notifications": []}
st_datas = self._split_cfonb(res) st_datas = self._split_cfonb(res)
self._process_bank_statement_oca(res, st_datas) if st_datas:
self._process_bank_statement_oca(res, st_datas)
return self._process_download_result(res, file_format="cfonb120") return self._process_download_result(res, file_format="cfonb120")
def _unlink_cfonb120(self): def _unlink_cfonb120(self):
@ -363,7 +364,19 @@ class EbicsFile(models.Model):
""" """
datas = [] datas = []
file_data = base64.b64decode(self.data) file_data = base64.b64decode(self.data)
lines = file_data.split(b"\n") file_data.replace(b"\n", b"").replace(b"\r", b"")
if len(file_data) % 120:
message = _(
"Incorrect CFONB120 file:\n"
"the file is not divisible in 120 char lines"
)
res["notifications"].append({"type": "error", "message": message})
return datas
lines = []
for i in range(0, len(file_data), 120):
lines.append(file_data[i : i + 120])
st_lines = b"" st_lines = b""
transactions = False transactions = False
for line in lines: for line in lines: