From 19ac7421f1105703bd79bb01c37c1b571413ca64 Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
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                    |  2 +-
 account_ebics/wizards/ebics_xfer.py              | 16 +++++++++++++++-
 account_ebics/wizards/ebics_xfer.xml             |  3 ++-
 .../models/account_payment_order.py              |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py
index c0822b0..b9bd17d 100644
--- a/account_ebics/__manifest__.py
+++ b/account_ebics/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "EBICS banking protocol",
-    "version": "17.0.1.0.2",
+    "version": "17.0.1.1.0",
     "license": "LGPL-3",
     "author": "Noviat",
     "website": "https://www.noviat.com",
diff --git a/account_ebics/wizards/ebics_xfer.py b/account_ebics/wizards/ebics_xfer.py
index d64aae0..18f97a6 100644
--- a/account_ebics/wizards/ebics_xfer.py
+++ b/account_ebics/wizards/ebics_xfer.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2023 Noviat.
+# Copyright 2009-2024 Noviat.
 # License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
 
 import base64
@@ -79,6 +79,9 @@ class EbicsXfer(models.TransientModel):
         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"
+    )
     allowed_format_ids = fields.Many2many(
         related="ebics_config_id.ebics_file_format_ids",
         string="Allowed EBICS File Formats",
@@ -117,6 +120,17 @@ class EbicsXfer(models.TransientModel):
             else:
                 rec.ebics_sig_passphrase_invisible = False
 
+    @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):
         avail_userids = self.ebics_config_id.ebics_userid_ids.filtered(
diff --git a/account_ebics/wizards/ebics_xfer.xml b/account_ebics/wizards/ebics_xfer.xml
index adb5f7d..a531c95 100644
--- a/account_ebics/wizards/ebics_xfer.xml
+++ b/account_ebics/wizards/ebics_xfer.xml
@@ -91,10 +91,11 @@
           <field name="upload_data" filename="upload_fname" required="1" />
           <field name="upload_fname" invisible="1" />
           <field name="upload_fname_dummy" string="Upload Filename" />
+          <field name="upload_format_ids" invisible="1" />
           <field
                         name="format_id"
+                        domain="[('id', 'in', upload_format_ids)]"
                         required="1"
-                        domain="[('type', '=', 'up'), ('id', 'in', allowed_format_ids)]"
                     />
           <field name="order_type" />
           <field name="test_mode" invisible="order_type not in ('FUL', 'BTU')" />
diff --git a/account_ebics_payment_order/models/account_payment_order.py b/account_ebics_payment_order/models/account_payment_order.py
index 03a49b6..030f313 100644
--- a/account_ebics_payment_order/models/account_payment_order.py
+++ b/account_ebics_payment_order/models/account_payment_order.py
@@ -52,7 +52,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({})