diff --git a/erpnext/stock/doctype/batch/batch.js b/erpnext/stock/doctype/batch/batch.js
index 7c9c0eeb09a..d0b444129ce 100644
--- a/erpnext/stock/doctype/batch/batch.js
+++ b/erpnext/stock/doctype/batch/batch.js
@@ -72,7 +72,8 @@ frappe.ui.form.on("Batch", {
 					consider_negative_batches: 1,
 				},
 				callback: (r) => {
-					if (!r.message) {
+					if (!r.message || r.message.length === 0) {
+						frm.dashboard.add_comment(__("No stock available for this batch."), "Blue", true);
 						return;
 					}
 
diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json
index 0520eb79e24..d312a491db6 100644
--- a/erpnext/stock/doctype/batch/batch.json
+++ b/erpnext/stock/doctype/batch/batch.json
@@ -7,10 +7,6 @@
  "document_type": "Setup",
  "engine": "InnoDB",
  "field_order": [
-  "sb_disabled",
-  "disabled",
-  "column_break_24",
-  "use_batchwise_valuation",
   "sb_batch",
   "batch_id",
   "item",
@@ -22,11 +18,14 @@
   "batch_qty",
   "stock_uom",
   "expiry_date",
+  "use_batchwise_valuation",
+  "disabled",
   "source",
-  "supplier",
   "column_break_9",
   "reference_doctype",
   "reference_name",
+  "column_break_xrll",
+  "supplier",
   "section_break_7",
   "description",
   "manufacturing_section",
@@ -37,9 +36,11 @@
  "fields": [
   {
    "default": "0",
+   "depends_on": "eval:!doc.__islocal",
    "fieldname": "disabled",
    "fieldtype": "Check",
-   "label": "Disabled"
+   "label": "Disabled",
+   "report_hide": 1
   },
   {
    "depends_on": "eval:doc.__islocal",
@@ -68,7 +69,7 @@
    "fieldname": "image",
    "fieldtype": "Attach Image",
    "hidden": 1,
-   "label": "image"
+   "label": "Image"
   },
   {
    "depends_on": "eval:doc.parent_batch",
@@ -137,10 +138,6 @@
    "oldfieldtype": "Small Text",
    "width": "300px"
   },
-  {
-   "fieldname": "sb_disabled",
-   "fieldtype": "Section Break"
-  },
   {
    "fieldname": "sb_batch",
    "fieldtype": "Section Break",
@@ -190,10 +187,6 @@
    "label": "Produced Qty",
    "read_only": 1
   },
-  {
-   "fieldname": "column_break_24",
-   "fieldtype": "Column Break"
-  },
   {
    "default": "0",
    "fieldname": "use_batchwise_valuation",
@@ -201,6 +194,10 @@
    "label": "Use Batch-wise Valuation",
    "read_only": 1,
    "set_only_once": 1
+  },
+  {
+   "fieldname": "column_break_xrll",
+   "fieldtype": "Column Break"
   }
  ],
  "icon": "fa fa-archive",
@@ -208,7 +205,7 @@
  "image_field": "image",
  "links": [],
  "max_attachments": 5,
- "modified": "2024-03-27 13:06:38.677265",
+ "modified": "2026-04-17 12:45:34.810373",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Batch",
@@ -230,6 +227,7 @@
   }
  ],
  "quick_entry": 1,
+ "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],