From cb2b9563e087d1bbd8718d998e9c00941bed4600 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 21 Apr 2025 20:23:14 +0530 Subject: [PATCH 1/2] feat: add button to show request for comparison report directly from RFQ (cherry picked from commit b4aa88b59b112c07e89951687f201b452ede6506) --- .../request_for_quotation.js | 22 +++++++++++++++++++ 1 file changed, 22 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 d7c2c3f24b1..2c0538b1046 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js @@ -155,6 +155,28 @@ frappe.ui.form.on("Request for Quotation", { frm.page.set_inner_btn_group_as_primary(__("Create")); } + + frm.add_custom_button( + __("Supplier Quotation Comparison"), + function () { + frm.trigger("show_supplier_quotation_comparison"); + }, + __("View") + ); + }, + + show_supplier_quotation_comparison(frm) { + const today = new Date(); + const oneMonthAgo = new Date(today); + oneMonthAgo.setMonth(today.getMonth() - 1); + + frappe.route_options = { + company: frm.doc.company, + from_date: moment(oneMonthAgo).format("YYYY-MM-DD"), + to_date: moment(today).format("YYYY-MM-DD"), + request_for_quotation: frm.doc.name, + }; + frappe.set_route("query-report", "Supplier Quotation Comparison"); }, make_supplier_quotation: function (frm) { From 9655bfa1999b4ecd97a1a4dcd7b14b91b151b301 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 21 Apr 2025 20:25:31 +0530 Subject: [PATCH 2/2] fix: show button only when RFQ is submitted (cherry picked from commit ef57d2b3289c3d97aba11b9aac00f038d06de295) --- .../request_for_quotation.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 2c0538b1046..96597bd9753 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js @@ -154,15 +154,15 @@ frappe.ui.form.on("Request for Quotation", { ); frm.page.set_inner_btn_group_as_primary(__("Create")); - } - frm.add_custom_button( - __("Supplier Quotation Comparison"), - function () { - frm.trigger("show_supplier_quotation_comparison"); - }, - __("View") - ); + frm.add_custom_button( + __("Supplier Quotation Comparison"), + function () { + frm.trigger("show_supplier_quotation_comparison"); + }, + __("View") + ); + } }, show_supplier_quotation_comparison(frm) {