From c6e26601289a2f5748bec9ae8ed76638765abb20 Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
Date: Tue, 14 Apr 2026 19:16:57 +0200
Subject: [PATCH] [IMP] payment order: hide ebics_upload button on non-ebics
 journals

---
 account_ebics_payment_order/__manifest__.py   |  2 +-
 .../models/account_payment_mode.py            |  2 +-
 .../models/account_payment_order.py           | 39 ++++++++++---------
 .../views/account_payment_order_views.xml     |  2 +-
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/account_ebics_payment_order/__manifest__.py b/account_ebics_payment_order/__manifest__.py
index 92980d2..89f6c9d 100644
--- a/account_ebics_payment_order/__manifest__.py
+++ b/account_ebics_payment_order/__manifest__.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2024 Noviat.
+# Copyright 2015 Noviat.
 # License LGPL-3 or later (https://www.gnu.org/licenses/lgpl).
 
 {
diff --git a/account_ebics_payment_order/models/account_payment_mode.py b/account_ebics_payment_order/models/account_payment_mode.py
index 9ab2dc6..00bec22 100644
--- a/account_ebics_payment_order/models/account_payment_mode.py
+++ b/account_ebics_payment_order/models/account_payment_mode.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2024 Noviat.
+# Copyright 2015 Noviat.
 # License LGPL-3 or later (https://www.gnu.org/licenses/lpgl).
 
 from odoo import fields, models
diff --git a/account_ebics_payment_order/models/account_payment_order.py b/account_ebics_payment_order/models/account_payment_order.py
index 0859f08..85d9bd3 100644
--- a/account_ebics_payment_order/models/account_payment_order.py
+++ b/account_ebics_payment_order/models/account_payment_order.py
@@ -1,20 +1,28 @@
-# Copyright 2009-2024 Noviat.
+# Copyright 2015 Noviat.
 # License LGPL-3 or later (https://www.gnu.org/licenses/lgpl).
 
-from odoo import _, models
+from odoo import fields, models
 from odoo.exceptions import UserError
 
 
 class AccountPaymentOrder(models.Model):
     _inherit = "account.payment.order"
 
+    hide_ebics_upload = fields.Boolean(compute="_compute_hide_ebics_upload")
+
+    def _compute_hide_ebics_upload(self):
+        for rec in self:
+            rec.hide_ebics_upload = (
+                not rec.journal_id.ebics_config_id or rec.state != "generated"
+            )
+
     def ebics_upload(self):
         self.ensure_one()
         ctx = self.env.context.copy()
         ebics_format_id = self.payment_mode_id.ebics_format_id
         if not ebics_format_id:
             raise UserError(
-                _("Missing EBICS File Format setting on your Payment Mode.")
+                self.env._("Missing EBICS File Format setting on your Payment Mode.")
             )
         ctx.update(
             {
@@ -27,14 +35,14 @@ class AccountPaymentOrder(models.Model):
         )
         if not attach:
             raise UserError(
-                _(
-                    "This payment order doesn't contains attachements."
-                    "\nPlease generate first the Payment Order file first."
+                self.env._(
+                    "This payment order doesn't contains attachments."
+                    "\nPlease generate first the Payment Order file."
                 )
             )
         elif len(attach) > 1:
             raise UserError(
-                _(
+                self.env._(
                     "This payment order contains multiple attachments."
                     "\nPlease remove the obsolete attachments or upload "
                     "the payment order file via the "
@@ -42,24 +50,17 @@ class AccountPaymentOrder(models.Model):
                 )
             )
         else:
-            origin = _("Payment Order") + ": " + self.name
-            ebics_config = self.env["ebics.config"].search(
-                [
-                    ("journal_ids", "=", self.journal_id.id),
-                    ("state", "=", "confirm"),
-                ]
-            )
-            if not ebics_config:
+            origin = self.env._("Payment Order") + ": " + self.name
+            if not self.journal_id.ebics_config_id:
                 raise UserError(
-                    _(
+                    self.env._(
                         "No active EBICS configuration available "
                         "for the selected bank."
                     )
                 )
-            if len(ebics_config) == 1:
-                ctx["default_ebics_config_id"] = ebics_config.id
             ctx.update(
                 {
+                    "default_ebics_config_id": self.journal_id.ebics_config_id.id,
                     "default_upload_data": attach.datas,
                     "default_upload_fname": attach.name,
                     "origin": origin,
@@ -75,7 +76,7 @@ class AccountPaymentOrder(models.Model):
             ebics_xfer._onchange_upload_data()
             view = self.env.ref("account_ebics.ebics_xfer_view_form_upload")
             act = {
-                "name": _("EBICS Upload"),
+                "name": self.env._("EBICS Upload"),
                 "view_mode": "form",
                 "res_model": "ebics.xfer",
                 "view_id": view.id,
diff --git a/account_ebics_payment_order/views/account_payment_order_views.xml b/account_ebics_payment_order/views/account_payment_order_views.xml
index a7ba6c8..b2c1f3f 100644
--- a/account_ebics_payment_order/views/account_payment_order_views.xml
+++ b/account_ebics_payment_order/views/account_payment_order_views.xml
@@ -12,7 +12,7 @@
                 <button
                     name="ebics_upload"
                     type="object"
-                    invisible="state != 'generated'"
+                    invisible="hide_ebics_upload"
                     string="EBICS Upload"
                     class="oe_highlight"
                 />