schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge conflict

Browse Source
This commit is contained in:
Saqib Ansari
2022-01-21 12:28:02 +05:30
parent afda48a12b
commit b66f86b044
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1054,30 +1054,6 @@ class TestDepreciationBasics(AssetSetup):
self.assertEqual(gle, expected_gle) self.assertEqual(gle, expected_gle)
self.assertEqual(asset.get("value_after_depreciation"), 0) 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)
>>>>>>> 4390adcaa1 (fix: cost center validation of asset)
def test_asset_cost_center(self): def test_asset_cost_center(self):
asset = create_asset(is_existing_asset = 1, do_not_save=1) asset = create_asset(is_existing_asset = 1, do_not_save=1)