From ee6c1c24dcf22a99e41c2b71191678cefe97aa80 Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
Date: Mon, 8 Apr 2019 12:54:26 +0200
Subject: [PATCH] init cycle - usability improvements

---
 account_ebics/__manifest__.py        |  2 +-
 account_ebics/models/ebics_config.py | 34 +++++++++++++++++++++-------
 account_ebics/views/ebics_config.xml |  3 ++-
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py
index 063d9ac..07daf4d 100644
--- a/account_ebics/__manifest__.py
+++ b/account_ebics/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'EBICS banking protocol',
-    'version': '11.0.1.6.0',
+    'version': '11.0.1.7.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 aef2570..711ea84 100644
--- a/account_ebics/models/ebics_config.py
+++ b/account_ebics/models/ebics_config.py
@@ -223,11 +223,11 @@ class EbicsConfig(models.Model):
                          'mykeys'])
 
     @api.multi
+    @api.depends('ebics_keys')
     def _compute_ebics_keys_found(self):
         for cfg in self:
-            if cfg.ebics_keys:
-                dirname = os.path.dirname(self.ebics_keys)
-                self.ebics_keys_found = os.path.exists(dirname)
+            cfg.ebics_keys_found = (
+                cfg.ebics_keys and os.path.isfile(cfg.ebics_keys))
 
     @api.multi
     @api.constrains('order_number')
@@ -279,10 +279,14 @@ class EbicsConfig(models.Model):
             raise UserError(
                 _("Set state to 'draft' before Bank Key (re)initialisation."))
 
+        if not self.ebics_passphrase:
+            raise UserError(
+                _("Set a passphrase."))
+
         try:
             keyring = EbicsKeyRing(
                 keys=self.ebics_keys,
-                passphrase=self.ebics_passphrase or None)
+                passphrase=self.ebics_passphrase)
             bank = EbicsBank(
                 keyring=keyring, hostid=self.ebics_host, url=self.ebics_url)
             user = EbicsUser(
@@ -296,9 +300,15 @@ class EbicsConfig(models.Model):
 
         self._check_ebics_keys()
         if not os.path.isfile(self.ebics_keys):
-            user.create_keys(
-                keyversion=self.ebics_key_version,
-                bitlength=self.ebics_key_bitlength)
+            try:
+                user.create_keys(
+                    keyversion=self.ebics_key_version,
+                    bitlength=self.ebics_key_bitlength)
+            except Exception:
+                exctype, value = exc_info()[:2]
+                error = _("EBICS Initialisation Error:")
+                error += '\n' + str(exctype) + '\n' + str(value)
+                raise UserError(error)
 
         if self.ebics_key_x509:
             dn_attrs = {
@@ -351,10 +361,13 @@ class EbicsConfig(models.Model):
             self._update_order_number(OrderID)
 
         # Create an INI-letter which must be printed and sent to the bank.
-        lang = self.env.user.lang[:2]
         cc = self.bank_id.bank_id.country.code
         if cc in ['FR', 'DE']:
             lang = cc
+        else:
+            lang = self.env.user.lang or \
+                self.env['res.lang'].search([])[0].code
+            lang = lang[:2]
         tmp_dir = os.path.normpath(self.ebics_files + '/tmp')
         if not os.path.isdir(tmp_dir):
             os.makedirs(tmp_dir, mode=0o700)
@@ -488,6 +501,11 @@ class EbicsConfig(models.Model):
                     "EBICS Keys Directory '%s' is not available."
                     "\nPlease contact your system administrator.")
                     % dirname)
+        if os.path.isdir(self.ebics_keys):
+            raise UserError(_(
+                "Configuration Error.\n"
+                "The 'EBICS Keys' parameter should be a full path "
+                "(directory + filename) not a directory name."))
 
     def _check_ebics_files(self):
         dirname = self.ebics_files or ''
diff --git a/account_ebics/views/ebics_config.xml b/account_ebics/views/ebics_config.xml
index b9a70e9..dc4e2db 100644
--- a/account_ebics/views/ebics_config.xml
+++ b/account_ebics/views/ebics_config.xml
@@ -71,7 +71,8 @@
             <group col="4" name="ebics_key">
               <field name="ebics_keys"/>
               <field name="ebics_keys_found" invisible="1"/>
-              <field name="ebics_passphrase" password="True" attrs="{'invisible': [('ebics_keys_found', '!=', False)]}"/>
+              <field name="ebics_passphrase" password="True"
+                     attrs="{'required': [('state', '=', 'draft')], 'invisible': [('ebics_keys_found', '=', True)]}"/>
               <newline/>
               <field name="ebics_key_version"/>
               <field name="ebics_key_bitlength"/>