diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py index c2bcd7aad5c..3ef370c945b 100644 --- a/erpnext/assets/doctype/asset/test_asset.py +++ b/erpnext/assets/doctype/asset/test_asset.py @@ -561,6 +561,7 @@ class TestDepreciationMethods(AssetSetup): company_flag = frappe.flags.company frappe.flags.company = "_Test Company" +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD pr = make_purchase_receipt(item_code="Macbook Pro", @@ -593,10 +594,18 @@ class TestDepreciationMethods(AssetSetup): total_number_of_depreciations=3, frequency_of_depreciation=12) >>>>>>> 09215a9781 (fix: Remove PR creation from all tests for Depreciation Methods) ======= +======= + finance_book = frappe.new_doc("Finance Book") + finance_book.finance_book_name = "Income Tax" + finance_book.for_income_tax = 1 + finance_book.insert(ignore_if_duplicate = True) + +>>>>>>> f047c6ffc8 (fix: Test for WDV) asset = create_asset( calculate_depreciation = 1, available_for_use_date = "2030-07-12", purchase_date = "2030-01-01", + finance_book = finance_book.name, depreciation_method = "Written Down Value", expected_value_after_useful_life = 12500, depreciation_start_date = "2030-12-31",