diff --git a/account_payment_order/models/account_move.py b/account_payment_order/models/account_move.py
index 9ce61841de6..0828433eef0 100644
--- a/account_payment_order/models/account_move.py
+++ b/account_payment_order/models/account_move.py
@@ -23,9 +23,9 @@ class AccountMove(models.Model):
     # payment mode or company level
     reference_type = fields.Selection(
         selection=[("none", "Free Reference"), ("structured", "Structured Reference")],
-        readonly=True,
         states={"draft": [("readonly", False)]},
         default="none",
+        string="Payment Reference Type",
     )
     payment_line_count = fields.Integer(compute="_compute_payment_line_count")
 
diff --git a/account_payment_order/views/account_invoice_view.xml b/account_payment_order/views/account_invoice_view.xml
index a9ceaf6ea70..9fcaaf24006 100644
--- a/account_payment_order/views/account_invoice_view.xml
+++ b/account_payment_order/views/account_invoice_view.xml
@@ -61,8 +61,7 @@
             <field name="payment_reference" position="before">
                 <field
                     name="reference_type"
-                    attrs="{'readonly':[('state','!=','draft')],
-                            'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund'))],
+                    attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund', 'in_invoice', 'in_refund', 'out_receipt', 'in_receipt'))],
                             'required': [('move_type', 'in', ('out_invoice', 'out_refund'))]}"
                 />
             </field>