nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-21 18:36:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add non depreciable category checkbox in asset category

Browse Source 
(cherry picked from commit fbbfd6531b)

# Conflicts:
#	erpnext/assets/doctype/asset_category/asset_category.json
This commit is contained in:
Khushi Rawat
2025-05-13 16:40:59 +05:30
committed by Mergify
parent 165a4fcef6
commit 96d3bfd2d9
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/assets/doctype/asset_category/asset_category.json
View File

@@ -12,6 +12,7 @@
"column_break_3", "column_break_3",
"depreciation_options", "depreciation_options",
"enable_cwip_accounting", "enable_cwip_accounting",
"non_depreciable_category",
"finance_book_detail", "finance_book_detail",
"finance_books", "finance_books",
"section_break_2", "section_break_2",
@@ -63,10 +64,20 @@
"fieldname": "enable_cwip_accounting", "fieldname": "enable_cwip_accounting",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Enable Capital Work in Progress Accounting" "label": "Enable Capital Work in Progress Accounting"
},
{
"default": "0",
"fieldname": "non_depreciable_category",
"fieldtype": "Check",
"label": "Non Depreciable Category"
} }
], ],
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-02-24 15:05:38.621803", "modified": "2021-02-24 15:05:38.621803",
=======
"modified": "2025-05-13 15:33:03.791814",
>>>>>>> fbbfd6531b (feat: add non depreciable category checkbox in asset category)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Category", "name": "Asset Category",
@@ -111,8 +122,9 @@
"write": 1 "write": 1
} }
], ],
"row_format": "Dynamic",
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1
} }

5
erpnext/assets/doctype/asset_category/asset_category.py
View File

@@ -17,15 +17,14 @@ class AssetCategory(Document):
if TYPE_CHECKING: if TYPE_CHECKING:
from frappe.types import DF from frappe.types import DF
from erpnext.assets.doctype.asset_category_account.asset_category_account import ( from erpnext.assets.doctype.asset_category_account.asset_category_account import AssetCategoryAccount
AssetCategoryAccount,
)
from erpnext.assets.doctype.asset_finance_book.asset_finance_book import AssetFinanceBook from erpnext.assets.doctype.asset_finance_book.asset_finance_book import AssetFinanceBook
accounts: DF.Table[AssetCategoryAccount] accounts: DF.Table[AssetCategoryAccount]
asset_category_name: DF.Data asset_category_name: DF.Data
enable_cwip_accounting: DF.Check enable_cwip_accounting: DF.Check
finance_books: DF.Table[AssetFinanceBook] finance_books: DF.Table[AssetFinanceBook]
non_depreciable_category: DF.Check
# end: auto-generated types # end: auto-generated types
def validate(self): def validate(self):