From 52d5d7a4d3fdc475c1db4eb445f40d40e7bed9ec Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 20 May 2024 10:36:42 +0530 Subject: [PATCH] fix: Filters in trend reports --- .../purchase_invoice_trends/purchase_invoice_trends.js | 6 +----- .../report/sales_invoice_trends/sales_invoice_trends.js | 6 +----- .../report/purchase_order_trends/purchase_order_trends.js | 6 +----- erpnext/public/js/erpnext.bundle.js | 2 ++ erpnext/public/js/purchase_trends_filters.js | 6 +++--- erpnext/public/js/sales_trends_filters.js | 6 +++--- erpnext/selling/report/quotation_trends/quotation_trends.js | 6 +----- .../selling/report/sales_order_trends/sales_order_trends.js | 6 +----- .../report/delivery_note_trends/delivery_note_trends.js | 6 +----- .../purchase_receipt_trends/purchase_receipt_trends.js | 6 +----- 10 files changed, 15 insertions(+), 41 deletions(-) diff --git a/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js index e3f90f29982..0e84f882b51 100644 --- a/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js +++ b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js @@ -1,8 +1,4 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.require("assets/erpnext/js/purchase_trends_filters.js", function () { - frappe.query_reports["Purchase Invoice Trends"] = { - filters: erpnext.get_purchase_trends_filters(), - }; -}); +frappe.query_reports["Purchase Invoice Trends"] = $.extend({}, erpnext.purchase_trends_filters); diff --git a/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js index 292d827b163..bdc39f36a8e 100644 --- a/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js +++ b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js @@ -1,8 +1,4 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.require("assets/erpnext/js/sales_trends_filters.js", function () { - frappe.query_reports["Sales Invoice Trends"] = { - filters: erpnext.get_sales_trends_filters(), - }; -}); +frappe.query_reports["Sales Invoice Trends"] = $.extend({}, erpnext.sales_trends_filters); diff --git a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js index 366fff191a0..56684a8659b 100644 --- a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js +++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js @@ -1,8 +1,4 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.require("assets/erpnext/js/purchase_trends_filters.js", function () { - frappe.query_reports["Purchase Order Trends"] = { - filters: erpnext.get_purchase_trends_filters(), - }; -}); +frappe.query_reports["Purchase Order Trends"] = $.extend({}, erpnext.purchase_trends_filters); diff --git a/erpnext/public/js/erpnext.bundle.js b/erpnext/public/js/erpnext.bundle.js index 527d452a450..6e1097072fa 100644 --- a/erpnext/public/js/erpnext.bundle.js +++ b/erpnext/public/js/erpnext.bundle.js @@ -34,5 +34,7 @@ import "./utils/sales_common.js"; import "./controllers/buying.js"; import "./utils/demo.js"; import "./financial_statements.js"; +import "./sales_trends_filters.js"; +import "./purchase_trends_filters.js"; // import { sum } from 'frappe/public/utils/util.js' diff --git a/erpnext/public/js/purchase_trends_filters.js b/erpnext/public/js/purchase_trends_filters.js index 14ffaf82162..75428d3be25 100644 --- a/erpnext/public/js/purchase_trends_filters.js +++ b/erpnext/public/js/purchase_trends_filters.js @@ -1,8 +1,8 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -erpnext.get_purchase_trends_filters = function () { - return [ +erpnext.purchase_trends_filters = { + filters: [ { fieldname: "company", label: __("Company"), @@ -63,5 +63,5 @@ erpnext.get_purchase_trends_filters = function () { options: ["", { value: "Item", label: __("Item") }, { value: "Supplier", label: __("Supplier") }], default: "", }, - ]; + ], }; diff --git a/erpnext/public/js/sales_trends_filters.js b/erpnext/public/js/sales_trends_filters.js index 85daa01ff67..2f8e6f93c61 100644 --- a/erpnext/public/js/sales_trends_filters.js +++ b/erpnext/public/js/sales_trends_filters.js @@ -1,8 +1,8 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -erpnext.get_sales_trends_filters = function () { - return [ +erpnext.sales_trends_filters = { + filters: [ { fieldname: "period", label: __("Period"), @@ -53,5 +53,5 @@ erpnext.get_sales_trends_filters = function () { options: "Company", default: frappe.defaults.get_user_default("Company"), }, - ]; + ], }; diff --git a/erpnext/selling/report/quotation_trends/quotation_trends.js b/erpnext/selling/report/quotation_trends/quotation_trends.js index 8ffeda47b64..ff0b30847de 100644 --- a/erpnext/selling/report/quotation_trends/quotation_trends.js +++ b/erpnext/selling/report/quotation_trends/quotation_trends.js @@ -1,8 +1,4 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.require("assets/erpnext/js/sales_trends_filters.js", function () { - frappe.query_reports["Quotation Trends"] = { - filters: erpnext.get_sales_trends_filters(), - }; -}); +frappe.query_reports["Quotation Trends"] = $.extend({}, erpnext.sales_trends_filters); diff --git a/erpnext/selling/report/sales_order_trends/sales_order_trends.js b/erpnext/selling/report/sales_order_trends/sales_order_trends.js index fe38804ed45..28bd5504930 100644 --- a/erpnext/selling/report/sales_order_trends/sales_order_trends.js +++ b/erpnext/selling/report/sales_order_trends/sales_order_trends.js @@ -1,8 +1,4 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.require("assets/erpnext/js/sales_trends_filters.js", function () { - frappe.query_reports["Sales Order Trends"] = { - filters: erpnext.get_sales_trends_filters(), - }; -}); +frappe.query_reports["Sales Order Trends"] = $.extend({}, erpnext.sales_trends_filters); diff --git a/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js index 5e7dc8b2a63..67cf0ca9c3f 100644 --- a/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js +++ b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js @@ -1,8 +1,4 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.require("assets/erpnext/js/sales_trends_filters.js", function () { - frappe.query_reports["Delivery Note Trends"] = { - filters: erpnext.get_sales_trends_filters(), - }; -}); +frappe.query_reports["Delivery Note Trends"] = $.extend({}, erpnext.sales_trends_filters); diff --git a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js index bddfe5d7705..8a293e659fd 100644 --- a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js +++ b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js @@ -1,8 +1,4 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt -frappe.require("assets/erpnext/js/purchase_trends_filters.js", function () { - frappe.query_reports["Purchase Receipt Trends"] = { - filters: erpnext.get_purchase_trends_filters(), - }; -}); +frappe.query_reports["Purchase Receipt Trends"] = $.extend({}, erpnext.purchase_trends_filters);