diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 47646295b2e..6154b6e7a93 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -427,6 +427,7 @@ def get_batches_from_stock_ledger_entries(searchfields, txt, filters, start=0, p
 			& (stock_ledger_entry.batch_no.isnotnull())
 		)
 		.groupby(stock_ledger_entry.batch_no, stock_ledger_entry.warehouse)
+		.having(Sum(stock_ledger_entry.actual_qty) > 0)
 		.offset(start)
 		.limit(page_len)
 	)
@@ -477,6 +478,7 @@ def get_batches_from_serial_and_batch_bundle(searchfields, txt, filters, start=0
 			& (stock_ledger_entry.serial_and_batch_bundle.isnotnull())
 		)
 		.groupby(bundle.batch_no, bundle.warehouse)
+		.having(Sum(bundle.qty) > 0)
 		.offset(start)
 		.limit(page_len)
 	)
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index c4eb38342a8..9de2631af62 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -2308,6 +2308,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 
 			if (doc.is_return) {
 				filters["is_return"] = 1;
+				if (["Sales Invoice", "Delivery Note"].includes(doc.doctype)) {
+					filters["is_inward"] = 1;
+				}
 			}
 
 			if (item.warehouse) filters["warehouse"] = item.warehouse;
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 4e00de0d7ce..c54876713c3 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -111,7 +111,9 @@ frappe.ui.form.on("Stock Entry", {
 				// or a pre-existing batch
 				if (frm.doc.purpose != "Material Receipt") {
 					filters["warehouse"] = item.s_warehouse || item.t_warehouse;
-				} else {
+				}
+
+				if (!item.s_warehouse && item.t_warehouse) {
 					filters["is_inward"] = 1;
 				}
 
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.js b/erpnext/stock/doctype/stock_settings/stock_settings.js
index 1972b193732..0443f3f1ece 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.js
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.js
@@ -14,6 +14,22 @@ frappe.ui.form.on("Stock Settings", {
 		frm.set_query("default_warehouse", filters);
 		frm.set_query("sample_retention_warehouse", filters);
 	},
+
+	use_serial_batch_fields(frm) {
+		if (frm.doc.use_serial_batch_fields && !frm.doc.disable_serial_no_and_batch_selector) {
+			frm.set_value("disable_serial_no_and_batch_selector", 1);
+		}
+	},
+
+	disable_serial_no_and_batch_selector(frm) {
+		if (!frm.doc.disable_serial_no_and_batch_selector && frm.doc.use_serial_batch_fields) {
+			frm.set_value("disable_serial_no_and_batch_selector", 1);
+			frappe.msgprint(
+				__("Serial No and Batch Selector cannot be use when Use Serial / Batch Fields is enabled.")
+			);
+		}
+	},
+
 	allow_negative_stock: function (frm) {
 		if (!frm.doc.allow_negative_stock) {
 			return;