From 7f91f95f958ae6edf329ff5d752637c8df27962f Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 18 Dec 2025 15:37:23 +0530 Subject: [PATCH] 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, });