From 4fec250cbf6a0b214529bfc586f109242846228f Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Fri, 21 Jan 2022 14:33:59 +0530 Subject: [PATCH] fix: merge conflicts --- erpnext/assets/doctype/asset/test_asset.py | 24 ---------------------- 1 file changed, 24 deletions(-) diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py index 73fbf5dfcde..0ddfb6c1c02 100644 --- a/erpnext/assets/doctype/asset/test_asset.py +++ b/erpnext/assets/doctype/asset/test_asset.py @@ -1130,30 +1130,6 @@ class TestDepreciationBasics(AssetSetup): self.assertEqual(gle, expected_gle) self.assertEqual(asset.get("value_after_depreciation"), 0) -<<<<<<< HEAD -======= - - def test_expected_value_change(self): - """ - tests if changing `expected_value_after_useful_life` - affects `value_after_depreciation` - """ - - asset = create_asset(calculate_depreciation=1) - asset.opening_accumulated_depreciation = 2000 - asset.number_of_depreciations_booked = 1 - - asset.finance_books[0].expected_value_after_useful_life = 100 - asset.save() - asset.reload() - self.assertEquals(asset.finance_books[0].value_after_depreciation, 98000.0) - - # changing expected_value_after_useful_life shouldn't affect value_after_depreciation - asset.finance_books[0].expected_value_after_useful_life = 200 - asset.save() - asset.reload() - self.assertEquals(asset.finance_books[0].value_after_depreciation, 98000.0) ->>>>>>> ae580d116c (fix: failing test cases) def create_asset_data(): if not frappe.db.exists("Asset Category", "Computers"):