From 85d1a237ce13d857ebbecd6a7e196c06d9aa3735 Mon Sep 17 00:00:00 2001 From: Saif Ur Rehman Date: Thu, 4 Nov 2021 14:15:47 +0500 Subject: [PATCH] fix(Asset Capitalization): Reverse depreciation on cancel --- .../assets/doctype/asset_capitalization/asset_capitalization.py | 1 + .../doctype/asset_capitalization/test_asset_capitalization.py | 1 + 2 files changed, 2 insertions(+) diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py index 7d08581cbef..a8f2d79c270 100644 --- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py @@ -371,6 +371,7 @@ class AssetCapitalization(StockController): self.set_consumed_asset_status(asset) if asset.calculate_depreciation: + self.reverse_depreciation_entry_made_after_disposal(asset) self.reset_depreciation_schedule(asset) else: if asset.calculate_depreciation: diff --git a/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py index 5a342f7d2f9..7046de6f837 100644 --- a/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py +++ b/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py @@ -174,6 +174,7 @@ class TestAssetCapitalization(unittest.TestCase): self.assertEqual(actual_gle, expected_gle) # Cancel Asset Capitalization and make test entries and status are reversed + asset_capitalization.reload() asset_capitalization.cancel() self.assertEqual(consumed_asset.db_get('status'), 'Partially Depreciated') self.assertFalse(get_actual_gle_dict(asset_capitalization.name))