CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 09:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Filters in trend reports

Browse Source
This commit is contained in:
ruthra kumar
2024-05-20 10:36:42 +05:30
parent e5e1aadc9a
commit 52d5d7a4d3
10 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
View File

@@ -1,8 +1,4 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // 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"] = $.extend({}, erpnext.purchase_trends_filters);
frappe.query_reports["Purchase Invoice Trends"] = {
filters: erpnext.get_purchase_trends_filters(),
};
});

6
erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
View File

@@ -1,8 +1,4 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // 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"] = $.extend({}, erpnext.sales_trends_filters);
frappe.query_reports["Sales Invoice Trends"] = {
filters: erpnext.get_sales_trends_filters(),
};
});

6
erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
View File

@@ -1,8 +1,4 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // 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"] = $.extend({}, erpnext.purchase_trends_filters);
frappe.query_reports["Purchase Order Trends"] = {
filters: erpnext.get_purchase_trends_filters(),
};
});

2
erpnext/public/js/erpnext.bundle.js
View File

@@ -34,5 +34,7 @@ import "./utils/sales_common.js";
import "./controllers/buying.js"; import "./controllers/buying.js";
import "./utils/demo.js"; import "./utils/demo.js";
import "./financial_statements.js"; import "./financial_statements.js";
import "./sales_trends_filters.js";
import "./purchase_trends_filters.js";
// import { sum } from 'frappe/public/utils/util.js' // import { sum } from 'frappe/public/utils/util.js'

6
erpnext/public/js/purchase_trends_filters.js
View File

@@ -1,8 +1,8 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
erpnext.get_purchase_trends_filters = function () { erpnext.purchase_trends_filters = {
return [ filters: [
{ {
fieldname: "company", fieldname: "company",
label: __("Company"), label: __("Company"),
@@ -63,5 +63,5 @@ erpnext.get_purchase_trends_filters = function () {
options: ["", { value: "Item", label: __("Item") }, { value: "Supplier", label: __("Supplier") }], options: ["", { value: "Item", label: __("Item") }, { value: "Supplier", label: __("Supplier") }],
default: "", default: "",
}, },
]; ],
}; };

6
erpnext/public/js/sales_trends_filters.js
View File

@@ -1,8 +1,8 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
erpnext.get_sales_trends_filters = function () { erpnext.sales_trends_filters = {
return [ filters: [
{ {
fieldname: "period", fieldname: "period",
label: __("Period"), label: __("Period"),
@@ -53,5 +53,5 @@ erpnext.get_sales_trends_filters = function () {
options: "Company", options: "Company",
default: frappe.defaults.get_user_default("Company"), default: frappe.defaults.get_user_default("Company"),
}, },
]; ],
}; };

6
erpnext/selling/report/quotation_trends/quotation_trends.js
View File

@@ -1,8 +1,4 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
frappe.require("assets/erpnext/js/sales_trends_filters.js", function () { frappe.query_reports["Quotation Trends"] = $.extend({}, erpnext.sales_trends_filters);
frappe.query_reports["Quotation Trends"] = {
filters: erpnext.get_sales_trends_filters(),
};
});

6
erpnext/selling/report/sales_order_trends/sales_order_trends.js
View File

@@ -1,8 +1,4 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // 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"] = $.extend({}, erpnext.sales_trends_filters);
frappe.query_reports["Sales Order Trends"] = {
filters: erpnext.get_sales_trends_filters(),
};
});

6
erpnext/stock/report/delivery_note_trends/delivery_note_trends.js
View File

@@ -1,8 +1,4 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // 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"] = $.extend({}, erpnext.sales_trends_filters);
frappe.query_reports["Delivery Note Trends"] = {
filters: erpnext.get_sales_trends_filters(),
};
});

6
erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
View File

@@ -1,8 +1,4 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // 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"] = $.extend({}, erpnext.purchase_trends_filters);
frappe.query_reports["Purchase Receipt Trends"] = {
filters: erpnext.get_purchase_trends_filters(),
};
});