From 758e095ffde9860d9f411c736ea4d0b22a4335c2 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 28 Feb 2022 15:27:24 +0530 Subject: [PATCH] test: fix test `test_leave_balance_near_allocaton_expiry` (cherry picked from commit a58dfecb23876120e180e2984009a9cb2d07b720) --- erpnext/hr/doctype/leave_application/leave_application.py | 5 +---- .../hr/doctype/leave_application/test_leave_application.py | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 5a551d70394..cad1b475793 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -672,10 +672,7 @@ def get_remaining_leaves(allocation, leaves_taken, date, cf_expiry) -> Dict[str, leave_balance_for_consumption = flt(allocation.new_leaves_allocated) + flt(remaining_cf_leaves) remaining_leaves = _get_remaining_leaves(leave_balance_for_consumption, allocation.to_date) - return { - 'leave_balance': leave_balance, - 'leave_balance_for_consumption': remaining_leaves - } + return frappe._dict(leave_balance=leave_balance, leave_balance_for_consumption=remaining_leaves) def get_leaves_for_period(employee, leave_type, from_date, to_date, skip_expired_leaves=True): leave_entries = get_leave_entries(employee, leave_type, from_date, to_date) diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.py b/erpnext/hr/doctype/leave_application/test_leave_application.py index 2e93c41a7f7..b4547280448 100644 --- a/erpnext/hr/doctype/leave_application/test_leave_application.py +++ b/erpnext/hr/doctype/leave_application/test_leave_application.py @@ -516,8 +516,10 @@ class TestLeaveApplication(unittest.TestCase): leave_type.insert() create_carry_forwarded_allocation(employee, leave_type) + details = get_leave_balance_on(employee.name, leave_type.name, nowdate(), add_days(nowdate(), 8), for_consumption=True) - self.assertEqual(get_leave_balance_on(employee.name, leave_type.name, nowdate(), add_days(nowdate(), 8)), 21) + self.assertEqual(details.leave_balance_for_consumption, 21) + self.assertEqual(details.leave_balance, 30) def test_earned_leaves_creation(self):