nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-28 11:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove PR creation from all tests in TestDepreciationBasics

Browse Source 
(cherry picked from commit 968be70bd1)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
This commit is contained in:
GangaManoj
2021-10-14 22:32:27 +05:30
committed by mergify-bot
parent 38ec9c80fc
commit a5b8b4ac41
1 changed files with 23 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -792,17 +792,9 @@ class TestDepreciationBasics(AssetSetup):
"""Tests if post_depreciation_entries() works as expected."""
asset = create_asset(item_code="Macbook Pro", calculate_depreciation=1,
available_for_use_date=getdate("2019-12-31"), do_not_save=1)
asset.finance_books = []
asset.append("finance_books", {
"depreciation_method": "Straight Line",
"frequency_of_depreciation": 12,
"total_number_of_depreciations": 3,
"expected_value_after_useful_life": 10000,
"depreciation_start_date": getdate("2020-12-31")
})
asset.submit()
available_for_use_date="2019-12-31", depreciation_start_date="2020-12-31",
frequency_of_depreciation=12, total_number_of_depreciations=3,
expected_value_after_useful_life=10000, submit=1)
post_depreciation_entries(date="2021-06-01")
asset.load_from_db()
@@ -815,17 +807,9 @@ class TestDepreciationBasics(AssetSetup):
"""Tests if clear_depreciation_schedule() works as expected."""
asset = create_asset(item_code="Macbook Pro", calculate_depreciation=1,
available_for_use_date=getdate("2019-12-31"), do_not_save=1)
asset.finance_books = []
asset.append("finance_books", {
"depreciation_method": "Straight Line",
"frequency_of_depreciation": 12,
"total_number_of_depreciations": 3,
"expected_value_after_useful_life": 10000,
"depreciation_start_date": getdate("2020-12-31")
})
asset.submit()
available_for_use_date="2019-12-31", depreciation_start_date="2020-12-31",
frequency_of_depreciation=12, total_number_of_depreciations=3,
expected_value_after_useful_life=10000, submit=1)
post_depreciation_entries(date="2021-06-01")
asset.load_from_db()
@@ -836,22 +820,12 @@ class TestDepreciationBasics(AssetSetup):
>>>>>>> 40ec2d622b (fix: Add tests for depreciation)
def test_depreciation_entry_cancellation(self):
pr = make_purchase_receipt(item_code="Macbook Pro",
qty=1, rate=100000.0, location="Test Location")
asset = create_asset(item_code="Macbook Pro",
calculate_depreciation=1, purchase_date="2020-06-06",
available_for_use_date="2020-06-06", depreciation_start_date="2020-12-31",
frequency_of_depreciation=10, total_number_of_depreciations=3,
expected_value_after_useful_life=10000, submit=1)
asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, 'name')
asset = frappe.get_doc('Asset', asset_name)
asset.calculate_depreciation = 1
asset.available_for_use_date = '2020-06-06'
asset.purchase_date = '2020-06-06'
asset.append("finance_books", {
"expected_value_after_useful_life": 10000,
"depreciation_method": "Straight Line",
"total_number_of_depreciations": 3,
"frequency_of_depreciation": 10,
"depreciation_start_date": "2020-12-31"
})
asset.submit()
post_depreciation_entries(date="2021-01-01")
asset.load_from_db()
@@ -866,21 +840,11 @@ class TestDepreciationBasics(AssetSetup):
self.assertFalse(depr_entry)
def test_asset_expected_value_after_useful_life(self):
pr = make_purchase_receipt(item_code="Macbook Pro",
qty=1, rate=100000.0, location="Test Location")
asset = create_asset(item_code="Macbook Pro", calculate_depreciation=1,
available_for_use_date="2020-06-06", purchase_date="2020-06-06",
frequency_of_depreciation=10, total_number_of_depreciations=3,
expected_value_after_useful_life=10000)
asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, 'name')
asset = frappe.get_doc('Asset', asset_name)
asset.calculate_depreciation = 1
asset.available_for_use_date = '2020-06-06'
asset.purchase_date = '2020-06-06'
asset.append("finance_books", {
"expected_value_after_useful_life": 10000,
"depreciation_method": "Straight Line",
"total_number_of_depreciations": 3,
"frequency_of_depreciation": 10
})
asset.save()
accumulated_depreciation_after_full_schedule = \
max(d.accumulated_depreciation_amount for d in asset.get("schedules"))
@@ -890,9 +854,13 @@ class TestDepreciationBasics(AssetSetup):
self.assertTrue(asset.finance_books[0].expected_value_after_useful_life >= asset_value_after_full_schedule)
def test_gle_made_by_depreciation_entries(self):
pr = make_purchase_receipt(item_code="Macbook Pro",
qty=1, rate=100000.0, location="Test Location")
asset = create_asset(item_code="Macbook Pro",
calculate_depreciation=1, purchase_date="2020-01-30",
available_for_use_date="2020-01-30", depreciation_start_date="2020-12-31",
frequency_of_depreciation=10, total_number_of_depreciations=3,
expected_value_after_useful_life=10000, submit=1)
<<<<<<< HEAD
asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, 'name')
asset = frappe.get_doc('Asset', asset_name)
asset.calculate_depreciation = 1
@@ -907,6 +875,8 @@ class TestDepreciationBasics(AssetSetup):
})
asset.submit()
asset.load_from_db()
=======
>>>>>>> 968be70bd1 (fix: Remove PR creation from all tests in TestDepreciationBasics)
self.assertEqual(asset.status, "Submitted")
frappe.db.set_value("Company", "_Test Company", "series_for_depreciation_entry", "DEPR-")