From d5fb961455718510c9617a65dee3cd7f8ffbc3d5 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 28 Mar 2024 12:07:49 +0530 Subject: [PATCH 1/2] fix: Filters in trend reports --- .../purchase_invoice_trends.js | 6 +----- .../sales_invoice_trends.js | 6 +----- .../purchase_order_trends.js | 6 +----- erpnext/public/js/erpnext.bundle.js | 3 ++- erpnext/public/js/purchase_trends_filters.js | 8 ++++---- erpnext/public/js/sales_trends_filters.js | 18 +++++++++--------- .../quotation_trends/quotation_trends.js | 7 +------ .../sales_order_trends/sales_order_trends.js | 6 +----- .../delivery_note_trends.js | 7 +------ .../purchase_receipt_trends.js | 7 +------ 10 files changed, 22 insertions(+), 52 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 a95cfacaee..0e84f882b5 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() - } -}); \ No newline at end of file +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 2d320f52cf..bdc39f36a8 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() - } -}); \ No newline at end of file +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 83d25d80ba..56684a8659 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() - } -}); \ No newline at end of file +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 0271263c34..88b4b4af18 100644 --- a/erpnext/public/js/erpnext.bundle.js +++ b/erpnext/public/js/erpnext.bundle.js @@ -35,7 +35,8 @@ import "./utils/landed_taxes_and_charges_common.js"; import "./utils/sales_common.js"; import "./controllers/buying.js"; import "./financial_statements.js"; -import "./projects/pm/ProjectManagementView.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 6b9254e1bb..7351a97d7d 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"), @@ -67,5 +67,5 @@ erpnext.get_purchase_trends_filters = function() { ], "default": "" }, - ]; -} \ No newline at end of file + ], +}; diff --git a/erpnext/public/js/sales_trends_filters.js b/erpnext/public/js/sales_trends_filters.js index cb7a1c62bf..d4111c43be 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"), @@ -44,11 +44,11 @@ erpnext.get_sales_trends_filters = function() { "default": "" }, { - "fieldname":"fiscal_year", - "label": __("Fiscal Year"), - "fieldtype": "Link", - "options":'Fiscal Year', - "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()), + fieldname: "fiscal_year", + label: __("Fiscal Year"), + fieldtype: "Link", + options: "Fiscal Year", + default: "2023-2024", }, { "fieldname":"company", @@ -57,5 +57,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 f00ca278b0..ff0b30847d 100644 --- a/erpnext/selling/report/quotation_trends/quotation_trends.js +++ b/erpnext/selling/report/quotation_trends/quotation_trends.js @@ -1,9 +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 ea320d6b48..28bd550493 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() - } -}); \ No newline at end of file +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 ade004cde4..67cf0ca9c3 100644 --- a/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js +++ b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js @@ -1,9 +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 d16485e8cc..8a293e659f 100644 --- a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js +++ b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js @@ -1,9 +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); -- GitLab From 61af43c5baa2aae7e8b3aab92a9d782f910480d3 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 28 Mar 2024 12:25:42 +0530 Subject: [PATCH 2/2] chore: remove hardcoded FY --- erpnext/public/js/sales_trends_filters.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/public/js/sales_trends_filters.js b/erpnext/public/js/sales_trends_filters.js index d4111c43be..0f003fb65d 100644 --- a/erpnext/public/js/sales_trends_filters.js +++ b/erpnext/public/js/sales_trends_filters.js @@ -48,7 +48,7 @@ erpnext.sales_trends_filters = { label: __("Fiscal Year"), fieldtype: "Link", options: "Fiscal Year", - default: "2023-2024", + default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()), }, { "fieldname":"company", -- GitLab