diff --git a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js
index 91506c0ab3951bcc9b89214516f496dc97778d6e..43c25cd96d1ec44b1519ed00f1b83a9a92b31b53 100644
--- a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js
+++ b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js
@@ -14,20 +14,28 @@ frappe.query_reports["Purchase Order Analysis"] = {
 			"default": frappe.defaults.get_default("company")
 		},
 		{
-			"fieldname":"from_date",
-			"label": __("From Date"),
-			"fieldtype": "Date",
-			"width": "80",
-			"reqd": 1,
-			"default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+			fieldname: "from_date",
+			label: __("From Date"),
+			fieldtype: "Date",
+			width: "80",
+			reqd: 1,
+			default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+			on_change: (report) => {
+				report.set_filter_value("name", []);
+				report.refresh();
+			},
 		},
 		{
-			"fieldname":"to_date",
-			"label": __("To Date"),
-			"fieldtype": "Date",
-			"width": "80",
-			"reqd": 1,
-			"default": frappe.datetime.get_today()
+			fieldname: "to_date",
+			label: __("To Date"),
+			fieldtype: "Date",
+			width: "80",
+			reqd: 1,
+			default: frappe.datetime.get_today(),
+			on_change: (report) => {
+				report.set_filter_value("name", []);
+				report.refresh();
+			},
 		},
 		{
 			"fieldname":"project",
@@ -37,26 +45,38 @@ frappe.query_reports["Purchase Order Analysis"] = {
 			"options": "Project"
 		},
 		{
-			"fieldname": "name",
-			"label": __("Purchase Order"),
-			"fieldtype": "Link",
-			"width": "80",
-			"options": "Purchase Order",
-			"get_query": () =>{
-				return {
-					filters: { "docstatus": 1 }
-				}
-			}
+			fieldname: "name",
+			label: __("Purchase Order"),
+			fieldtype: "MultiSelectList",
+			width: "80",
+			options: "Purchase Order",
+			get_data: function (txt) {
+				let filters = { docstatus: 1 };
+
+				const from_date = frappe.query_report.get_filter_value("from_date");
+				const to_date = frappe.query_report.get_filter_value("to_date");
+				if (from_date && to_date) filters["transaction_date"] = ["between", [from_date, to_date]];
+
+				return frappe.db.get_link_options("Purchase Order", txt, filters);
+			},
 		},
 		{
-			"fieldname": "status",
-			"label": __("Status"),
-			"fieldtype": "MultiSelectList",
-			"width": "80",
-			get_data: function(txt) {
-				let status = ["To Bill", "To Receive", "To Receive and Bill", "Completed"]
-				let options = []
-				for (let option of status){
+			fieldname: "status",
+			label: __("Status"),
+			fieldtype: "MultiSelectList",
+			width: "80",
+			options: ["To Pay", "To Bill", "To Receive", "To Receive and Bill", "Completed", "Closed"],
+			get_data: function (txt) {
+				let status = [
+					"To Pay",
+					"To Bill",
+					"To Receive",
+					"To Receive and Bill",
+					"Completed",
+					"Closed",
+				];
+				let options = [];
+				for (let option of status) {
 					options.push({
 						"value": option,
 						"label": __(option),
diff --git a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py
index 2f55cb421583eef6712b24119397c0afab3bd377..261f5c052a2930455bcb92c93e2356518fe54a0a 100644
--- a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py
+++ b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py
@@ -70,14 +70,16 @@ def get_data(filters):
 			po.company,
 			po_item.name,
 		)
-		.where((po_item.parent == po.name) & (po.status.notin(("Stopped", "Closed"))) & (po.docstatus == 1))
+		.where((po_item.parent == po.name) & (po.status.notin(("Stopped", "On Hold"))) & (po.docstatus == 1))
 		.groupby(po_item.name)
 		.orderby(po.transaction_date)
 	)
 
-	for field in ("company", "name"):
-		if filters.get(field):
-			query = query.where(po[field] == filters.get(field))
+	if filters.get("company"):
+		query = query.where(po.company == filters.get("company"))
+
+	if filters.get("name"):
+		query = query.where(po.name.isin(filters.get("name")))
 
 	if filters.get("from_date") and filters.get("to_date"):
 		query = query.where(po.transaction_date.between(filters.get("from_date"), filters.get("to_date")))
diff --git a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.js b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
index 8951cf68a753c516cc10283d64d6bdf39deea50c..d067b5afb125474a9a0e65078daeb9e198df2021 100644
--- a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
+++ b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
@@ -14,45 +14,62 @@ frappe.query_reports["Sales Order Analysis"] = {
 			"default": frappe.defaults.get_default("company")
 		},
 		{
-			"fieldname":"from_date",
-			"label": __("From Date"),
-			"fieldtype": "Date",
-			"width": "80",
-			"reqd": 1,
-			"default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+			fieldname: "from_date",
+			label: __("From Date"),
+			fieldtype: "Date",
+			width: "80",
+			reqd: 1,
+			default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+			on_change: (report) => {
+				report.set_filter_value("sales_order", []);
+				report.refresh();
+			},
 		},
 		{
-			"fieldname":"to_date",
-			"label": __("To Date"),
-			"fieldtype": "Date",
-			"width": "80",
-			"reqd": 1,
-			"default": frappe.datetime.get_today()
+			fieldname: "to_date",
+			label: __("To Date"),
+			fieldtype: "Date",
+			width: "80",
+			reqd: 1,
+			default: frappe.datetime.get_today(),
+			on_change: (report) => {
+				report.set_filter_value("sales_order", []);
+				report.refresh();
+			},
 		},
 		{
-			"fieldname": "sales_order",
-			"label": __("Sales Order"),
-			"fieldtype": "MultiSelectList",
-			"width": "80",
-			"options": "Sales Order",
-			"get_data": function(txt) {
-				return frappe.db.get_link_options("Sales Order", txt);
+			fieldname: "sales_order",
+			label: __("Sales Order"),
+			fieldtype: "MultiSelectList",
+			width: "80",
+			options: "Sales Order",
+			get_data: function (txt) {
+				let filters = { docstatus: 1 };
+
+				const from_date = frappe.query_report.get_filter_value("from_date");
+				const to_date = frappe.query_report.get_filter_value("to_date");
+				if (from_date && to_date) filters["transaction_date"] = ["between", [from_date, to_date]];
+
+				return frappe.db.get_link_options("Sales Order", txt, filters);
 			},
-			"get_query": () =>{
-				return {
-					filters: { "docstatus": 1 }
-				}
-			}
 		},
 		{
-			"fieldname": "status",
-			"label": __("Status"),
-			"fieldtype": "MultiSelectList",
-			"width": "80",
-			get_data: function(txt) {
-				let status = ["To Bill", "To Deliver", "To Deliver and Bill", "Completed"]
-				let options = []
-				for (let option of status){
+			fieldname: "status",
+			label: __("Status"),
+			fieldtype: "MultiSelectList",
+			options: ["To Pay", "To Bill", "To Deliver", "To Deliver and Bill", "Completed", "Closed"],
+			width: "80",
+			get_data: function (txt) {
+				let status = [
+					"To Pay",
+					"To Bill",
+					"To Deliver",
+					"To Deliver and Bill",
+					"Completed",
+					"Closed",
+				];
+				let options = [];
+				for (let option of status) {
 					options.push({
 						"value": option,
 						"label": __(option),
diff --git a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py
index b225dc6c7626a004f28a57414378b00eabb8ee9b..e41c075ba443c1f1d8b113b4e50549febd6dbccb 100644
--- a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py
+++ b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py
@@ -83,7 +83,7 @@ def get_data(conditions, filters):
 			ON sii.so_detail = soi.name and sii.docstatus = 1
 		WHERE
 			soi.parent = so.name
-			and so.status not in ('Stopped', 'Closed', 'On Hold')
+			and so.status not in ('Stopped', 'On Hold')
 			and so.docstatus = 1
 			{conditions}
 		GROUP BY soi.name