From ceec816d9aeb687da4e36708a14d1b3bafdea0f3 Mon Sep 17 00:00:00 2001 From: phanupong Date: Fri, 29 May 2020 09:24:49 +0700 Subject: [PATCH] [13.0][MIGRATE] migrate module account_ebics. --- account_ebics/__manifest__.py | 3 ++- account_ebics/models/ebics_config.py | 18 ------------------ account_ebics/models/ebics_file.py | 6 ------ account_ebics/views/ebics_config.xml | 4 ++-- account_ebics/views/ebics_file.xml | 6 ++---- account_ebics/views/ebics_file_format.xml | 2 +- .../wizard/ebics_change_passphrase.py | 2 -- account_ebics/wizard/ebics_xfer.py | 5 ----- account_ebics/wizard/ebics_xfer.xml | 4 ++-- 9 files changed, 9 insertions(+), 41 deletions(-) diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py index d71a155..7a11e2e 100644 --- a/account_ebics/__manifest__.py +++ b/account_ebics/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'EBICS banking protocol', - 'version': '12.0.1.0.1', + 'version': '13.0.1.0.1', 'license': 'LGPL-3', 'author': 'Noviat', 'category': 'Accounting & Finance', @@ -21,4 +21,5 @@ ], 'installable': True, 'application': True, + 'external_dependencies': {'python': ['fintech', ]}, } diff --git a/account_ebics/models/ebics_config.py b/account_ebics/models/ebics_config.py index 0c912e2..b7ea55b 100644 --- a/account_ebics/models/ebics_config.py +++ b/account_ebics/models/ebics_config.py @@ -1,13 +1,6 @@ # Copyright 2009-2019 Noviat. # License LGPL-3 or later (http://www.gnu.org/licenses/lpgl). -""" -import logging -logging.basicConfig( - level=logging.DEBUG, - format='[%(asctime)s] %(levelname)s - %(name)s: %(message)s') -""" - import base64 import logging import re @@ -222,14 +215,12 @@ class EbicsConfig(models.Model): self._cr.dbname, 'mykeys']) - @api.multi @api.depends('ebics_keys') def _compute_ebics_keys_found(self): for cfg in self: cfg.ebics_keys_found = ( cfg.ebics_keys and os.path.isfile(cfg.ebics_keys)) - @api.multi @api.constrains('order_number') def _check_order_number(self): for cfg in self: @@ -247,7 +238,6 @@ class EbicsConfig(models.Model): "Order Number should comply with the following pattern:" "\n[A-Z]{1}[A-Z0-9]{3}")) - @api.multi def unlink(self): for ebics_config in self: if ebics_config.state == 'active': @@ -255,19 +245,15 @@ class EbicsConfig(models.Model): "You cannot remove active EBICS congirations.")) return super(EbicsConfig, self).unlink() - @api.multi def set_to_draft(self): return self.write({'state': 'draft'}) - @api.multi def set_to_get_bank_keys(self): return self.write({'state': 'get_bank_keys'}) - @api.multi def set_to_active(self): return self.write({'state': 'active'}) - @api.multi def ebics_init_1(self): """ Initialization of bank keys - Step 1: @@ -387,7 +373,6 @@ class EbicsConfig(models.Model): return self.write({'state': 'init'}) - @api.multi def ebics_init_2(self): """ Initialization of bank keys - Step 2: @@ -399,7 +384,6 @@ class EbicsConfig(models.Model): self.ensure_one() return self.write({'state': 'get_bank_keys'}) - @api.multi def ebics_init_3(self): """ Initialization of bank keys - Step 3: @@ -437,7 +421,6 @@ class EbicsConfig(models.Model): return True - @api.multi def ebics_init_4(self): """ Initialization of bank keys - Step 2: @@ -456,7 +439,6 @@ class EbicsConfig(models.Model): bank.activate_keys() return self.write({'state': 'active'}) - @api.multi def change_passphrase(self): self.ensure_one() ctx = dict(self._context, default_ebics_config_id=self.id) diff --git a/account_ebics/models/ebics_file.py b/account_ebics/models/ebics_file.py index 00b682f..95c6247 100644 --- a/account_ebics/models/ebics_file.py +++ b/account_ebics/models/ebics_file.py @@ -66,7 +66,6 @@ class EbicsFile(models.Model): """ return self.env.user.company_id - @api.multi def unlink(self): ff_methods = self._file_format_methods() for ebics_file in self: @@ -82,15 +81,12 @@ class EbicsFile(models.Model): ebics_file.bank_statement_ids.unlink() return super(EbicsFile, self).unlink() - @api.multi def set_to_draft(self): return self.write({'state': 'draft'}) - @api.multi def set_to_done(self): return self.write({'state': 'done'}) - @api.multi def process(self): self.ensure_one() self.note_process = '' @@ -104,7 +100,6 @@ class EbicsFile(models.Model): else: return self._process_undefined_format() - @api.multi def action_open_bank_statements(self): self.ensure_one() action = self.env['ir.actions.act_window'].for_xml_id( @@ -114,7 +109,6 @@ class EbicsFile(models.Model): action.update({'domain': domain}) return action - @api.multi def button_close(self): self.ensure_one() return {'type': 'ir.actions.act_window_close'} diff --git a/account_ebics/views/ebics_config.xml b/account_ebics/views/ebics_config.xml index fd51728..03410b6 100644 --- a/account_ebics/views/ebics_config.xml +++ b/account_ebics/views/ebics_config.xml @@ -5,7 +5,7 @@ ebics.config.tree ebics.config - + @@ -113,7 +113,7 @@ EBICS Configuration ebics.config - form + tree,form diff --git a/account_ebics/views/ebics_file.xml b/account_ebics/views/ebics_file.xml index 2a47190..8c0f08b 100644 --- a/account_ebics/views/ebics_file.xml +++ b/account_ebics/views/ebics_file.xml @@ -36,7 +36,7 @@ ebics.file.tree ebics.file - + @@ -111,7 +111,6 @@ EBICS Download Files ir.actions.act_window ebics.file - form tree,form [('type','=','down')] @@ -144,7 +143,7 @@ ebics.file.tree ebics.file - + @@ -187,7 +186,6 @@ EBICS Upload Files ir.actions.act_window ebics.file - form tree,form [('type','=','up')] diff --git a/account_ebics/views/ebics_file_format.xml b/account_ebics/views/ebics_file_format.xml index 69c5d04..5944c8f 100644 --- a/account_ebics/views/ebics_file_format.xml +++ b/account_ebics/views/ebics_file_format.xml @@ -36,7 +36,7 @@ EBICS File Formats ebics.file.format - form + tree,form diff --git a/account_ebics/wizard/ebics_change_passphrase.py b/account_ebics/wizard/ebics_change_passphrase.py index 6bd9e1d..ed06a4a 100644 --- a/account_ebics/wizard/ebics_change_passphrase.py +++ b/account_ebics/wizard/ebics_change_passphrase.py @@ -35,7 +35,6 @@ class EbicsChangePassphrase(models.TransientModel): required=True) note = fields.Text(string='Notes', readonly=True) - @api.multi def change_passphrase(self): self.ensure_one() if self.old_pass != self.ebics_config_id.ebics_passphrase: @@ -71,7 +70,6 @@ class EbicsChangePassphrase(models.TransientModel): 'type': 'ir.actions.act_window', } - @api.multi def button_close(self): self.ensure_one() return {'type': 'ir.actions.act_window_close'} diff --git a/account_ebics/wizard/ebics_xfer.py b/account_ebics/wizard/ebics_xfer.py index e8bb186..76dca57 100644 --- a/account_ebics/wizard/ebics_xfer.py +++ b/account_ebics/wizard/ebics_xfer.py @@ -125,7 +125,6 @@ class EbicsXfer(models.TransientModel): def _onchange_format_id(self): self.order_type = self.format_id.order_type - @api.multi def ebics_upload(self): self.ensure_one() ctx = self._context.copy() @@ -147,7 +146,6 @@ class EbicsXfer(models.TransientModel): 'type': 'ir.actions.act_window', } - @api.multi def ebics_download(self): self.ensure_one() self.ebics_config_id._check_ebics_files() @@ -238,12 +236,10 @@ class EbicsXfer(models.TransientModel): 'type': 'ir.actions.act_window', } - @api.multi def button_close(self): self.ensure_one() return {'type': 'ir.actions.act_window_close'} - @api.multi def view_ebics_file(self): self.ensure_one() module = __name__.split('addons.')[1].split('.')[0] @@ -335,7 +331,6 @@ class EbicsXfer(models.TransientModel): return ebics_file - @api.multi def _setup_client(self): self.ebics_config_id._check_ebics_keys() passphrase = self._get_passphrase() diff --git a/account_ebics/wizard/ebics_xfer.xml b/account_ebics/wizard/ebics_xfer.xml index 555c622..3d53eab 100644 --- a/account_ebics/wizard/ebics_xfer.xml +++ b/account_ebics/wizard/ebics_xfer.xml @@ -70,7 +70,7 @@ EBICS File Transfer ir.actions.act_window ebics.xfer - form + form new {'ebics_download': 1} @@ -81,7 +81,7 @@ EBICS File Transfer ir.actions.act_window ebics.xfer - form + form new {'ebics_upload': 1}