nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 14:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts for production_plan.js

Browse Source
This commit is contained in:
Shllokkk
2026-02-18 11:55:50 +05:30
committed by GitHub
parent 973255d261
commit 4619636b42
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/manufacturing/doctype/production_plan/production_plan.js
View File

@@ -16,12 +16,9 @@ frappe.ui.form.on("Production Plan", {
"Work Order": "Work Order / Subcontract PO", "Work Order": "Work Order / Subcontract PO",
"Material Request": "Material Request", "Material Request": "Material Request",
}; };
<<<<<<< HEAD
=======
frm.set_df_property("sub_assembly_items", "cannot_add_rows", true); frm.set_df_property("sub_assembly_items", "cannot_add_rows", true);
frm.set_df_property("mr_items", "cannot_add_rows", true); frm.set_df_property("mr_items", "cannot_add_rows", true);
>>>>>>> 25f979a825 (fix: prevent rows from being added to sub_assembly_items and mr_items)
}, },
setup_queries(frm) { setup_queries(frm) {