diff --git a/erpnext/assets/doctype/asset_category/asset_category.json b/erpnext/assets/doctype/asset_category/asset_category.json index 888da4865a9..d9f5d8de1e9 100644 --- a/erpnext/assets/doctype/asset_category/asset_category.json +++ b/erpnext/assets/doctype/asset_category/asset_category.json @@ -12,6 +12,7 @@ "column_break_3", "depreciation_options", "enable_cwip_accounting", + "non_depreciable_category", "finance_book_detail", "finance_books", "section_break_2", @@ -63,10 +64,16 @@ "fieldname": "enable_cwip_accounting", "fieldtype": "Check", "label": "Enable Capital Work in Progress Accounting" + }, + { + "default": "0", + "fieldname": "non_depreciable_category", + "fieldtype": "Check", + "label": "Non Depreciable Category" } ], "links": [], - "modified": "2024-03-27 13:06:33.840414", + "modified": "2025-05-13 15:33:03.791814", "modified_by": "Administrator", "module": "Assets", "name": "Asset Category", @@ -111,9 +118,10 @@ "write": 1 } ], + "row_format": "Dynamic", "show_name_in_global_search": 1, "sort_field": "creation", "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/assets/doctype/asset_category/asset_category.py b/erpnext/assets/doctype/asset_category/asset_category.py index 8c2d301a895..16e564ad1bd 100644 --- a/erpnext/assets/doctype/asset_category/asset_category.py +++ b/erpnext/assets/doctype/asset_category/asset_category.py @@ -17,15 +17,14 @@ class AssetCategory(Document): if TYPE_CHECKING: from frappe.types import DF - from erpnext.assets.doctype.asset_category_account.asset_category_account import ( - AssetCategoryAccount, - ) + from erpnext.assets.doctype.asset_category_account.asset_category_account import AssetCategoryAccount from erpnext.assets.doctype.asset_finance_book.asset_finance_book import AssetFinanceBook accounts: DF.Table[AssetCategoryAccount] asset_category_name: DF.Data enable_cwip_accounting: DF.Check finance_books: DF.Table[AssetFinanceBook] + non_depreciable_category: DF.Check # end: auto-generated types def validate(self):