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 a95cfacaeef75c594d8096a3e13bf2f423789366..0e84f882b51103f9d9d4f23d04f45ba5078a44a1 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 2d320f52cfa7f452289aa68cf1c534232784e084..bdc39f36a8e7b3fadfb7b2468daaef138be51fa4 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 83d25d80ba2a9e41f27ef4000c769974ca35c11f..56684a8659bfe878d1ed67cbe9fae0d69fa6d5e5 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 0271263c34a5dbc1494855f47b0f0b1a9f16b6dc..88b4b4af1808fffdb8be1b8b34f2bd3c71c50057 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 6b9254e1bb3aa5f6c02d12b43c0dd64fcc850680..7351a97d7d5c72088504c87c8548d945f6565229 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 cb7a1c62bfe1d631126b85cf7c142ecfaa98e9ac..0f003fb65d46c9ca546a01b5f6ba863677268658 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: erpnext.utils.get_fiscal_year(frappe.datetime.get_today()), }, { "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 f00ca278b009010116808c0159c624caacc3fc89..ff0b30847de3b76e76ef47bb8d35c3ab471f5298 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 ea320d6b48165f4b761d65af70f3330937f260dc..28bd550493006ea3d6c8c5b850658a47f3fbd77f 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 ade004cde42f0cda0a39676bf632ac1370900db7..67cf0ca9c3f93f04b7636fdf11194577f5bfb4c7 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 d16485e8cc6283dca14792225dc9dd09b77b306f..8a293e659fd3f93fa6f2fdcf0211861686184368 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);