nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-12-23 20:47:16 +05:30
parent 0b6b73b500
commit 5f295c5310
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
View File

@@ -549,23 +549,16 @@ erpnext.buying.RequestforQuotationController = class RequestforQuotationControll
callback: load_suppliers, callback: load_suppliers,
}); });
} else if (args.supplier_group) { } else if (args.supplier_group) {
<<<<<<< HEAD
return frappe.call({ return frappe.call({
method: "frappe.client.get_list", method: "frappe.client.get_list",
args: { args: {
doctype: "Supplier", 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", order_by: "name",
fields: ["name"], fields: ["name"],
filters: [["Supplier", "supplier_group", "=", args.supplier_group]], filters: [
["Supplier", "supplier_group", "=", args.supplier_group],
["disabled", "=", 0],
],
}, },
callback: load_suppliers, callback: load_suppliers,
}); });