From de5c03c77ff0ea2be02ccb81e620fa426142b913 Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
Date: Fri, 5 Aug 2022 12:29:47 +0200
Subject: [PATCH] [14.0]account_ebics - fix stack trace when using Odoo OE
 statement import

---
 account_ebics/__manifest__.py      |  2 +-
 account_ebics/models/ebics_file.py | 85 ++++++++++++++++++------------
 2 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py
index 2f0ad2f..bdff11c 100644
--- a/account_ebics/__manifest__.py
+++ b/account_ebics/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "EBICS banking protocol",
-    "version": "14.0.1.0.3",
+    "version": "14.0.1.0.4",
     "license": "LGPL-3",
     "author": "Noviat",
     "website": "www.noviat.com",
diff --git a/account_ebics/models/ebics_file.py b/account_ebics/models/ebics_file.py
index 43baece..73e1283 100644
--- a/account_ebics/models/ebics_file.py
+++ b/account_ebics/models/ebics_file.py
@@ -168,44 +168,59 @@ class EbicsFile(models.Model):
             return False
         return True
 
-    def _process_result_action(self, res):
+    def _process_result_action(self, res, parser="oca"):
         notifications = []
         st_line_ids = []
         statement_ids = []
-        if res.get("context"):
-            notifications = res["context"].get("notifications", [])
-            st_line_ids = res["context"].get("statement_line_ids", [])
-        if notifications:
-            for notif in notifications:
-                parts = []
-                for k in ["type", "message", "details"]:
-                    if notif.get(k):
-                        msg = "{}: {}".format(k, notif[k])
-                        parts.append(msg)
-                self.note_process += "\n".join(parts)
+        sts_data = []
+        if parser == "oca":
+            if res.get("context"):
+                notifications = res["context"].get("notifications", [])
+                st_line_ids = res["context"].get("statement_line_ids", [])
+            if notifications:
+                for notif in notifications:
+                    parts = []
+                    for k in ["type", "message", "details"]:
+                        if notif.get(k):
+                            msg = "{}: {}".format(k, notif[k])
+                            parts.append(msg)
+                    self.note_process += "\n".join(parts)
+                    self.note_process += "\n"
                 self.note_process += "\n"
-            self.note_process += "\n"
-        if st_line_ids:
-            self.flush()
-            self.env.cr.execute(
-                """
-    SELECT DISTINCT
-        absl.statement_id,
-        abs.name, abs.date, abs.company_id,
-        rc.name AS company_name
-      FROM account_bank_statement_line absl
-      INNER JOIN account_bank_statement abs
-        ON abs.id = absl.statement_id
-      INNER JOIN res_company rc
-        ON rc.id = abs.company_id
-      WHERE absl.id IN %s
-      ORDER BY date, company_id
-                """,
-                (tuple(st_line_ids),),
-            )
-            sts_data = self.env.cr.dictfetchall()
-        else:
-            sts_data = []
+            if st_line_ids:
+                self.flush()
+                self.env.cr.execute(
+                    """
+                SELECT DISTINCT
+                    absl.statement_id,
+                    abs.name, abs.date, abs.company_id,
+                    rc.name AS company_name
+                  FROM account_bank_statement_line absl
+                  INNER JOIN account_bank_statement abs
+                    ON abs.id = absl.statement_id
+                  INNER JOIN res_company rc
+                    ON rc.id = abs.company_id
+                  WHERE absl.id IN %s
+                  ORDER BY date, company_id
+                    """,
+                    (tuple(st_line_ids),),
+                )
+                sts_data = self.env.cr.dictfetchall()
+        elif parser == "oe":
+            if res.get("res_id"):
+                st_ids = res["res_id"]
+            else:
+                st_ids = res["domain"][2]
+            statements = self.env["account.bank.statement"].browse(st_ids)
+            for statement in statements:
+                sts_data.append(
+                    {
+                        "statement_id": statement.id,
+                        "date": statement.date,
+                        "name": statement.name,
+                        "company_name": statement.company_id.name,
+                    }
+                )
         st_cnt = len(sts_data)
         if st_cnt:
             self.note_process += _("%s bank statements have been imported: ") % st_cnt
@@ -414,7 +429,7 @@ class EbicsFile(models.Model):
                     _("No financial journal found for Company Bank Account %s")
                     % bank_account
                 )
-        return self._process_result_action(res)
+        return self._process_result_action(res, parser="oe")
 
     @staticmethod
     def _unlink_camt053(self):