nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-25 17:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(manufacturing): add sales order fields in subassembly child table

Browse Source 
(cherry picked from commit c2282eaf08)

# 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
This commit is contained in:
Sudharsanan11
2026-02-11 23:45:38 +05:30
committed by Mergify
parent 9ece276e76
commit bcab67d8c7
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
View File

@@ -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",

6
erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.py
View File

@@ -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