From 6697eefb0927cba707e90fd22c54e65857033bc4 Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
Date: Sun, 11 Oct 2026 20:52:28 +0200
Subject: [PATCH] [IMP] Add payment upload state tracking on payment orders

account_ebics_payment_order:
Add EBICS notebook page with upload info to payment order form
---
 account_ebics_payment_order/__manifest__.py     |  2 +-
 .../models/account_payment_order.py             | 17 ++++++++++++++++-
 .../views/account_payment_order_views.xml       | 12 ++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/account_ebics_payment_order/__manifest__.py b/account_ebics_payment_order/__manifest__.py
index 64f2690..e4f89a3 100644
--- a/account_ebics_payment_order/__manifest__.py
+++ b/account_ebics_payment_order/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "EBICS - Payment Orders (OCA)",
     "summary": "Send an OCA payment order to the bank over EBICS",
-    "version": "19.0.1.0.1",
+    "version": "19.0.1.1.0",
     "license": "LGPL-3",
     "author": "Noviat",
     "website": "https://www.noviat.com/",
diff --git a/account_ebics_payment_order/models/account_payment_order.py b/account_ebics_payment_order/models/account_payment_order.py
index 5c70d6d..1cf1391 100644
--- a/account_ebics_payment_order/models/account_payment_order.py
+++ b/account_ebics_payment_order/models/account_payment_order.py
@@ -8,6 +8,19 @@ from odoo.exceptions import UserError
 class AccountPaymentOrder(models.Model):
     _inherit = "account.payment.order"
 
+    ebics_config_id = fields.Many2one(
+        comodel_name="ebics.config",
+        related="journal_id.ebics_config_id",
+    )
+    ebics_file_id = fields.Many2one(
+        comodel_name="ebics.file",
+        string="EBICS Upload File",
+        readonly=True,
+    )
+    ebics_order_number = fields.Char(
+        related="ebics_file_id.ebics_order_number",
+        string="EBICS OrderID",
+    )
     hide_ebics_upload = fields.Boolean(
         compute="_compute_hide_ebics_upload", default=True
     )
@@ -16,7 +29,9 @@ class AccountPaymentOrder(models.Model):
     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"
+                self.env.neutralized
+                or not rec.journal_id.ebics_config_id
+                or rec.state != "generated"
             )
 
     def ebics_upload(self):
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 3e2bf7e..eef2b85 100644
--- a/account_ebics_payment_order/views/account_payment_order_views.xml
+++ b/account_ebics_payment_order/views/account_payment_order_views.xml
@@ -17,6 +17,18 @@
                     class="oe_highlight"
                 />
             </button>
+            <notebook position="inside">
+                <page
+                    string="EBICS upload info"
+                    name="ebics"
+                    invisible="not ebics_config_id"
+                >
+                    <group name="ebics_info">
+                        <field name="ebics_file_id" string="Upload File" />
+                        <field name="ebics_order_number" />
+                    </group>
+                </page>
+            </notebook>
         </field>
     </record>
 </odoo>