From cb6f06a9b320b6aafffc7265813d976d062b9299 Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
Date: Fri, 8 Mar 2019 15:40:45 +0100
Subject: [PATCH] improved support empty statements and oca camt parser

---
 account_ebics/__manifest__.py                 |  4 +-
 account_ebics/models/ebics_config.py          |  4 +-
 account_ebics/models/ebics_file.py            |  9 +--
 .../models/fintech_ebics_register.py          |  4 +-
 account_ebics/views/ebics_file.xml            |  1 +
 account_ebics/wizard/__init__.py              |  1 +
 .../wizard/account_bank_statement_import.py   | 62 +++++++++++++++++++
 .../wizard/ebics_change_passphrase.py         |  2 +-
 account_ebics/wizard/ebics_xfer.py            |  8 +--
 9 files changed, 80 insertions(+), 15 deletions(-)
 create mode 100644 account_ebics/wizard/account_bank_statement_import.py

diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py
index eacfa80..063d9ac 100644
--- a/account_ebics/__manifest__.py
+++ b/account_ebics/__manifest__.py
@@ -1,9 +1,9 @@
-# Copyright 2009-2018 Noviat.
+# Copyright 2009-2019 Noviat.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     'name': 'EBICS banking protocol',
-    'version': '11.0.1.5.0',
+    'version': '11.0.1.6.0',
     'license': 'AGPL-3',
     'author': 'Noviat',
     'category': 'Accounting & Finance',
diff --git a/account_ebics/models/ebics_config.py b/account_ebics/models/ebics_config.py
index e515826..aef2570 100644
--- a/account_ebics/models/ebics_config.py
+++ b/account_ebics/models/ebics_config.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2018 Noviat.
+# Copyright 2009-2019 Noviat.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 """
@@ -288,7 +288,7 @@ class EbicsConfig(models.Model):
             user = EbicsUser(
                 keyring=keyring, partnerid=self.ebics_partner,
                 userid=self.ebics_user)
-        except:
+        except Exception:
             exctype, value = exc_info()[:2]
             error = _("EBICS Initialisation Error:")
             error += '\n' + str(exctype) + '\n' + str(value)
diff --git a/account_ebics/models/ebics_file.py b/account_ebics/models/ebics_file.py
index bc96f33..a2db783 100644
--- a/account_ebics/models/ebics_file.py
+++ b/account_ebics/models/ebics_file.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2018 Noviat.
+# Copyright 2009-2019 Noviat.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 import logging
@@ -136,7 +136,7 @@ class EbicsFile(models.Model):
 
     def _check_import_module(self, module):
         mod = self.env['ir.module.module'].search(
-            [('name', '=', module),
+            [('name', '=like', module),
              ('state', '=', 'installed')])
         if not mod:
             raise UserError(_(
@@ -207,14 +207,15 @@ class EbicsFile(models.Model):
 
     @staticmethod
     def _process_camt053(self):
-        import_module = 'account_bank_statement_import_camt'
+        import_module = 'account_bank_statement_import_camt%'
         self._check_import_module(import_module)
         wiz_model = 'account.bank.statement.import'
         wiz_vals = {
             'data_file': self.data,
             'filename': self.name,
         }
-        wiz = self.env[wiz_model].create(wiz_vals)
+        ctx = dict(self.env.context, active_model='ebics.file')
+        wiz = self.env[wiz_model].with_context(ctx).create(wiz_vals)
         res = wiz.import_file()
         if res.get('res_model') \
                 == 'account.bank.statement.import.journal.creation':
diff --git a/account_ebics/models/fintech_ebics_register.py b/account_ebics/models/fintech_ebics_register.py
index 8e63884..c2c2dc6 100644
--- a/account_ebics/models/fintech_ebics_register.py
+++ b/account_ebics/models/fintech_ebics_register.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2018 Noviat.
+# Copyright 2009-2019 Noviat.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 import logging
@@ -32,7 +32,7 @@ except RuntimeError as e:
     else:
         _logger.error(e.message)
         fintech.register()
-except:
+except Exception:
     msg = "fintech.register error"
     tb = ''.join(format_exception(*exc_info()))
     msg += '\n%s' % tb
diff --git a/account_ebics/views/ebics_file.xml b/account_ebics/views/ebics_file.xml
index 9888f9a..5cb8f4f 100644
--- a/account_ebics/views/ebics_file.xml
+++ b/account_ebics/views/ebics_file.xml
@@ -64,6 +64,7 @@
                   type="object"
                   groups="account.group_account_manager"
                   help="Process the EBICS File"/>
+          <button name="set_to_done" states="draft" string="Set to Done" type="object" groups="account.group_account_manager"/>
           <field name="state" widget="statusbar"/>
         </header>
         <group colspan="4" col="4">
diff --git a/account_ebics/wizard/__init__.py b/account_ebics/wizard/__init__.py
index b66b034..944b9c8 100644
--- a/account_ebics/wizard/__init__.py
+++ b/account_ebics/wizard/__init__.py
@@ -1,2 +1,3 @@
+from . import account_bank_statement_import
 from . import ebics_change_passphrase
 from . import ebics_xfer
diff --git a/account_ebics/wizard/account_bank_statement_import.py b/account_ebics/wizard/account_bank_statement_import.py
new file mode 100644
index 0000000..22aae30
--- /dev/null
+++ b/account_ebics/wizard/account_bank_statement_import.py
@@ -0,0 +1,62 @@
+# Copyright 2009-2019 Noviat.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import logging
+
+from odoo import models, _
+
+_logger = logging.getLogger(__name__)
+
+
+class AccountBankStatementImport(models.TransientModel):
+    _inherit = 'account.bank.statement.import'
+
+    def _check_parsed_data(self, stmts_vals):
+        """ Basic and structural verifications """
+        if self.env.context.get('active_model') == 'ebics.file':
+            message = False
+            if len(stmts_vals) == 0:
+                message = _('This file doesn\'t contain any statement.')
+            if not message:
+                no_st_line = True
+                for vals in stmts_vals:
+                    if vals['transactions'] and len(vals['transactions']) > 0:
+                        no_st_line = False
+                        break
+                if no_st_line:
+                    message = _('This file doesn\'t contain any transaction.')
+                if message:
+                    log_msg = _(
+                        "Error detected while processing and EBICS File"
+                    ) + ':\n' + message
+                    _logger.warn(log_msg)
+                    return
+        super()._check_parsed_data(stmts_vals)
+
+    def _create_bank_statements(self, stmts_vals):
+        """
+        Return error message to ebics.file when handling empty camt.
+
+        Remarks/TODO:
+        We could add more info to the message (e.g. date, balance, ...)
+        and write this to the ebics.file, note field.
+        We could also create empty bank statement (in state done) to clearly
+        show days without transactions via the bank statement list view.
+        """
+        if self.env.context.get('active_model') == 'ebics.file':
+            transactions = False
+            for st_vals in stmts_vals:
+                if st_vals.get('transactions'):
+                    transactions = True
+                    break
+            if not transactions:
+                message = _('This file doesn\'t contain any transaction.')
+                statement_ids = []
+                notifications = {
+                    'type': 'warning',
+                    'message': message,
+                    'details': ''
+                }
+                return statement_ids, [notifications]
+
+        return super()._create_bank_statements(stmts_vals)
diff --git a/account_ebics/wizard/ebics_change_passphrase.py b/account_ebics/wizard/ebics_change_passphrase.py
index c68bd90..5e5282c 100644
--- a/account_ebics/wizard/ebics_change_passphrase.py
+++ b/account_ebics/wizard/ebics_change_passphrase.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2018 Noviat.
+# Copyright 2009-2019 Noviat.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 import logging
diff --git a/account_ebics/wizard/ebics_xfer.py b/account_ebics/wizard/ebics_xfer.py
index e9165ea..a3c89a2 100644
--- a/account_ebics/wizard/ebics_xfer.py
+++ b/account_ebics/wizard/ebics_xfer.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2018 Noviat.
+# Copyright 2009-2019 Noviat.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 """
@@ -199,7 +199,7 @@ class EbicsXfer(models.TransientModel):
                     self.note += _("Warning:")
                     self.note += '\n'
                     self.note += e.message
-                except:
+                except Exception:
                     self.note += '\n'
                     self.note += _("Unknown Error")
                     tb = ''.join(format_exception(*exc_info()))
@@ -321,7 +321,7 @@ class EbicsXfer(models.TransientModel):
                 self.note += _("EBICS Verification Error:")
                 self.note += '\n'
                 self.note += _("The EBICS response could not be verified.")
-            except:
+            except Exception:
                 self.note += '\n'
                 self.note += _("Unknown Error")
                 tb = ''.join(format_exception(*exc_info()))
@@ -359,7 +359,7 @@ class EbicsXfer(models.TransientModel):
         try:
             client = EbicsClient(
                 bank, user, version=self.ebics_config_id.ebics_version)
-        except:
+        except Exception:
             self.note += '\n'
             self.note += _("Unknown Error")
             tb = ''.join(format_exception(*exc_info()))