diff --git a/account_payment_partner/models/account_move.py b/account_payment_partner/models/account_move.py
index 1f606e835..ccd2ffc7f 100644
--- a/account_payment_partner/models/account_move.py
+++ b/account_payment_partner/models/account_move.py
@@ -20,7 +20,7 @@ class AccountMove(models.Model):
         compute="_compute_payment_mode",
         store=True,
         ondelete="restrict",
-        states={"draft": [("readonly", False)]},
+        readonly=False,
     )
     bank_account_required = fields.Boolean(
         related="payment_mode_id.payment_method_id.bank_account_required", readonly=True
@@ -29,7 +29,7 @@ class AccountMove(models.Model):
         compute="_compute_invoice_partner_bank",
         store=True,
         ondelete="restrict",
-        states={"draft": [("readonly", False)]},
+        readonly=False,
     )
 
     @api.depends("type")
diff --git a/account_payment_partner/views/account_move_view.xml b/account_payment_partner/views/account_move_view.xml
index e6f819fb6..36cbf3562 100644
--- a/account_payment_partner/views/account_move_view.xml
+++ b/account_payment_partner/views/account_move_view.xml
@@ -28,6 +28,7 @@
                 <field name="payment_mode_id"
                        domain="[('payment_type', '=', payment_mode_filter_type_domain), ('company_id', '=', company_id)]"
                        widget="selection"
+                       attrs="{'readonly': [('state', '!=', 'draft')]}"
                        invisible="context.get('default_type') not in  ('out_invoice','out_refund','in_invoice','in_refund')"/>
                 <field name="commercial_partner_id" invisible="1"/>
                 <field name="bank_account_required" invisible="1"/>
@@ -37,7 +38,7 @@
             <field name="invoice_partner_bank_id" position="attributes">
                 <attribute name="domain">[('partner_id', '=', partner_bank_filter_type_domain),
                     '|',('company_id', '=', company_id),('company_id', '=', False)]</attribute>
-                <attribute name="attrs">{'required': [('bank_account_required', '=', True)]}</attribute>
+                <attribute name="attrs">{'required': [('bank_account_required', '=', True)], 'readonly': [('state', '!=', 'draft')]}</attribute>
                 <attribute name="context">{'default_partner_id':commercial_partner_id}</attribute>
             </field>
         </field>