diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4904dc9..233cf6e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,6 @@
exclude: |
(?x)
# NOT INSTALLABLE ADDONS
- ^account_ebics_oca_statement_import/|
^account_ebics_payment_order/|
# END NOT INSTALLABLE ADDONS
# Files and folders generated by bots, to avoid loops
diff --git a/account_ebics/README.rst b/account_ebics/README.rst
index dafe4b1..ec60692 100644
--- a/account_ebics/README.rst
+++ b/account_ebics/README.rst
@@ -214,6 +214,5 @@ Known Issues / Roadmap
======================
- Add support to import externally generated keys & certificates (currently only 3SKey signature certificate).
-- For Odoo 16.0 the interaction with the OCA payment order and bank statement import modules (e.g. french CFONB) is not yet available.
- Electronic Distributed Signature (EDS) is not supported in the current version of this module.
diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py
index 9ce7239..9b32d3f 100644
--- a/account_ebics/__manifest__.py
+++ b/account_ebics/__manifest__.py
@@ -3,7 +3,7 @@
{
"name": "EBICS banking protocol",
- "version": "16.0.1.3.0",
+ "version": "16.0.1.3.1",
"license": "LGPL-3",
"author": "Noviat",
"website": "https://www.noviat.com",
diff --git a/account_ebics/models/ebics_file.py b/account_ebics/models/ebics_file.py
index 50752c1..63f4353 100644
--- a/account_ebics/models/ebics_file.py
+++ b/account_ebics/models/ebics_file.py
@@ -180,21 +180,7 @@ class EbicsFile(models.Model):
def _process_download_result(self, res):
statement_ids = res["statement_ids"]
notifications = res["notifications"]
- sts_data = []
- if statement_ids:
- self.env.flush_all()
- self.env.cr.execute(
- """
- SELECT abs.name, abs.date, abs.company_id, rc.name AS company_name
- FROM account_bank_statement abs
- JOIN res_company rc ON rc.id = abs.company_id
- WHERE abs.id in %s
- ORDER BY abs.date, rc.id
- """,
- (tuple(res["statement_ids"]),),
- )
- sts_data = self.env.cr.dictfetchall()
-
+ statements = self.env["account.bank.statement"].sudo().browse(statement_ids)
st_cnt = len(statement_ids)
warning_cnt = error_cnt = 0
if notifications:
@@ -224,11 +210,11 @@ class EbicsFile(models.Model):
sp=st_cnt == 1 and _(" has") or _("s have"),
)
self.note_process += "\n"
- for st_data in sts_data:
+ for statement in statements:
self.note_process += ("\n%s, %s (%s)") % (
- st_data["date"],
- st_data["name"],
- st_data["company_name"],
+ statement.date,
+ statement.name,
+ statement.company_id.name,
)
if statement_ids:
self.sudo().bank_statement_ids = [(4, x) for x in statement_ids]
@@ -376,7 +362,7 @@ class EbicsFile(models.Model):
EBICS data file and its related bank statements.
"""
- def _process_camt053(self): # noqa C901
+ def _process_camt053(self):
"""
The Odoo standard statement import is based on manual selection
of a financial journal before importing the electronic statement file.
@@ -385,8 +371,6 @@ class EbicsFile(models.Model):
Hence we need to split the CAMT file into
single statement CAMT files before we can call the logic
implemented by the Odoo OE or Community CAMT parsers.
-
- TODO: refactor method to enable removal of noqa C901
"""
modules = [
("oca", "account_statement_import_camt"),
@@ -408,220 +392,87 @@ class EbicsFile(models.Model):
)
)
res = {"statement_ids": [], "notifications": []}
- try:
- with self.env.cr.savepoint():
- transactions = False
- msg_hdr = _("{} : Import failed for file %(fn)s:\n", fn=self.name)
- file_data = base64.b64decode(self.data)
- root = etree.fromstring(file_data, parser=etree.XMLParser(recover=True))
- if root is None:
- message = msg_hdr.format(_("Error"))
- message += _("Invalid XML file.")
- res["notifications"].append({"type": "error", "message": message})
- ns = {k or "ns": v for k, v in root.nsmap.items()}
- for i, stmt in enumerate(root[0].findall("ns:Stmt", ns), start=1):
- msg_hdr = _(
- "{} : Import failed for statement number %(index)s, filename %(fn)s:\n",
- index=i,
- fn=self.name,
- )
- acc_number = sanitize_account_number(
- stmt.xpath(
- "ns:Acct/ns:Id/ns:IBAN/text() | ns:Acct/ns:Id/ns:Othr/ns:Id/text()",
- namespaces=ns,
- )[0]
- )
- if not acc_number:
- message = msg_hdr.format(_("Error"))
- message += _("No bank account number found.")
- res["notifications"].append(
- {"type": "error", "message": message}
- )
- continue
- currency_code = stmt.xpath(
- "ns:Acct/ns:Ccy/text() | ns:Bal/ns:Amt/@Ccy", namespaces=ns
- )[0]
- currency = self.env["res.currency"].search(
- [("name", "=ilike", currency_code)], limit=1
- )
- if not currency:
- message = msg_hdr.format(_("Error"))
- message += _("Currency %(cc)s not found.", cc=currency_code)
- res["notifications"].append(
- {"type": "error", "message": message}
- )
- continue
- journal = self.env["account.journal"].search(
- [
- ("type", "=", "bank"),
- (
- "bank_account_id.sanitized_acc_number",
- "ilike",
- acc_number,
- ),
- ]
- )
- 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_id or journal.company_id.currency_id
- )
- if journal_currency != currency:
- 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
-
- root_new = deepcopy(root)
- entries = False
- for j, el in enumerate(root_new[0].findall("ns:Stmt", ns), start=1):
- if j != i:
- el.getparent().remove(el)
- else:
- entries = el.findall("ns:Ntry", ns)
- if not entries:
- continue
-
- transactions = True
- data = base64.b64encode(etree.tostring(root_new))
-
- if author == "oca":
- # TODO: implement _process_camt053_oca() once OCA camt is
- # released for 16.0
- raise NotImplementedError
- else:
- self.env.company = journal.company_id
- attachment = self.env["ir.attachment"].create(
- {"name": self.name, "datas": data, "store_fname": self.name}
- )
- act = journal._import_bank_statement(attachment)
- for entry in act["domain"]:
- if (
- isinstance(entry, tuple)
- and entry[0] == "statement_id"
- and entry[1] == "in"
- ):
- res["statement_ids"].extend(entry[2])
- break
- notifications = act["context"]["notifications"]
- if 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:
- message = msg_hdr.format(_("Error"))
- message += "".join(e.args)
- res["notifications"].append({"type": "error", "message": message})
- except Exception:
- tb = "".join(format_exception(*exc_info()))
- message = msg_hdr.format(_("Error"))
- message += tb
- res["notifications"].append({"type": "error", "message": message})
-
+ st_datas = self._split_camt(res)
if author == "oca":
- # TODO: implement _process_camt053_oca() once OCA camt is
- # released for 16.0
- return self._process_camt053_oca()
+ self._process_camt053_oca(res, st_datas)
else:
- return self._process_download_result(res)
+ self._process_camt053_oe(res, st_datas)
+ return self._process_download_result(res)
- def _process_camt053_oca(self):
- """
- Disable this code while waiting on OCA CAMT parser for 16.0
- """
- # pylint: disable=W0101
- raise NotImplementedError
+ def _process_camt053_oca(self, res, st_datas):
+ msg_hdr = _("{} : Import failed for file %(fn)s:\n", fn=self.name)
+ for st_data in st_datas:
+ try:
+ with self.env.cr.savepoint():
+ self._create_statement_camt053_oca(res, st_data)
+ except UserError as e:
+ message = msg_hdr.format(_("Error"))
+ message += "".join(e.args)
+ res["notifications"].append({"type": "error", "message": message})
+ except Exception:
+ tb = "".join(format_exception(*exc_info()))
+ message = msg_hdr.format(_("Error"))
+ message += tb
+ res["notifications"].append({"type": "error", "message": message})
- wiz_model = "account.statement.import"
- wiz_vals = {
- "statement_filename": self.name,
- "statement_file": self.data,
- }
- result_action = self.env["ir.actions.act_window"]._for_xml_id(
- "account.action_bank_statement_tree"
- )
- result_action["context"] = safe_eval(result_action["context"])
- result = {
- "statement_ids": [],
- "notifications": [],
- }
- statement_ids = []
- notifications = []
+ def _create_statement_camt053_oca(self, res, st_data):
wiz = (
- self.env[wiz_model].with_context(active_model="ebics.file").create(wiz_vals)
+ self.env["account.statement.import"]
+ .with_company(st_data["company_id"])
+ .with_context(active_model="ebics.file")
+ .create({"statement_filename": self.name})
)
- msg_hdr = _(
- "{} : Import failed for EBICS File %(fn)s:\n",
- fn=wiz.statement_filename,
+ wiz.import_single_file(base64.b64decode(st_data["data"]), res)
+
+ def _process_camt053_oe(self, res, st_datas):
+ """
+ We execute a cr.commit() after every statement import since we get a
+ 'savepoint does not exist' error when using 'with self.env.cr.savepoint()'.
+ """
+ msg_hdr = _("{} : Import failed for file %(fn)s:\n", fn=self.name)
+ for st_data in st_datas:
+ try:
+ self._create_statement_camt053_oe(res, st_data)
+ self.env.cr.commit() # pylint: disable=E8102
+ except UserError as e:
+ message = msg_hdr.format(_("Error"))
+ message += "".join(e.args)
+ res["notifications"].append({"type": "error", "message": message})
+ except Exception:
+ tb = "".join(format_exception(*exc_info()))
+ message = msg_hdr.format(_("Error"))
+ message += tb
+ res["notifications"].append({"type": "error", "message": message})
+
+ def _create_statement_camt053_oe(self, res, st_data):
+ attachment = (
+ self.env["ir.attachment"]
+ .with_company(st_data["company_id"])
+ .create(
+ {
+ "name": self.name,
+ "datas": st_data["data"],
+ "store_fname": self.name,
+ }
+ )
)
- try:
- with self.env.cr.savepoint():
- file_data = base64.b64decode(self.data)
- wiz.import_single_file(file_data, result)
-
- if not result["statement_ids"]:
- message = msg_hdr.format(_("Warning"))
- message += _(
- "You have already imported this file, or this file "
- "only contains already imported transactions."
- )
- notifications += [
- {
- "type": "warning",
- "message": message,
- }
- ]
- else:
- statement_ids.extend(result["statement_ids"])
- notifications.extend(result["notifications"])
-
- except UserError as e:
- message = msg_hdr.format(_("Error"))
- message += "".join(e.args)
- notifications += [
- {
- "type": "error",
- "message": message,
- }
- ]
-
- except Exception:
- tb = "".join(format_exception(*exc_info()))
- message = msg_hdr.format(_("Error"))
- message += tb
- notifications += [
- {
- "type": "error",
- "message": message,
- }
- ]
-
- result_action["context"]["notifications"] = notifications
- result_action["domain"] = [("id", "in", statement_ids)]
- return self._process_result_action(result_action)
+ journal = (
+ self.env["account.journal"]
+ .with_company(st_data["company_id"])
+ .browse(st_data["journal_id"])
+ )
+ act = journal._import_bank_statement(attachment)
+ for entry in act["domain"]:
+ if (
+ isinstance(entry, tuple)
+ and entry[0] == "statement_id"
+ and entry[1] == "in"
+ ):
+ res["statement_ids"].extend(entry[2])
+ break
+ notifications = act["context"]["notifications"]
+ if notifications:
+ res["notifications"].append(act["context"]["notifications"])
def _unlink_camt053(self):
"""
@@ -629,6 +480,102 @@ class EbicsFile(models.Model):
EBICS data file and its related bank statements.
"""
+ def _split_camt(self, res):
+ """
+ Split CAMT file received via EBICS per statement.
+ Statements without transactions are removed.
+ """
+ datas = []
+ msg_hdr = _("{} : Import failed for file %(fn)s:\n", fn=self.name)
+ file_data = base64.b64decode(self.data)
+ root = etree.fromstring(file_data, parser=etree.XMLParser(recover=True))
+ if root is None:
+ message = msg_hdr.format(_("Error"))
+ message += _("Invalid XML file.")
+ res["notifications"].append({"type": "error", "message": message})
+ ns = {k or "ns": v for k, v in root.nsmap.items()}
+ for i, stmt in enumerate(root[0].findall("ns:Stmt", ns), start=1):
+ msg_hdr = _(
+ "{} : Import failed for statement number %(index)s, filename %(fn)s:\n",
+ index=i,
+ fn=self.name,
+ )
+ acc_number = sanitize_account_number(
+ stmt.xpath(
+ "ns:Acct/ns:Id/ns:IBAN/text() | ns:Acct/ns:Id/ns:Othr/ns:Id/text()",
+ namespaces=ns,
+ )[0]
+ )
+ if not acc_number:
+ message = msg_hdr.format(_("Error"))
+ message += _("No bank account number found.")
+ res["notifications"].append({"type": "error", "message": message})
+ continue
+ currency_code = stmt.xpath(
+ "ns:Acct/ns:Ccy/text() | ns:Bal/ns:Amt/@Ccy", namespaces=ns
+ )[0]
+ currency = self.env["res.currency"].search(
+ [("name", "=ilike", currency_code)], limit=1
+ )
+ if not currency:
+ message = msg_hdr.format(_("Error"))
+ message += _("Currency %(cc)s not found.", cc=currency_code)
+ res["notifications"].append({"type": "error", "message": message})
+ continue
+ journal = self.env["account.journal"].search(
+ [
+ ("type", "=", "bank"),
+ (
+ "bank_account_id.sanitized_acc_number",
+ "ilike",
+ acc_number,
+ ),
+ ]
+ )
+ 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_id or journal.company_id.currency_id
+ if journal_currency != currency:
+ 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
+
+ root_new = deepcopy(root)
+ entries = False
+ for j, el in enumerate(root_new[0].findall("ns:Stmt", ns), start=1):
+ if j != i:
+ el.getparent().remove(el)
+ else:
+ entries = el.findall("ns:Ntry", ns)
+ if not entries:
+ continue
+
+ datas.append(
+ {
+ "acc_number": acc_number,
+ "journal_id": journal.id,
+ "company_id": journal.company_id.id,
+ "data": base64.b64encode(etree.tostring(root_new)),
+ }
+ )
+
+ return datas
+
def _process_pain002(self):
"""
Placeholder for processing pain.002 files.
diff --git a/account_ebics/static/description/index.html b/account_ebics/static/description/index.html
index 9ed5115..b6b1ad1 100644
--- a/account_ebics/static/description/index.html
+++ b/account_ebics/static/description/index.html
@@ -563,7 +563,6 @@ You can also find this information in the doc folder of this module (file EBICS_
Known Issues / Roadmap
- Add support to import externally generated keys & certificates (currently only 3SKey signature certificate).
-- For Odoo 16.0 the interaction with the OCA payment order and bank statement import modules (e.g. french CFONB) is not yet available.
- Electronic Distributed Signature (EDS) is not supported in the current version of this module.
diff --git a/account_ebics_batch/models/ebics_batch_log.py b/account_ebics_batch/models/ebics_batch_log.py
index 82a6970..2de7cda 100644
--- a/account_ebics_batch/models/ebics_batch_log.py
+++ b/account_ebics_batch/models/ebics_batch_log.py
@@ -126,8 +126,7 @@ class EbicsBatchLog(models.Model):
import_dict["errors"].append(err_msg + tb)
log.file_ids = [(6, 0, ebics_file_ids)]
try:
- with self.env.cr.savepoint():
- log._ebics_process(import_dict)
+ log._ebics_process(import_dict)
except UserError as e:
import_dict["errors"].append(err_msg + " ".join(e.args))
except Exception:
diff --git a/account_ebics_oca_statement_import/README.rst b/account_ebics_oca_statement_import/README.rst
index 4fe75a6..ad87eca 100644
--- a/account_ebics_oca_statement_import/README.rst
+++ b/account_ebics_oca_statement_import/README.rst
@@ -6,12 +6,12 @@
Deploy account_ebics module with OCA Bank Statement Import
==========================================================
-This module makes it possible to use OCA account_statement_import
+This module makes it possible to use the OCA account_statement_import wizard
in combination with 'account_ebics'.
This module will be installed automatically when following modules are activated
on your odoo database :
- account_ebics
-- account_statement_import
+- account_statement_import_file
diff --git a/account_ebics_oca_statement_import/__manifest__.py b/account_ebics_oca_statement_import/__manifest__.py
index e882810..ea0ed89 100644
--- a/account_ebics_oca_statement_import/__manifest__.py
+++ b/account_ebics_oca_statement_import/__manifest__.py
@@ -11,11 +11,9 @@
"license": "LGPL-3",
"depends": [
"account_ebics",
- "account_statement_import",
+ "account_statement_import_file",
],
- # installable False unit OCA statement import becomes
- # available for 16.0
- "installable": False,
+ "installable": True,
"auto_install": True,
"images": ["static/description/cover.png"],
}
diff --git a/account_ebics_oca_statement_import/wizards/account_statement_import.py b/account_ebics_oca_statement_import/wizards/account_statement_import.py
index 83f1340..f4eb9e5 100644
--- a/account_ebics_oca_statement_import/wizards/account_statement_import.py
+++ b/account_ebics_oca_statement_import/wizards/account_statement_import.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2020 Noviat.
+# Copyright 2009-2023 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
import logging
diff --git a/setup/account_ebics_oca_statement_import/odoo/addons/account_ebics_oca_statement_import b/setup/account_ebics_oca_statement_import/odoo/addons/account_ebics_oca_statement_import
new file mode 120000
index 0000000..766f43e
--- /dev/null
+++ b/setup/account_ebics_oca_statement_import/odoo/addons/account_ebics_oca_statement_import
@@ -0,0 +1 @@
+../../../../account_ebics_oca_statement_import
\ No newline at end of file
diff --git a/setup/account_ebics_oca_statement_import/setup.py b/setup/account_ebics_oca_statement_import/setup.py
new file mode 100644
index 0000000..28c57bb
--- /dev/null
+++ b/setup/account_ebics_oca_statement_import/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+ setup_requires=['setuptools-odoo'],
+ odoo_addon=True,
+)