mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-24 21:52:21 +01:00
fix: reservation based on field should be read only in SRE
(cherry picked from commit 21452b4c6e)
# Conflicts:
# erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
This commit is contained in:
@@ -261,7 +261,6 @@
|
|||||||
"label": "Serial and Batch Reservation"
|
"label": "Serial and Batch Reservation"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"allow_on_submit": 1,
|
|
||||||
"default": "Qty",
|
"default": "Qty",
|
||||||
"depends_on": "eval: parent.has_serial_no || parent.has_batch_no",
|
"depends_on": "eval: parent.has_serial_no || parent.has_batch_no",
|
||||||
"fieldname": "reservation_based_on",
|
"fieldname": "reservation_based_on",
|
||||||
@@ -269,7 +268,7 @@
|
|||||||
"label": "Reservation Based On",
|
"label": "Reservation Based On",
|
||||||
"no_copy": 1,
|
"no_copy": 1,
|
||||||
"options": "Qty\nSerial and Batch",
|
"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",
|
"fieldname": "column_break_7dxj",
|
||||||
@@ -315,11 +314,15 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2024-02-07 16:05:17.772098",
|
"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",
|
"modified_by": "Administrator",
|
||||||
"module": "Stock",
|
"module": "Stock",
|
||||||
"name": "Stock Reservation Entry",
|
"name": "Stock Reservation Entry",
|
||||||
"naming_rule": "Expression (old style)",
|
"naming_rule": "Expression",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user