From c7cc7d61d13b0bdd635a9b87db35d588c0df536f Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:42:09 +0530 Subject: [PATCH] fix(test): value after depreciation for asset doc --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 6 ++---- erpnext/assets/doctype/asset/asset.json | 1 + erpnext/assets/doctype/asset/test_asset.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 4a79b6ceb2c..456fccd406c 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -397,9 +397,8 @@ class JournalEntry(AccountsController): if asset.calculate_depreciation: self.update_journal_entry_link_on_depr_schedule(asset, d) 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_total_booked_depreciations() @@ -549,8 +548,7 @@ class JournalEntry(AccountsController): fb_row = asset.get("finance_books")[fb_idx - 1] fb_row.value_after_depreciation += d.debit 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_total_booked_depreciations() elif self.voucher_type == "Journal Entry" and d.reference_type == "Asset" and d.reference_name: diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json index 8ea5e87af3c..72f674edfa0 100644 --- a/erpnext/assets/doctype/asset/asset.json +++ b/erpnext/assets/doctype/asset/asset.json @@ -428,6 +428,7 @@ "fieldname": "split_from", "fieldtype": "Link", "label": "Split From", + "no_copy": 1, "options": "Asset", "read_only": 1 }, diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py index 8478c9b6e89..382b6840ac0 100644 --- a/erpnext/assets/doctype/asset/test_asset.py +++ b/erpnext/assets/doctype/asset/test_asset.py @@ -1537,7 +1537,7 @@ class TestDepreciationBasics(AssetSetup): ) 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): """