mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-18 12:39:18 +00:00
fix: correct display depends on condition (#54548)
(cherry picked from commit 5281d60f2d)
# Conflicts:
# erpnext/stock/doctype/packed_item/packed_item.json
This commit is contained in:
@@ -119,6 +119,10 @@
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"depends_on": "eval:!['Sales Order', 'Quotation'].includes(parent.doctype)",
|
||||
>>>>>>> 5281d60f2d (fix: correct display depends on condition (#54548))
|
||||
"fieldname": "section_break_9",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
@@ -285,7 +289,11 @@
|
||||
"label": "Use Serial No / Batch Fields"
|
||||
},
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
"depends_on": "eval:doc.use_serial_batch_fields === 1",
|
||||
=======
|
||||
"depends_on": "eval:doc.use_serial_batch_fields === 1 && !['Sales Order', 'Quotation'].includes(parent.doctype)",
|
||||
>>>>>>> 5281d60f2d (fix: correct display depends on condition (#54548))
|
||||
"fieldname": "section_break_bgys",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
@@ -314,7 +322,11 @@
|
||||
"index_web_pages_for_search": 1,
|
||||
"istable": 1,
|
||||
"links": [],
|
||||
<<<<<<< HEAD
|
||||
"modified": "2026-03-16 18:10:47.511381",
|
||||
=======
|
||||
"modified": "2026-04-27 14:12:53.236906",
|
||||
>>>>>>> 5281d60f2d (fix: correct display depends on condition (#54548))
|
||||
"modified_by": "Administrator",
|
||||
"module": "Stock",
|
||||
"name": "Packed Item",
|
||||
|
||||
Reference in New Issue
Block a user