diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py
index 083987d..bfafdb0 100644
--- a/account_ebics/__manifest__.py
+++ b/account_ebics/__manifest__.py
@@ -1,9 +1,9 @@
-# Copyright 2009-2024 Noviat.
+# Copyright 2009-2025 Noviat.
 # License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
 
 {
     "name": "EBICS banking protocol",
-    "version": "16.0.1.10.3",
+    "version": "16.0.2.0.0",
     "license": "LGPL-3",
     "author": "Noviat",
     "website": "https://www.noviat.com/",
diff --git a/account_ebics/migrations/16.0.2/post-migration.py b/account_ebics/migrations/16.0.2/post-migration.py
new file mode 100644
index 0000000..2c5b89e
--- /dev/null
+++ b/account_ebics/migrations/16.0.2/post-migration.py
@@ -0,0 +1,15 @@
+# Copyright 2009-2025 Noviat.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+def migrate(cr, version):
+    cr.execute(  # pylint: disable=E8103
+        """
+    UPDATE ebics_file ef
+    SET state = 'done'
+    FROM ebics_file_format eff
+    WHERE ef.format_id = eff.id
+          AND eff.type = 'down'
+          AND eff.download_process_method IS NULL;
+        """
+    )
diff --git a/account_ebics/models/ebics_file.py b/account_ebics/models/ebics_file.py
index 9035535..a84b5cd 100644
--- a/account_ebics/models/ebics_file.py
+++ b/account_ebics/models/ebics_file.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2024 Noviat.
+# Copyright 2009-2025 Noviat.
 # License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
 
 import base64
@@ -36,7 +36,10 @@ class EbicsFile(models.Model):
     format_id = fields.Many2one(
         comodel_name="ebics.file.format", string="EBICS File Formats", readonly=True
     )
-    type = fields.Selection(related="format_id.type", readonly=True)
+    download_process_method = fields.Selection(
+        related="format_id.download_process_method"
+    )
+    type = fields.Selection(related="format_id.type")
     date_from = fields.Date(
         readonly=True, help="'Date From' as entered in the download wizard."
     )
diff --git a/account_ebics/views/ebics_config_views.xml b/account_ebics/views/ebics_config_views.xml
index 15735fe..0534487 100644
--- a/account_ebics/views/ebics_config_views.xml
+++ b/account_ebics/views/ebics_config_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
   <record id="ebics_config_view_tree" model="ir.ui.view">
diff --git a/account_ebics/views/ebics_file_format_views.xml b/account_ebics/views/ebics_file_format_views.xml
index e677d3c..026887d 100644
--- a/account_ebics/views/ebics_file_format_views.xml
+++ b/account_ebics/views/ebics_file_format_views.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
-  <record id="ebics_file_format_view_tree" model="ir.ui.view">
-    <field name="name">ebics.file.format.tree</field>
-    <field name="model">ebics.file.format</field>
-    <field name="arch" type="xml">
-      <tree>
-                  <field name="ebics_version" />
-        <field name="type" />
-        <field name="order_type" />
-        <field name="signature_class" />
-        <field name="name" />
-        <field name="description" />
-      </tree>
-    </field>
-  </record>
+    <record id="ebics_file_format_view_tree" model="ir.ui.view">
+        <field name="name">ebics.file.format.tree</field>
+        <field name="model">ebics.file.format</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="ebics_version" />
+                <field name="type" />
+                <field name="order_type" />
+                <field name="signature_class" />
+                <field name="name" />
+                <field name="description" />
+            </tree>
+        </field>
+    </record>
 
-  <record id="ebics_file_format_view_form" model="ir.ui.view">
-    <field name="name">ebics.file.format.form</field>
-    <field name="model">ebics.file.format</field>
-    <field name="arch" type="xml">
-      <form string="EBICS File Format">
-        <group name="main">
-          <group name="main-left">
-            <field name="ebics_version" />
-            <field name="type" />
-            <field name="suffix" />
-            <field
+    <record id="ebics_file_format_view_form" model="ir.ui.view">
+        <field name="name">ebics.file.format.form</field>
+        <field name="model">ebics.file.format</field>
+        <field name="arch" type="xml">
+            <form string="EBICS File Format">
+                <group name="main">
+                    <group name="main-left">
+                        <field name="ebics_version" />
+                        <field name="type" />
+                        <field name="suffix" />
+                        <field
                             name="download_process_method"
                             attrs="{'invisible': [('type', '=', 'up')]}"
                             force_save="1"
                         />
-            <field name="signature_class" />
-          </group>
-          <group name="main-right">
-            <field name="order_type" />
-            <field
+                        <field name="signature_class" />
+                    </group>
+                    <group name="main-right">
+                        <field name="order_type" />
+                        <field
                             name="name"
                             attrs="{'required': [('ebics_version', '=', '2')], 'invisible': [('ebics_version', '=', '3')]}"
                         />
-            <field
+                        <field
                             name="btf_service"
                             attrs="{'required': [('ebics_version', '=', '3')], 'invisible': [('ebics_version', '=', '2')]}"
                         />
-            <field
+                        <field
                             name="btf_message"
                             attrs="{'required': [('ebics_version', '=', '3')], 'invisible': [('ebics_version', '=', '2')]}"
                         />
-            <field
+                        <field
                             name="btf_scope"
                             attrs="{'invisible': [('ebics_version', '=', '2')]}"
                         />
-            <field
+                        <field
                             name="btf_option"
                             attrs="{'invisible': [('ebics_version', '=', '2')]}"
                         />
-            <field
+                        <field
                             name="btf_container"
                             attrs="{'invisible': [('ebics_version', '=', '2')]}"
                         />
-            <field
+                        <field
                             name="btf_version"
                             attrs="{'invisible': [('ebics_version', '=', '2')]}"
                         />
-            <field
+                        <field
                             name="btf_variant"
                             attrs="{'invisible': [('ebics_version', '=', '2')]}"
                         />
-            <field
+                        <field
                             name="btf_format"
                             attrs="{'invisible': [('ebics_version', '=', '2')]}"
                         />
-          </group>
-        </group>
-        <group name="description">
-          <field name="description" />
-        </group>
-      </form>
-    </field>
-  </record>
+                    </group>
+                </group>
+                <group name="description">
+                    <field name="description" />
+                </group>
+            </form>
+        </field>
+    </record>
 
-  <record id="ebics_file_format_action" model="ir.actions.act_window">
-    <field name="name">EBICS File Formats</field>
-    <field name="res_model">ebics.file.format</field>
-    <field name="view_mode">tree,form</field>
-  </record>
+    <record id="ebics_file_format_action" model="ir.actions.act_window">
+        <field name="name">EBICS File Formats</field>
+        <field name="res_model">ebics.file.format</field>
+        <field name="view_mode">tree,form</field>
+    </record>
 
 </odoo>
diff --git a/account_ebics/views/ebics_file_views.xml b/account_ebics/views/ebics_file_views.xml
index 4261ccc..62e09a4 100644
--- a/account_ebics/views/ebics_file_views.xml
+++ b/account_ebics/views/ebics_file_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="ebics_file_view_search" model="ir.ui.view">
@@ -73,9 +73,10 @@
         <field name="arch" type="xml">
             <form string="EBICS File" create="false">
                 <header>
+                    <field name="download_process_method" invisible="1" />
                     <button
                         name="set_to_draft"
-                        states="done"
+                        attrs="{'invisible': ['|', ('download_process_method', '=', False), ('state', '!=', 'done')]}"
                         string="Set to Draft"
                         type="object"
                         groups="account.group_account_manager"
@@ -83,7 +84,7 @@
                     <button
                         name="process"
                         class="oe_highlight"
-                        states="draft"
+                        attrs="{'invisible': ['|', ('download_process_method', '=', False), ('state', '!=', 'draft')]}"
                         string="Process"
                         type="object"
                         groups="account.group_account_invoice"
@@ -91,27 +92,37 @@
                     />
                     <button
                         name="set_to_done"
-                        states="draft"
+                        attrs="{'invisible': ['|', ('download_process_method', '=', False), ('state', '!=', 'draft')]}"
                         string="Set to Done"
                         type="object"
                         groups="account.group_account_manager"
                     />
-                    <field name="state" widget="statusbar" />
-                </header>
-                <group colspan="4" col="4">
-                    <field name="date" string="Download Date" />
-                    <field name="name" />
-                    <field name="data" filename="name" />
-                    <field name="format_id" />
-                    <field name="date_from" />
-                    <field name="date_to" />
-                    <field name="user_id" />
-                    <field name="ebics_userid_id" />
                     <field
-                        name="company_ids"
-                        widget="many2many_tags"
-                        groups="base.group_multi_company"
+                        name="state"
+                        widget="statusbar"
+                        attrs="{'invisible': [('download_process_method', '=', False)]}"
                     />
+                </header>
+                <group name="main">
+                    <group name="main-full-screen" colspan="2" col="2">
+                        <field name="name" />
+                        <field name="data" filename="name" />
+                        <field name="format_id" />
+                    </group>
+                    <group name="main-left">
+                        <field name="date" string="Download Date" />
+                        <field name="user_id" />
+                        <field name="ebics_userid_id" />
+                    </group>
+                    <group name="main-right">
+                        <field name="date_from" />
+                        <field name="date_to" />
+                        <field
+                            name="company_ids"
+                            widget="many2many_tags"
+                            groups="base.group_multi_company"
+                        />
+                    </group>
                 </group>
                 <notebook>
                     <page string="Additional Information">
diff --git a/account_ebics/views/ebics_userid_views.xml b/account_ebics/views/ebics_userid_views.xml
index cf6c874..df69d7b 100644
--- a/account_ebics/views/ebics_userid_views.xml
+++ b/account_ebics/views/ebics_userid_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
   <record id="ebics_userid_view_tree" model="ir.ui.view">
diff --git a/account_ebics/views/menu.xml b/account_ebics/views/menu.xml
index 1ad1b0c..0ac9cee 100644
--- a/account_ebics/views/menu.xml
+++ b/account_ebics/views/menu.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
   <menuitem
diff --git a/account_ebics/wizards/ebics_xfer.py b/account_ebics/wizards/ebics_xfer.py
index 21b3f54..6c4107f 100644
--- a/account_ebics/wizards/ebics_xfer.py
+++ b/account_ebics/wizards/ebics_xfer.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2024 Noviat.
+# Copyright 2009-2025 Noviat.
 # License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
 
 import base64
@@ -603,6 +603,7 @@ class EbicsXfer(models.TransientModel):
             "date_from": self.date_from,
             "date_to": self.date_to,
             "format_id": file_format.id,
+            "state": file_format.download_process_method and "draft" or "done",
             "user_id": self._uid,
             "ebics_userid_id": self.ebics_userid_id.id,
             "company_ids": self.ebics_config_id.company_ids.ids,
diff --git a/account_ebics_batch/__manifest__.py b/account_ebics_batch/__manifest__.py
index 1ea0357..97de760 100644
--- a/account_ebics_batch/__manifest__.py
+++ b/account_ebics_batch/__manifest__.py
@@ -1,9 +1,9 @@
-# Copyright 2009-2023 Noviat.
+# Copyright 2009-2025 Noviat.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     "name": "EBICS Files batch import",
-    "version": "16.0.1.0.0",
+    "version": "16.0.1.0.1",
     "license": "AGPL-3",
     "author": "Noviat",
     "website": "https://www.noviat.com/",
diff --git a/account_ebics_batch/models/ebics_batch_log.py b/account_ebics_batch/models/ebics_batch_log.py
index 2de7cda..79a0913 100644
--- a/account_ebics_batch/models/ebics_batch_log.py
+++ b/account_ebics_batch/models/ebics_batch_log.py
@@ -179,7 +179,9 @@ class EbicsBatchLog(models.Model):
         return file_ids
 
     def _ebics_process(self, import_dict):
-        to_process = self.file_ids.filtered(lambda r: r.state == "draft")
+        to_process = self.file_ids.filtered(
+            lambda r: r.download_process_method and r.state == "draft"
+        )
         for ebics_file in to_process:
             ebics_file.process()