nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-03 21:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source 
(cherry picked from commit b2c549a464)
This commit is contained in:
Rucha Mahabal
2022-03-10 15:41:14 +05:30
committed by mergify-bot
parent d4301675d1
commit c66a66e090
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,8 +344,6 @@ class TestLeaveApplication(unittest.TestCase):
# attendance on non-holiday updated
self.assertEqual(frappe.db.get_value("Attendance", attendance.name, "status"), "On Leave")
frappe.db.set_value("Employee", employee.name, "holiday_list", original_holiday_list)
def test_block_list(self):
self._clear_roles()
@@ -541,8 +539,6 @@ class TestLeaveApplication(unittest.TestCase):
# check leave balance is reduced
self.assertEqual(get_leave_balance_on(employee.name, leave_type, optional_leave_date), 9)
frappe.db.set_value("Employee", employee.name, "holiday_list", original_holiday_list)
def test_leaves_allowed(self):
employee = get_employee()
leave_period = get_leave_period()