diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index f37a2785252..8559e1339e2 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -28,7 +28,15 @@
   "column_break_eaoa",
   "set_posting_time",
   "inspection_required",
+<<<<<<< HEAD
   "apply_putaway_rule",
+=======
+  "column_break_jabv",
+  "work_order",
+  "subcontracting_order",
+  "outgoing_stock_entry",
+  "source_stock_entry",
+>>>>>>> d4baa9a74a (fix: create source_stock_entry to refer to original manufacturing entry)
   "bom_info_section",
   "from_bom",
   "use_multi_level_bom",
@@ -120,6 +128,15 @@
    "options": "Stock Entry",
    "read_only": 1
   },
+  {
+   "depends_on": "eval:doc.purpose == 'Disassemble'",
+   "fieldname": "source_stock_entry",
+   "fieldtype": "Link",
+   "label": "Source Stock Entry (Manufacture)",
+   "no_copy": 1,
+   "options": "Stock Entry",
+   "print_hide": 1
+  },
   {
    "bold": 1,
    "fetch_from": "stock_entry_type.purpose",
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index fec92256108..39ee125f676 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -142,7 +142,12 @@ class StockEntry(StockController):
 		scan_barcode: DF.Data | None
 		select_print_heading: DF.Link | None
 		set_posting_time: DF.Check
+<<<<<<< HEAD
 		source_address_display: DF.SmallText | None
+=======
+		source_address_display: DF.TextEditor | None
+		source_stock_entry: DF.Link | None
+>>>>>>> d4baa9a74a (fix: create source_stock_entry to refer to original manufacturing entry)
 		source_warehouse_address: DF.Link | None
 		stock_entry_type: DF.Link
 		subcontracting_order: DF.Link | None