Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Shreya 2018-06-08 14:05:05 +05:30
parent 65994210f6
commit 956277b121
3 changed files with 67 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/assets/doctype/asset/asset.py
View File

@ -24,6 +24,8 @@ class Asset(AccountsController):
self.make_depreciation_schedule()
self.set_accumulated_depreciation()
get_depreciation_accounts(self)
else:
self.finance_books = []
if self.get("schedules"):
self.validate_expected_value_after_useful_life()

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

@ -22,10 +22,10 @@ class TestAsset(unittest.TestCase):
pi = make_purchase_invoice(asset.name, asset.item_code, asset.gross_purchase_amount,
asset.company, asset.purchase_date)
pi.supplier = "_Test Supplier"
pi.insert()
pi.submit()
asset.load_from_db()
self.assertEqual(asset.supplier, "_Test Supplier")
self.assertEqual(asset.purchase_date, getdate("2015-01-01"))
@ -39,7 +39,6 @@ class TestAsset(unittest.TestCase):
gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
where voucher_type='Purchase Invoice' and voucher_no = %s
order by account""", pi.name)
self.assertEqual(gle, expected_gle)
pi.cancel()
@ -54,20 +53,21 @@ class TestAsset(unittest.TestCase):
def test_schedule_for_straight_line_method(self):
asset = frappe.get_doc("Asset", {"asset_name": "Macbook Pro 1"})
asset.calculate_depreciation = 1
asset.append("finance_books", {
"expected_value_after_useful_life": 10000,
"next_depreciation_date": "2020-12-31",
"depreciation_method": "Straight Line",
"total_number_of_depreciations": 3,
"frequency_of_depreciation": 10,
"depreciation_start_date": add_days(nowdate(), 5)
"depreciation_start_date": "2020-06-06"
})
asset.insert()
self.assertEqual(asset.status, "Draft")
expected_schedules = [
["2018-06-11", 490.20, 490.20],
["2019-04-11", 49673.20, 50163.40],
["2020-02-11", 39836.60, 90000.00]
["2020-06-06", 163.93, 163.93],
["2021-04-06", 49836.07, 50000.0],
["2022-02-06", 40000.0, 90000.00]
]
schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
@ -78,6 +78,7 @@ class TestAsset(unittest.TestCase):
def test_schedule_for_straight_line_method_for_existing_asset(self):
asset = frappe.get_doc("Asset", {"asset_name": "Macbook Pro 1"})
asset.is_existing_asset = 1
asset.calculate_depreciation = 1
asset.number_of_depreciations_booked = 1
asset.opening_accumulated_depreciation = 40000
asset.append("finance_books", {
@ -86,14 +87,14 @@ class TestAsset(unittest.TestCase):
"depreciation_method": "Straight Line",
"total_number_of_depreciations": 3,
"frequency_of_depreciation": 10,
"depreciation_start_date": add_days(nowdate(), 5)
"depreciation_start_date": "2020-06-06"
})
asset.insert()
self.assertEqual(asset.status, "Draft")
asset.save()
expected_schedules = [
["2018-06-11", 588.24, 40588.24],
["2019-04-11", 49411.76, 90000.00]
["2020-06-06", 197.37, 40197.37],
["2021-04-06", 49802.63, 90000.00]
]
schedules = [[cstr(d.schedule_date), flt(d.depreciation_amount, 2), d.accumulated_depreciation_amount]
for d in asset.get("schedules")]
@ -102,22 +103,23 @@ class TestAsset(unittest.TestCase):
def test_schedule_for_double_declining_method(self):
asset = frappe.get_doc("Asset", {"asset_name": "Macbook Pro 1"})
asset.calculate_depreciation = 1
asset.append("finance_books", {
"expected_value_after_useful_life": 10000,
"next_depreciation_date": "2020-12-31",
"depreciation_method": "Double Declining Balance",
"total_number_of_depreciations": 3,
"frequency_of_depreciation": 10,
"depreciation_start_date": add_days(nowdate(), 5)
"depreciation_start_date": "2020-06-06"
})
asset.insert()
self.assertEqual(asset.status, "Draft")
asset.save()
expected_schedules = [
["2018-06-11", 66667.0, 66667.0],
["2019-04-11", 22222.0, 88889.0],
["2020-02-11", 1111.0, 90000.0]
["2020-06-06", 66667.0, 66667.0],
["2021-04-06", 22222.0, 88889.0],
["2022-02-06", 1111.0, 90000.0]
]
schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
@ -127,6 +129,7 @@ class TestAsset(unittest.TestCase):
def test_schedule_for_double_declining_method_for_existing_asset(self):
asset = frappe.get_doc("Asset", {"asset_name": "Macbook Pro 1"})
asset.calculate_depreciation = 1
asset.is_existing_asset = 1
asset.number_of_depreciations_booked = 1
asset.opening_accumulated_depreciation = 50000
@ -136,7 +139,7 @@ class TestAsset(unittest.TestCase):
"depreciation_method": "Double Declining Balance",
"total_number_of_depreciations": 3,
"frequency_of_depreciation": 10,
"depreciation_start_date": add_days(nowdate(), 5)
"depreciation_start_date": "2020-06-06"
})
asset.insert()
self.assertEqual(asset.status, "Draft")
@ -145,8 +148,8 @@ class TestAsset(unittest.TestCase):
asset.save()
expected_schedules = [
["2018-06-11", 33333.0, 83333.0],
["2019-04-11", 6667.0, 90000.0]
["2020-06-06", 33333.0, 83333.0],
["2021-04-06", 6667.0, 90000.0]
]
schedules = [[cstr(d.schedule_date), d.depreciation_amount, d.accumulated_depreciation_amount]
@ -157,6 +160,7 @@ class TestAsset(unittest.TestCase):
def test_schedule_for_prorated_straight_line_method(self):
set_prorated_depreciation_schedule()
asset = frappe.get_doc("Asset", {"asset_name": "Macbook Pro 1"})
asset.calculate_depreciation = 1
asset.is_existing_asset = 0
asset.available_for_use_date = "2020-01-30"
asset.append("finance_books", {
@ -186,6 +190,7 @@ class TestAsset(unittest.TestCase):
def test_depreciation(self):
asset = frappe.get_doc("Asset", {"asset_name": "Macbook Pro 1"})
asset.calculate_depreciation = 1
asset.available_for_use_date = "2020-01-30"
asset.append("finance_books", {
"expected_value_after_useful_life": 10000,
@ -220,6 +225,7 @@ class TestAsset(unittest.TestCase):
def test_depreciation_entry_cancellation(self):
asset = frappe.get_doc("Asset", {"asset_name": "Macbook Pro 1"})
asset.calculate_depreciation = 1
asset.append("finance_books", {
"expected_value_after_useful_life": 10000,
"depreciation_method": "Straight Line",
@ -242,15 +248,15 @@ class TestAsset(unittest.TestCase):
depr_entry = asset.get("schedules")[0].journal_entry
self.assertFalse(depr_entry)
def test_scrap_asset(self):
asset = frappe.get_doc("Asset", {"asset_name": "Macbook Pro 1"})
asset.calculate_depreciation = 1
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"
"depreciation_start_date": "2020-06-06"
})
asset.insert()
asset.submit()
@ -280,6 +286,7 @@ class TestAsset(unittest.TestCase):
def test_asset_sale(self):
asset = frappe.get_doc("Asset", {"asset_name": "Macbook Pro 1"})
asset.calculate_depreciation = 1
asset.append("finance_books", {
"expected_value_after_useful_life": 10000,
"depreciation_method": "Straight Line",
@ -320,13 +327,13 @@ class TestAsset(unittest.TestCase):
def test_asset_expected_value_after_useful_life(self):
asset = frappe.get_doc("Asset", {"asset_name": "Macbook Pro 1"})
asset.depreciation_method = "Straight Line"
asset.calculate_depreciation = 1
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"
"depreciation_start_date": "2020-06-06"
})
asset.insert()
accumulated_depreciation_after_full_schedule = \
@ -339,6 +346,17 @@ class TestAsset(unittest.TestCase):
def tearDown(self):
asset = frappe.get_doc("Asset", {"asset_name": "Macbook Pro 1"})
pi = [d[0] for d in frappe.db.sql('''
select p.name from `tabPurchase Invoice` p, `tabPurchase Invoice Item` pi
where p.name = pi.parent
and pi.asset = %s
''', (asset.name))]
if pi:
pi_doc = frappe.get_doc("Purchase Invoice", pi[0])
print(pi[0])
pi_doc.cancel
# if pi:
# frappe.db.set_value("Purchase Invoice", {"name": pi[0]}, "docstatus", 2)
if asset.docstatus == 1 and asset.status not in ("Scrapped", "Sold", "Draft", "Cancelled"):
asset.cancel()
@ -367,11 +385,11 @@ def create_asset():
"item_code": "Macbook Pro",
"company": "_Test Company",
"purchase_date": "2015-01-01",
"calculate_depreciation": 1,
"calculate_depreciation": 0,
"gross_purchase_amount": 100000,
"expected_value_after_useful_life": 10000,
"warehouse": "_Test Warehouse - _TC",
"available_for_use_date": add_days(nowdate(),3),
"available_for_use_date": "2020-06-06",
"location": "Test Location",
"asset_owner": "Company"
})

30
erpnext/hr/doctype/leave_application/test_leave_application.py
View File

@ -54,9 +54,12 @@ class TestLeaveApplication(unittest.TestCase):
def tearDown(self):
frappe.set_user("Administrator")
def _clear_roles(self):
frappe.db.sql("""delete from `tabHas Role` where parent in
("test@example.com", "test1@example.com", "test2@example.com")""")
def _clear_applications(self):
frappe.db.sql("""delete from `tabLeave Application`""")
frappe.db.sql("""delete from `tabDepartment Approver` where parentfield = 'Leave Approver'""")
def get_application(self, doc):
application = frappe.copy_doc(doc)
@ -65,6 +68,10 @@ class TestLeaveApplication(unittest.TestCase):
return application
def test_block_list(self):
self._clear_roles()
from frappe.utils.user import add_role
add_role("test@example.com", "HR User")
clear_user_permissions_for_doctype("Employee")
frappe.db.set_value("Department", "_Test Department - _TC",
@ -86,8 +93,11 @@ class TestLeaveApplication(unittest.TestCase):
self.assertTrue(application.insert())
def test_overlap(self):
self._clear_roles()
self._clear_applications()
from frappe.utils.user import add_role
add_role("test@example.com", "Employee")
frappe.set_user("test@example.com")
make_allocation_record()
@ -99,8 +109,11 @@ class TestLeaveApplication(unittest.TestCase):
self.assertRaises(OverlapError, application.insert)
def test_overlap_with_half_day_1(self):
self._clear_roles()
self._clear_applications()
from frappe.utils.user import add_role
add_role("test@example.com", "Employee")
frappe.set_user("test@example.com")
make_allocation_record()
@ -129,8 +142,12 @@ class TestLeaveApplication(unittest.TestCase):
self.assertRaises(OverlapError, application.insert)
def test_overlap_with_half_day_2(self):
self._clear_roles()
self._clear_applications()
from frappe.utils.user import add_role
add_role("test@example.com", "Employee")
frappe.set_user("test@example.com")
make_allocation_record()
@ -147,8 +164,12 @@ class TestLeaveApplication(unittest.TestCase):
self.assertRaises(OverlapError, application.insert)
def test_overlap_with_half_day_3(self):
self._clear_roles()
self._clear_applications()
from frappe.utils.user import add_role
add_role("test@example.com", "Employee")
frappe.set_user("test@example.com")
make_allocation_record()
@ -176,7 +197,6 @@ class TestLeaveApplication(unittest.TestCase):
application.half_day_date = "2013-01-05"
application.insert()
def test_optional_leave(self):
leave_period = get_leave_period()
today = nowdate()
@ -228,6 +248,7 @@ class TestLeaveApplication(unittest.TestCase):
# check leave balance is reduced
self.assertEqual(get_leave_balance_on(employee.name, leave_type, today), 9)
def test_leaves_allowed(self):
employee = get_employee()
leave_period = get_leave_period()
@ -412,7 +433,7 @@ def get_leave_period():
to_date = "{0}-12-31".format(now_datetime().year),
company = "_Test Company",
is_active = 1
)).insert()
)).insert()
def allocate_leaves(employee, leave_period, leave_type, new_leaves_allocated, eligible_leaves=0):
allocate_leave = frappe.get_doc({
@ -427,5 +448,4 @@ def allocate_leaves(employee, leave_period, leave_type, new_leaves_allocated, el
"docstatus": 1
}).insert()
allocate_leave.submit()
allocate_leave.submit()