From 03f0395c598e09dd7325f5be5f29d8ab22100ac3 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Mon, 27 Apr 2026 14:37:36 +0530
Subject: [PATCH] fix: correct display depends on condition (#54548)

(cherry picked from commit 5281d60f2d5de130e057ef5be569ef3296ac0fd5)

# Conflicts:
#	erpnext/stock/doctype/packed_item/packed_item.json
---
 erpnext/stock/doctype/packed_item/packed_item.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json
index 1614bfe2ab7..2e49e2994ac 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -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",