From 0b6b73b5004fc61b83cdc0563c41318c7b8ead7a Mon Sep 17 00:00:00 2001 From: Sudharsanan11 Date: Tue, 16 Dec 2025 17:58:20 +0530 Subject: [PATCH 1/3] fix(buying): add disabled filter for supplier (cherry picked from commit 6cc2290f6e0939000a4a6f5e903cf4e850bda5e8) # Conflicts: # erpnext/buying/doctype/request_for_quotation/request_for_quotation.js --- .../request_for_quotation/request_for_quotation.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js index e88a98759d0..5782a3960ad 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js @@ -549,10 +549,20 @@ erpnext.buying.RequestforQuotationController = class RequestforQuotationControll callback: load_suppliers, }); } else if (args.supplier_group) { +<<<<<<< HEAD return frappe.call({ method: "frappe.client.get_list", args: { doctype: "Supplier", +======= + frappe.db + .get_list("Supplier", { + filters: { + supplier_group: args.supplier_group, + disabled: 0, + }, + limit: 100, +>>>>>>> 6cc2290f6e (fix(buying): add disabled filter for supplier) order_by: "name", fields: ["name"], filters: [["Supplier", "supplier_group", "=", args.supplier_group]], From 7f91f95f958ae6edf329ff5d752637c8df27962f Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 18 Dec 2025 15:37:23 +0530 Subject: [PATCH 2/3] chore: resolve conflicts --- .../request_for_quotation/request_for_quotation.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js index 5782a3960ad..c1c1999a017 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js @@ -549,23 +549,13 @@ erpnext.buying.RequestforQuotationController = class RequestforQuotationControll callback: load_suppliers, }); } else if (args.supplier_group) { -<<<<<<< HEAD return frappe.call({ method: "frappe.client.get_list", args: { doctype: "Supplier", -======= - frappe.db - .get_list("Supplier", { - filters: { - supplier_group: args.supplier_group, - disabled: 0, - }, - limit: 100, ->>>>>>> 6cc2290f6e (fix(buying): add disabled filter for supplier) order_by: "name", fields: ["name"], - filters: [["Supplier", "supplier_group", "=", args.supplier_group]], + filters: [["Supplier", "supplier_group", "=", args.supplier_group], ["disabled", "=", 0]], }, callback: load_suppliers, }); From 5f295c5310d044094c9cad201b4ed765c28dfa7e Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 23 Dec 2025 20:47:16 +0530 Subject: [PATCH 3/3] chore: resolve conflicts --- .../request_for_quotation.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js index 5782a3960ad..6ab5048082e 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js @@ -549,23 +549,16 @@ erpnext.buying.RequestforQuotationController = class RequestforQuotationControll callback: load_suppliers, }); } else if (args.supplier_group) { -<<<<<<< HEAD return frappe.call({ method: "frappe.client.get_list", args: { doctype: "Supplier", -======= - frappe.db - .get_list("Supplier", { - filters: { - supplier_group: args.supplier_group, - disabled: 0, - }, - limit: 100, ->>>>>>> 6cc2290f6e (fix(buying): add disabled filter for supplier) order_by: "name", fields: ["name"], - filters: [["Supplier", "supplier_group", "=", args.supplier_group]], + filters: [ + ["Supplier", "supplier_group", "=", args.supplier_group], + ["disabled", "=", 0], + ], }, callback: load_suppliers, });