nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(test): value after depreciation for asset doc

Browse Source
This commit is contained in:
Khushi Rawat
2025-01-29 15:42:09 +05:30
parent 223e8e1bdb
commit c7cc7d61d1
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@@ -397,9 +397,8 @@ class JournalEntry(AccountsController):
if asset.calculate_depreciation: if asset.calculate_depreciation:
self.update_journal_entry_link_on_depr_schedule(asset, d) self.update_journal_entry_link_on_depr_schedule(asset, d)
self.update_value_after_depreciation(asset, d.debit) self.update_value_after_depreciation(asset, d.debit)
else:
asset.db_set("value_after_depreciation", asset.value_after_depreciation - d.debit)
asset.db_set("value_after_depreciation", asset.value_after_depreciation - d.debit)
asset.set_status() asset.set_status()
asset.set_total_booked_depreciations() asset.set_total_booked_depreciations()
@@ -549,8 +548,7 @@ class JournalEntry(AccountsController):
fb_row = asset.get("finance_books")[fb_idx - 1] fb_row = asset.get("finance_books")[fb_idx - 1]
fb_row.value_after_depreciation += d.debit fb_row.value_after_depreciation += d.debit
fb_row.db_update() fb_row.db_update()
else: asset.db_set("value_after_depreciation", asset.value_after_depreciation + d.debit)
asset.db_set("value_after_depreciation", asset.value_after_depreciation + d.debit)
asset.set_status() asset.set_status()
asset.set_total_booked_depreciations() asset.set_total_booked_depreciations()
elif self.voucher_type == "Journal Entry" and d.reference_type == "Asset" and d.reference_name: elif self.voucher_type == "Journal Entry" and d.reference_type == "Asset" and d.reference_name:

1
erpnext/assets/doctype/asset/asset.json
View File

@@ -428,6 +428,7 @@
"fieldname": "split_from", "fieldname": "split_from",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Split From", "label": "Split From",
"no_copy": 1,
"options": "Asset", "options": "Asset",
"read_only": 1 "read_only": 1
}, },

2
erpnext/assets/doctype/asset/test_asset.py
View File

@@ -1537,7 +1537,7 @@ class TestDepreciationBasics(AssetSetup):
) )
self.assertSequenceEqual(gle, expected_gle) self.assertSequenceEqual(gle, expected_gle)
self.assertEqual(asset.get("value_after_depreciation"), 0) self.assertEqual(asset.get("value_after_depreciation"), 70000)
def test_expected_value_change(self): def test_expected_value_change(self):
""" """