From bcab67d8c74f7178c6ecc6483694d7fac73e3bc7 Mon Sep 17 00:00:00 2001
From: Sudharsanan11 <sudharsananashok1975@gmail.com>
Date: Wed, 11 Feb 2026 23:45:38 +0530
Subject: [PATCH] fix(manufacturing): add sales order fields in subassembly
 child table

(cherry picked from commit c2282eaf083b8fa7802bdeaffc1889b761101d8e)

# Conflicts:
#	erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
#	erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.py
---
 .../production_plan_sub_assembly_item.json    | 30 +++++++++++++++++++
 .../production_plan_sub_assembly_item.py      |  6 ++++
 2 files changed, 36 insertions(+)

diff --git a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
index b5f6a3ab065..8cc1e2126ab 100644
--- a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
+++ b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -16,6 +16,13 @@
   "bom_level",
   "type_of_manufacturing",
   "supplier",
+<<<<<<< HEAD
+=======
+  "purchase_order",
+  "column_break_oqry",
+  "sales_order",
+  "sales_order_item",
+>>>>>>> c2282eaf08 (fix(manufacturing): add sales order fields in subassembly child table)
   "work_order_details_section",
   "wo_produced_qty",
   "purchase_order",
@@ -212,12 +219,35 @@
    "label": "Ordered Qty",
    "no_copy": 1,
    "read_only": 1
+  },
+  {
+   "fieldname": "column_break_oqry",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "sales_order",
+   "fieldtype": "Link",
+   "label": "Sales Order",
+   "options": "Sales Order",
+   "read_only": 1
+  },
+  {
+   "fieldname": "sales_order_item",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Sales Order Item",
+   "no_copy": 1,
+   "print_hide": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2025-06-10 13:36:24.759101",
+=======
+ "modified": "2026-02-11 13:00:09.092676",
+>>>>>>> c2282eaf08 (fix(manufacturing): add sales order fields in subassembly child table)
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Production Plan Sub Assembly Item",
diff --git a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.py b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.py
index 7e29675136c..5462d01a499 100644
--- a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.py
+++ b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.py
@@ -33,6 +33,12 @@ class ProductionPlanSubAssemblyItem(Document):
 		purchase_order: DF.Link | None
 		qty: DF.Float
 		received_qty: DF.Float
+<<<<<<< HEAD
+=======
+		required_qty: DF.Float
+		sales_order: DF.Link | None
+		sales_order_item: DF.Data | None
+>>>>>>> c2282eaf08 (fix(manufacturing): add sales order fields in subassembly child table)
 		schedule_date: DF.Datetime | None
 		stock_uom: DF.Link | None
 		supplier: DF.Link | None