From b2c56b74995fd0bdb7690aec55bd00a54db67bb7 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Mon, 13 May 2024 22:08:21 +0200 Subject: [PATCH] [FIX]file format setting when EBICS upload from payment order --- account_ebics/__manifest__.py | 2 +- account_ebics/wizards/ebics_xfer.py | 22 +++++++++---------- account_ebics_payment_order/__manifest__.py | 2 +- .../models/account_payment_order.py | 3 +-- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py index 60e1a10..2cdb288 100644 --- a/account_ebics/__manifest__.py +++ b/account_ebics/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'EBICS banking protocol', - 'version': '13.0.1.4.0', + 'version': '13.0.1.4.1', 'license': 'LGPL-3', 'author': 'Noviat', 'website': 'www.noviat.com', diff --git a/account_ebics/wizards/ebics_xfer.py b/account_ebics/wizards/ebics_xfer.py index 5f1fdc7..8bf1af0 100644 --- a/account_ebics/wizards/ebics_xfer.py +++ b/account_ebics/wizards/ebics_xfer.py @@ -99,7 +99,8 @@ class EbicsXfer(models.TransientModel): def _onchange_ebics_config_id(self): ebics_userids = self.ebics_config_id.ebics_userid_ids domain = {'ebics_userid_id': [('id', 'in', ebics_userids.ids)]} - if self._context.get('ebics_download'): + ctx = self.env.context + if ctx.get('ebics_download'): download_formats = self.ebics_config_id.ebics_file_format_ids\ .filtered(lambda r: r.type == 'down') if len(download_formats) == 1: @@ -114,18 +115,21 @@ class EbicsXfer(models.TransientModel): if len(transport_users) == 1: self.ebics_userid_id = transport_users else: - upload_formats = self.ebics_config_id.ebics_file_format_ids\ - .filtered(lambda r: r.type == 'up') - if len(upload_formats) == 1: - self.format_id = upload_formats - domain['format_id'] = [('type', '=', 'up'), - ('id', 'in', upload_formats.ids)] if len(ebics_userids) == 1: self.ebics_userid_id = ebics_userids + if not ctx.get('active_model') == 'account.payment.order': + upload_formats = self.ebics_config_id.ebics_file_format_ids\ + .filtered(lambda r: r.type == 'up') + if len(upload_formats) == 1: + self.format_id = upload_formats + domain['format_id'] = [('type', '=', 'up'), + ('id', 'in', upload_formats.ids)] return {'domain': domain} @api.onchange('upload_data') def _onchange_upload_data(self): + if self.env.context.get('active_model') == 'account.payment.order': + return self.upload_fname_dummy = self.upload_fname self.format_id = False self._detect_upload_format() @@ -139,10 +143,6 @@ class EbicsXfer(models.TransientModel): if len(upload_formats) == 1: self.format_id = upload_formats - @api.onchange('format_id') - def _onchange_format_id(self): - self.order_type = self.format_id.order_type - def ebics_upload(self): self.ensure_one() ctx = self._context.copy() diff --git a/account_ebics_payment_order/__manifest__.py b/account_ebics_payment_order/__manifest__.py index 12d6e74..55f0f72 100644 --- a/account_ebics_payment_order/__manifest__.py +++ b/account_ebics_payment_order/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Upload Payment Order via EBICS', - 'version': '13.0.1.2.0', + 'version': '13.0.1.2.1', 'license': 'LGPL-3', 'author': 'Noviat', 'category': 'Accounting & Finance', diff --git a/account_ebics_payment_order/models/account_payment_order.py b/account_ebics_payment_order/models/account_payment_order.py index 73e8695..d628a4e 100644 --- a/account_ebics_payment_order/models/account_payment_order.py +++ b/account_ebics_payment_order/models/account_payment_order.py @@ -1,4 +1,4 @@ -# Copyright 2009-2021 Noviat. +# Copyright 2009-2024 Noviat. # License LGPL-3 or later (http://www.gnu.org/licenses/lpgl). from odoo import _, models @@ -54,7 +54,6 @@ class AccountPaymentOrder(models.Model): ebics_xfer = self.env['ebics.xfer'].with_context(ctx).create({}) ebics_xfer._onchange_ebics_config_id() ebics_xfer._onchange_upload_data() - ebics_xfer._onchange_format_id() view = self.env.ref('account_ebics.ebics_xfer_view_form_upload') act = { 'name': _('EBICS Upload'),