From e0f47ee7666ac041c148a23ea43b129f945d5977 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Mon, 6 May 2024 20:15:49 +0200 Subject: [PATCH] [IMP]account_ebics: file format filter on ebics_upload Set file format fiter when creating the ebics.xfer wizard from a python method, e.g. 'EBICS UPLOAD' button on payment order. --- account_ebics/__manifest__.py | 4 ++-- .../wizards/ebics_change_passphrase.py | 2 +- account_ebics/wizards/ebics_xfer.py | 20 +++++++++++-------- account_ebics/wizards/ebics_xfer.xml | 5 ++++- .../models/account_payment_order.py | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py index 3f56e5d..60e1a10 100644 --- a/account_ebics/__manifest__.py +++ b/account_ebics/__manifest__.py @@ -1,9 +1,9 @@ -# Copyright 2009-2022 Noviat. +# Copyright 2009-2024 Noviat. # License LGPL-3 or later (http://www.gnu.org/licenses/lpgl). { 'name': 'EBICS banking protocol', - 'version': '13.0.1.3.3', + 'version': '13.0.1.4.0', 'license': 'LGPL-3', 'author': 'Noviat', 'website': 'www.noviat.com', diff --git a/account_ebics/wizards/ebics_change_passphrase.py b/account_ebics/wizards/ebics_change_passphrase.py index 45dbd0c..d948a0f 100644 --- a/account_ebics/wizards/ebics_change_passphrase.py +++ b/account_ebics/wizards/ebics_change_passphrase.py @@ -53,7 +53,7 @@ class EbicsChangePassphrase(models.TransientModel): keyring.change_passphrase(self.new_pass) except ValueError as e: raise UserError(str(e)) - self.ebics_userid_id.ebics_passphrase = self.new_pass + self.ebics_userid_id.ebics_passphrase = self.new_pass self.note = "The EBICS Passphrase has been changed." module = __name__.split('addons.')[1].split('.')[0] diff --git a/account_ebics/wizards/ebics_xfer.py b/account_ebics/wizards/ebics_xfer.py index e19280d..5f1fdc7 100644 --- a/account_ebics/wizards/ebics_xfer.py +++ b/account_ebics/wizards/ebics_xfer.py @@ -1,13 +1,6 @@ -# Copyright 2009-2022 Noviat. +# Copyright 2009-2024 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 os @@ -66,6 +59,9 @@ class EbicsXfer(models.TransientModel): string='EBICS File Format', help="Select EBICS File Format to upload/download." "\nLeave blank to download all available files.") + upload_format_ids = fields.Many2many( + comodel_name="ebics.file.format", + compute="_compute_upload_format_ids") order_type = fields.Char( related='format_id.order_type', string='Order Type', @@ -91,6 +87,14 @@ class EbicsXfer(models.TransientModel): else: return cfg_mod + @api.depends("ebics_config_id") + def _compute_upload_format_ids(self): + for rec in self: + rec.upload_format_ids = False + if not self.env.context.get("ebics_download"): + rec.upload_format_ids = rec.ebics_config_id\ + .ebics_file_format_ids.filtered(lambda r: r.type == "up") + @api.onchange('ebics_config_id') def _onchange_ebics_config_id(self): ebics_userids = self.ebics_config_id.ebics_userid_ids diff --git a/account_ebics/wizards/ebics_xfer.xml b/account_ebics/wizards/ebics_xfer.xml index 60b5369..4cf623e 100644 --- a/account_ebics/wizards/ebics_xfer.xml +++ b/account_ebics/wizards/ebics_xfer.xml @@ -45,7 +45,10 @@ - + + diff --git a/account_ebics_payment_order/models/account_payment_order.py b/account_ebics_payment_order/models/account_payment_order.py index 64e9442..3578c25 100644 --- a/account_ebics_payment_order/models/account_payment_order.py +++ b/account_ebics_payment_order/models/account_payment_order.py @@ -41,7 +41,7 @@ class AccountPaymentOrder(models.Model): 'default_upload_data': attach.datas, 'default_upload_fname': attach.name, 'origin': origin, - 'force_comany': self.company_id.id, + 'force_company': self.company_id.id, }) ebics_xfer = self.env['ebics.xfer'].with_context(ctx).create({}) ebics_xfer._onchange_ebics_config_id()