CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 11:13:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflict

Browse Source
This commit is contained in:
Khushi Rawat
2025-11-06 00:51:41 +05:30
committed by GitHub
parent c48647100f
commit 7d593dd3db
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,12 +119,8 @@ def get_assets_details(assets):
fields = [ fields = [
"name as asset", "name as asset",
<<<<<<< HEAD
"gross_purchase_amount",
=======
"asset_name", "asset_name",
"net_purchase_amount", "gross_purchase_amount",
>>>>>>> f3eda02972 (feat: add asset name column)
"opening_accumulated_depreciation", "opening_accumulated_depreciation",
"asset_category", "asset_category",
"status", "status",