mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-14 10:13:57 +00:00
feat: add asset name column
(cherry picked from commit f3eda02972)
# Conflicts:
# erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
This commit is contained in:
@@ -119,7 +119,12 @@ def get_assets_details(assets):
|
||||
|
||||
fields = [
|
||||
"name as asset",
|
||||
<<<<<<< HEAD
|
||||
"gross_purchase_amount",
|
||||
=======
|
||||
"asset_name",
|
||||
"net_purchase_amount",
|
||||
>>>>>>> f3eda02972 (feat: add asset name column)
|
||||
"opening_accumulated_depreciation",
|
||||
"asset_category",
|
||||
"status",
|
||||
@@ -143,6 +148,12 @@ def get_columns():
|
||||
"options": "Asset",
|
||||
"width": 120,
|
||||
},
|
||||
{
|
||||
"label": _("Asset Name"),
|
||||
"fieldname": "asset_name",
|
||||
"fieldtype": "Data",
|
||||
"width": 140,
|
||||
},
|
||||
{
|
||||
"label": _("Depreciation Date"),
|
||||
"fieldname": "depreciation_date",
|
||||
|
||||
Reference in New Issue
Block a user