diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index d2eed63df73..da0d95828e3 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -3021,35 +3021,6 @@ class TestSalesInvoice(ERPNextTestSuite): self.assertEqual(expected_values[i][2], schedule.accumulated_depreciation_amount) self.assertTrue(schedule.journal_entry) - def test_depreciation_on_return_of_sold_asset(self): - from erpnext.controllers.sales_and_purchase_return import make_return_doc - - create_asset_data() - asset = create_asset(item_code="Macbook Pro", calculate_depreciation=1, submit=1) - post_depreciation_entries(getdate("2021-09-30")) - - si = create_sales_invoice( - item_code="Macbook Pro", asset=asset.name, qty=1, rate=90000, posting_date=getdate("2021-09-30") - ) - return_si = make_return_doc("Sales Invoice", si.name) - return_si.submit() - asset.load_from_db() - - expected_values = [ - ["2020-06-30", 1366.12, 1366.12, True], - ["2021-06-30", 20000.0, 21366.12, True], - ["2022-06-30", 20000.95, 41367.07, False], - ["2023-06-30", 20000.95, 61368.02, False], - ["2024-06-30", 20000.95, 81368.97, False], - ["2025-06-06", 18631.03, 100000.0, False], - ] - - for i, schedule in enumerate(get_depr_schedule(asset.name, "Active")): - self.assertEqual(getdate(expected_values[i][0]), schedule.schedule_date) - self.assertEqual(expected_values[i][1], schedule.depreciation_amount) - self.assertEqual(expected_values[i][2], schedule.accumulated_depreciation_amount) - self.assertEqual(schedule.journal_entry, schedule.journal_entry) - def test_sales_invoice_against_supplier(self): from erpnext.accounts.doctype.opening_invoice_creation_tool.test_opening_invoice_creation_tool import ( make_customer, diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py index c3553675420..e36042bd6e7 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py +++ b/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py @@ -821,6 +821,35 @@ class TestAssetDepreciationSchedule(IntegrationTestCase): ] self.assertEqual(schedules, expected_depreciation_before_adjustment) + def test_depreciation_on_return_of_sold_asset(self): + from erpnext.controllers.sales_and_purchase_return import make_return_doc + + create_asset_data() + asset = create_asset(item_code="Macbook Pro", calculate_depreciation=1, submit=1) + post_depreciation_entries(getdate("2021-09-30")) + + si = create_sales_invoice( + item_code="Macbook Pro", asset=asset.name, qty=1, rate=90000, posting_date=getdate("2021-09-30") + ) + return_si = make_return_doc("Sales Invoice", si.name) + return_si.submit() + asset.load_from_db() + + expected_values = [ + ["2020-06-30", 1366.12, 1366.12, True], + ["2021-06-30", 20000.0, 21366.12, True], + ["2022-06-30", 20000.95, 41367.07, False], + ["2023-06-30", 20000.95, 61368.02, False], + ["2024-06-30", 20000.95, 81368.97, False], + ["2025-06-06", 18631.03, 100000.0, False], + ] + + for i, schedule in enumerate(get_depr_schedule(asset.name, "Active")): + self.assertEqual(getdate(expected_values[i][0]), schedule.schedule_date) + self.assertEqual(expected_values[i][1], schedule.depreciation_amount) + self.assertEqual(expected_values[i][2], schedule.accumulated_depreciation_amount) + self.assertEqual(schedule.journal_entry, schedule.journal_entry) + def test_depreciation_schedule_after_cancelling_asset_value_adjustent_for_existing_asset(self): asset = create_asset( item_code="Macbook Pro",