CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-25 15:49:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add asset name column

Browse Source 
(cherry picked from commit f3eda02972)

# Conflicts:
#	erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
This commit is contained in:
Rehan Ansari
2025-11-04 22:08:03 +05:30
committed by Mergify
parent c54d995354
commit c48647100f
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
View File

@@ -119,7 +119,12 @@ def get_assets_details(assets):
fields = [ fields = [
"name as asset", "name as asset",
<<<<<<< HEAD
"gross_purchase_amount", "gross_purchase_amount",
=======
"asset_name",
"net_purchase_amount",
>>>>>>> f3eda02972 (feat: add asset name column)
"opening_accumulated_depreciation", "opening_accumulated_depreciation",
"asset_category", "asset_category",
"status", "status",
@@ -143,6 +148,12 @@ def get_columns():
"options": "Asset", "options": "Asset",
"width": 120, "width": 120,
}, },
{
"label": _("Asset Name"),
"fieldname": "asset_name",
"fieldtype": "Data",
"width": 140,
},
{ {
"label": _("Depreciation Date"), "label": _("Depreciation Date"),
"fieldname": "depreciation_date", "fieldname": "depreciation_date",