From c3626d67ca7ad6c0649ab2415aa7f9379099c58a Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 19 Feb 2026 10:18:26 +0530 Subject: [PATCH 1/2] fix: reservation based on field should be read only in SRE (cherry picked from commit 21452b4c6efa8659801d888b5b1445750789a8c1) # Conflicts: # erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json --- .../stock_reservation_entry/stock_reservation_entry.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json index bf5ea741e3f..8832ec1e2e4 100644 --- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json @@ -261,7 +261,6 @@ "label": "Serial and Batch Reservation" }, { - "allow_on_submit": 1, "default": "Qty", "depends_on": "eval: parent.has_serial_no || parent.has_batch_no", "fieldname": "reservation_based_on", @@ -269,7 +268,7 @@ "label": "Reservation Based On", "no_copy": 1, "options": "Qty\nSerial and Batch", - "read_only_depends_on": "eval: (doc.delivered_qty > 0 || doc.from_voucher_type == \"Pick List\")" + "read_only": 1 }, { "fieldname": "column_break_7dxj", @@ -315,11 +314,15 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2024-02-07 16:05:17.772098", +======= + "modified": "2026-02-19 10:17:28.695394", +>>>>>>> 21452b4c6e (fix: reservation based on field should be read only in SRE) "modified_by": "Administrator", "module": "Stock", "name": "Stock Reservation Entry", - "naming_rule": "Expression (old style)", + "naming_rule": "Expression", "owner": "Administrator", "permissions": [ { From 6d32089d9e8a27865858de3f78cb0743c8bf92d8 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 19 Feb 2026 10:51:40 +0530 Subject: [PATCH 2/2] chore: resolve conflicts --- .../stock_reservation_entry/stock_reservation_entry.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json index 8832ec1e2e4..41bfbd85e22 100644 --- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json @@ -314,11 +314,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2024-02-07 16:05:17.772098", -======= "modified": "2026-02-19 10:17:28.695394", ->>>>>>> 21452b4c6e (fix: reservation based on field should be read only in SRE) "modified_by": "Administrator", "module": "Stock", "name": "Stock Reservation Entry", @@ -428,4 +424,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +}