diff --git a/rma/models/rma_order_line.py b/rma/models/rma_order_line.py
index 71231cc8..d7456228 100644
--- a/rma/models/rma_order_line.py
+++ b/rma/models/rma_order_line.py
@@ -219,8 +219,8 @@ class RmaOrderLine(models.Model):
         comodel_name="rma.operation",
         required=True,
         string="Operation",
-        readonly=True,
-        states={"draft": [("readonly", False)]},
+        readonly=False,
+        tracking=True,
     )
     assigned_to = fields.Many2one(
         comodel_name="res.users",
@@ -330,8 +330,7 @@ class RmaOrderLine(models.Model):
         required=True,
         string="Receipts Policy",
         default="no",
-        readonly=True,
-        states={"draft": [("readonly", False)]},
+        readonly=False,
     )
     delivery_policy = fields.Selection(
         [
@@ -342,9 +341,8 @@ class RmaOrderLine(models.Model):
         required=True,
         string="Delivery Policy",
         default="no",
-        readonly=True,
+        readonly=False,
         ondelete="cascade",
-        states={"draft": [("readonly", False)]},
     )
     in_route_id = fields.Many2one(
         "stock.location.route",
@@ -584,8 +582,6 @@ class RmaOrderLine(models.Model):
         return True
 
     def action_rma_draft(self):
-        if self.in_shipment_count or self.out_shipment_count:
-            raise UserError(_("You cannot reset to draft a RMA with related pickings."))
         self.write({"state": "draft"})
         return True