From eb4f94ddf23a6cecf2612ad974cc54c02b5c59b6 Mon Sep 17 00:00:00 2001 From: Nihantra Patel Date: Mon, 20 May 2024 15:51:27 +0530 Subject: [PATCH 1/3] fix: add include closed orders option in so/po trends report --- .../report/purchase_order_trends/purchase_order_trends.js | 7 +++++++ erpnext/controllers/trends.py | 6 ++++-- .../report/sales_order_trends/sales_order_trends.js | 7 +++++++ 3 files changed, 18 insertions(+), 2 deletions(-) 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 56684a8659b..9bb67d0ffb6 100644 --- a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js +++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js @@ -2,3 +2,10 @@ // License: GNU General Public License v3. See license.txt frappe.query_reports["Purchase Order Trends"] = $.extend({}, erpnext.purchase_trends_filters); + +frappe.query_reports["Purchase Order Trends"]["filters"].push({ + "fieldname": "include_closed_orders", + "label": __("Include Closed Orders"), + "fieldtype": "Check", + "default": 0 +}); \ No newline at end of file diff --git a/erpnext/controllers/trends.py b/erpnext/controllers/trends.py index 18fe7767c5d..7f07466b3bc 100644 --- a/erpnext/controllers/trends.py +++ b/erpnext/controllers/trends.py @@ -74,8 +74,10 @@ def get_data(filters, conditions): if conditions["based_on_select"] in ["t1.project,", "t2.project,"]: cond = " and " + conditions["based_on_select"][:-1] + " IS Not NULL" - if conditions.get("trans") in ["Sales Order", "Purchase Order"]: - cond += " and t1.status != 'Closed'" + + if not filters.get("include_closed_orders"): + if conditions.get("trans") in ["Sales Order", "Purchase Order"]: + cond += " and t1.status != 'Closed'" if conditions.get("trans") == "Quotation" and filters.get("group_by") == "Customer": cond += " and t1.quotation_to = 'Customer'" 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 28bd5504930..4bce8be615e 100644 --- a/erpnext/selling/report/sales_order_trends/sales_order_trends.js +++ b/erpnext/selling/report/sales_order_trends/sales_order_trends.js @@ -2,3 +2,10 @@ // License: GNU General Public License v3. See license.txt frappe.query_reports["Sales Order Trends"] = $.extend({}, erpnext.sales_trends_filters); + +frappe.query_reports["Sales Order Trends"]["filters"].push({ + "fieldname": "include_closed_orders", + "label": __("Include Closed Orders"), + "fieldtype": "Check", + "default": 0 +}); \ No newline at end of file From 6e3782a061fd9a570359dc5607d69267fb5cce97 Mon Sep 17 00:00:00 2001 From: Nihantra Patel Date: Mon, 20 May 2024 15:59:45 +0530 Subject: [PATCH 2/3] fix: add include closed orders option in so/po trends report --- .../report/purchase_order_trends/purchase_order_trends.js | 8 ++++---- .../report/sales_order_trends/sales_order_trends.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) 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 9bb67d0ffb6..47431e6367f 100644 --- a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js +++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js @@ -4,8 +4,8 @@ frappe.query_reports["Purchase Order Trends"] = $.extend({}, erpnext.purchase_trends_filters); frappe.query_reports["Purchase Order Trends"]["filters"].push({ - "fieldname": "include_closed_orders", - "label": __("Include Closed Orders"), - "fieldtype": "Check", - "default": 0 + fieldname: "include_closed_orders", + label: __("Include Closed Orders"), + fieldtype: "Check", + default: 0, }); \ No newline at end of file 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 4bce8be615e..6c14991c1b2 100644 --- a/erpnext/selling/report/sales_order_trends/sales_order_trends.js +++ b/erpnext/selling/report/sales_order_trends/sales_order_trends.js @@ -4,8 +4,8 @@ frappe.query_reports["Sales Order Trends"] = $.extend({}, erpnext.sales_trends_filters); frappe.query_reports["Sales Order Trends"]["filters"].push({ - "fieldname": "include_closed_orders", - "label": __("Include Closed Orders"), - "fieldtype": "Check", - "default": 0 + fieldname: "include_closed_orders", + label: __("Include Closed Orders"), + fieldtype: "Check", + default: 0, }); \ No newline at end of file From 91c9d964f9f89f9f01631967823ea650de1844da Mon Sep 17 00:00:00 2001 From: Nihantra Patel Date: Mon, 20 May 2024 16:02:10 +0530 Subject: [PATCH 3/3] fix: add include closed orders option in so/po trends report --- .../report/purchase_order_trends/purchase_order_trends.js | 2 +- erpnext/selling/report/sales_order_trends/sales_order_trends.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 47431e6367f..9b193a34d83 100644 --- a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js +++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js @@ -8,4 +8,4 @@ frappe.query_reports["Purchase Order Trends"]["filters"].push({ label: __("Include Closed Orders"), fieldtype: "Check", default: 0, -}); \ No newline at end of file +}); 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 6c14991c1b2..a44353cf54b 100644 --- a/erpnext/selling/report/sales_order_trends/sales_order_trends.js +++ b/erpnext/selling/report/sales_order_trends/sales_order_trends.js @@ -8,4 +8,4 @@ frappe.query_reports["Sales Order Trends"]["filters"].push({ label: __("Include Closed Orders"), fieldtype: "Check", default: 0, -}); \ No newline at end of file +});