From f05e8ed0ce264b274ed3222e6d95dff6cae8fe33 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 28 Jul 2026 14:10:50 +0530 Subject: [PATCH] fix(setup): scope manufacturing warehouse filters to company Default WIP, Finished Goods and Scrap Warehouse fields on Company listed warehouses of every company. Filter them by the current company and exclude group warehouses, matching the other warehouse fields. (cherry picked from commit 632113c3096b57b66376513763fea3deefacefaf) # Conflicts: # erpnext/setup/doctype/company/company.js --- erpnext/setup/doctype/company/company.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js index 1ac0cf1e34f..29f1ea3a8fe 100644 --- a/erpnext/setup/doctype/company/company.js +++ b/erpnext/setup/doctype/company/company.js @@ -69,6 +69,17 @@ frappe.ui.form.on("Company", { }, }; }); + + ["default_wip_warehouse", "default_fg_warehouse", "default_scrap_warehouse"].forEach((fieldname) => { + frm.set_query(fieldname, function (doc) { + return { + filters: { + company: doc.name, + is_group: 0, + }, + }; + }); + }); }, company_name: function (frm) {