From b619f6d9065f1b497b804254ecef2046d1d4f5aa Mon Sep 17 00:00:00 2001
From: khushi8112 <khushirawat23@navgurukul.org>
Date: Fri, 6 Feb 2026 15:56:08 +0530
Subject: [PATCH] fix: implement coderabbit suggested changes

(cherry picked from commit d1b81b96a5f251351211282cee6c924564212837)
---
 erpnext/assets/doctype/asset/asset.js         | 25 +++++++++++--------
 erpnext/assets/doctype/asset/asset.json       |  1 -
 .../doctype/asset_repair/asset_repair.json    |  8 +-----
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index a6ad021a99f..5980f265c9d 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -111,7 +111,10 @@ frappe.ui.form.on("Asset", {
 				has_create_buttons = true;
 			}
 
-			if (!frm.doc.calculate_depreciation) {
+			if (
+				!frm.doc.calculate_depreciation &&
+				["Submitted", "Partially Depreciated", "Fully Depreciated"].includes(frm.doc.status)
+			) {
 				frm.add_custom_button(
 					__("Depreciation Entry"),
 					function () {
@@ -126,17 +129,17 @@ frappe.ui.form.on("Asset", {
 				frm.page.set_inner_btn_group_as_primary(__("Create"));
 			}
 
-			if (frm.doc.maintenance_required && !frm.doc.maintenance_schedule) {
-				frm.add_custom_button(
-					__("Maintain Asset"),
-					function () {
-						frm.trigger("create_asset_maintenance");
-					},
-					__("Actions")
-				);
-			}
-
 			if (["Submitted", "Partially Depreciated", "Fully Depreciated"].includes(frm.doc.status)) {
+				if (frm.doc.maintenance_required && !frm.doc.maintenance_schedule) {
+					frm.add_custom_button(
+						__("Maintain Asset"),
+						function () {
+							frm.trigger("create_asset_maintenance");
+						},
+						__("Actions")
+					);
+				}
+
 				frm.add_custom_button(
 					__("Split Asset"),
 					function () {
diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json
index da27e206c06..32f5ce9cf50 100644
--- a/erpnext/assets/doctype/asset/asset.json
+++ b/erpnext/assets/doctype/asset/asset.json
@@ -448,7 +448,6 @@
   },
   {
    "default": "0",
-   "depends_on": "eval:(doc.asset_type == \"Existing Asset\")",
    "fieldname": "is_fully_depreciated",
    "fieldtype": "Check",
    "hidden": 1,
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json
index 1d2fb1c67a0..71b9469cfbd 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.json
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.json
@@ -44,7 +44,6 @@
   "cost_center",
   "column_break_14",
   "project",
-  "accounting_dimension_tab",
   "connection_tab"
  ],
  "fields": [
@@ -261,11 +260,6 @@
    "fieldtype": "Section Break",
    "label": "Accounting Dimension"
   },
-  {
-   "fieldname": "accounting_dimension_tab",
-   "fieldtype": "Tab Break",
-   "label": "Accounting Dimension"
-  },
   {
    "fieldname": "connection_tab",
    "fieldtype": "Tab Break",
@@ -281,7 +275,7 @@
    "link_fieldname": "asset_repair"
   }
  ],
- "modified": "2026-02-06 02:25:37.536357",
+ "modified": "2026-02-06 14:57:54.257572",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Repair",