CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-22 19:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(test): difference amount after asset revaluation

Browse Source
This commit is contained in:
Khushi Rawat
2025-03-11 15:04:47 +05:30
parent b3ffdb6517
commit 0e7ae25f65
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py
View File

@@ -176,15 +176,14 @@ class AssetValueAdjustment(Document):
difference_amount = self.difference_amount if self.docstatus == 1 else -1 * self.difference_amount
asset = frappe.get_doc("Asset", self.asset)
if not asset.calculate_depreciation:
asset.value_after_depreciation += flt(difference_amount)
asset.db_update()
else:
if asset.calculate_depreciation:
for row in asset.finance_books:
if cstr(row.finance_book) == cstr(self.finance_book):
row.value_after_depreciation += flt(difference_amount)
row.db_update()
asset.value_after_depreciation += flt(difference_amount)
asset.db_update()
return asset
def get_adjustment_note(self):

11
erpnext/assets/doctype/asset_value_adjustment/test_asset_value_adjustment.py
View File

@@ -262,7 +262,7 @@ class TestAssetValueAdjustment(IntegrationTestCase):
self.assertEqual(schedules, expected_schedules)
def test_difference_amount(self):
pr = make_purchase_receipt(item_code="Macbook Pro", qty=1, rate=120000.0, location="Test Location")
pr = make_purchase_receipt(item_code="Macbook Pro", qty=1, rate=100000.0, location="Test Location")
asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, "name")
asset_doc = frappe.get_doc("Asset", asset_name)
@@ -282,17 +282,18 @@ class TestAssetValueAdjustment(IntegrationTestCase):
)
asset_doc.submit()
current_asset_value = get_asset_value_after_depreciation(asset_doc.name)
adj_doc = make_asset_value_adjustment(
asset=asset_doc.name,
current_asset_value=54000,
new_asset_value=50000.0,
current_asset_value=current_asset_value,
new_asset_value=40000,
date="2023-08-21",
)
adj_doc.submit()
difference_amount = adj_doc.new_asset_value - adj_doc.current_asset_value
self.assertEqual(difference_amount, -4000)
self.assertEqual(difference_amount, -60000)
asset_doc.load_from_db()
self.assertEqual(asset_doc.value_after_depreciation, 50000.0)
self.assertEqual(asset_doc.finance_books[0].value_after_depreciation, 40000.0)
def make_asset_value_adjustment(**args):