diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json
index 31726dff277..ccc0df9fcb1 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -118,6 +118,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"
   },
@@ -284,7 +288,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"
   },
@@ -304,7 +312,11 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2025-07-09 19:12:45.850219",
+=======
+ "modified": "2026-04-27 14:12:53.236906",
+>>>>>>> 5281d60f2d (fix: correct display depends on condition (#54548))
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Packed Item",