Merge pull request #3923 from frappe/version-15-hotfix

Author: asmitahase

hrms/hr/doctype/leave_application/leave_application.js

@@ -291,6 +291,10 @@ frappe.ui.form.on("Leave Application", {
 		});
 		$(".form-message").prop("hidden", true);
 	},
+	posting_date: function (frm) {
+		frm.trigger("make_dashboard");
+		frm.trigger("get_leave_balance");
+	},
 });
 
 frappe.tour["Leave Application"] = [

hrms/hr/doctype/leave_application/leave_application.py

@@ -111,6 +111,19 @@ def on_submit(self):
 			self.notify_employee()
 
 		self.create_leave_ledger_entry()
+		# create a reverse ledger entry for backdated leave applications for whom expiry entry already exists
+		leave_allocation = self.get_leave_allocation()
+		if not leave_allocation:
+			return
+		to_date = leave_allocation.get("to_date")
+		can_expire = not frappe.db.get_value("Leave Type", self.leave_type, "is_carry_forward")
+
+		if to_date < getdate() and can_expire:
+			args = frappe._dict(
+				leaves=self.total_leave_days, from_date=to_date, to_date=to_date, is_carry_forward=0
+			)
+			create_leave_ledger_entry(self, args)
+
 		self.reload()
 
 	def before_cancel(self):
@@ -247,6 +260,22 @@ def validate_back_dated_application(self):
 				).format(formatdate(future_allocation[0].from_date), future_allocation[0].name)
 			)
 
+	def get_leave_allocation(self):
+		date = self.posting_date or getdate()
+		LeaveAllocation = frappe.qb.DocType("Leave Allocation")
+		leave_allocation = (
+			frappe.qb.from_(LeaveAllocation)
+			.select(LeaveAllocation.to_date)
+			.where(
+				((LeaveAllocation.from_date <= date) & (date <= LeaveAllocation.to_date))
+				& (LeaveAllocation.docstatus == 1)
+				& (LeaveAllocation.leave_type == self.leave_type)
+				& (LeaveAllocation.employee == self.employee)
+			)
+		).run(as_dict=True)
+
+		return leave_allocation[0] if leave_allocation else None
+
 	def update_attendance(self):
 		if self.status != "Approved":
 			return
@@ -969,12 +998,12 @@ def get_leave_balance_on(
 
 	allocation_records = get_leave_allocation_records(employee, date, leave_type)
 	allocation = allocation_records.get(leave_type, frappe._dict())
-
-	end_date = allocation.to_date if cint(consider_all_leaves_in_the_allocation_period) else date
+	end_date = (
+		allocation.to_date if (allocation and cint(consider_all_leaves_in_the_allocation_period)) else date
+	)
 	cf_expiry = get_allocation_expiry_for_cf_leaves(employee, leave_type, to_date, allocation.from_date)
 
 	leaves_taken = get_leaves_for_period(employee, leave_type, allocation.from_date, end_date)
-
 	manually_expired_leaves = get_manually_expired_leaves(
 		employee, leave_type, allocation.from_date, end_date
 	)
@@ -1138,7 +1167,7 @@ def get_manually_expired_leaves(
 			& (ledger.employee == employee)
 			& (ledger.leave_type == leave_type)
 			& (ledger.from_date >= from_date)
-			& (ledger.to_date <= end_date)
+			& (ledger.to_date < end_date)
 			& (ledger.transaction_type == "Leave Allocation")
 			& ((ledger.is_expired == 1) & (ledger.is_carry_forward == 0))
 		)

hrms/hr/doctype/leave_application/test_leave_application.py

@@ -1404,11 +1404,45 @@ def test_leave_balance_when_allocation_is_expired_manually(self):
 		expire_allocation(leave_allocation, expiry_date=getdate())
 
 		leave_balance = get_leave_balance_on(
-			employee=employee.name, leave_type=leave_type.name, date=getdate()
+			employee=employee.name,
+			leave_type=leave_type.name,
+			date=getdate(),
+			consider_all_leaves_in_the_allocation_period=True,
 		)
 
 		self.assertEqual(leave_balance, 0)
 
+	def test_backdated_application_after_expiry(self):
+		employee = get_employee().name
+		previous_month_start = get_first_day(add_months(getdate(), -1))
+		previous_month_end = get_last_day(previous_month_start)
+		leave_type = create_leave_type(leave_type_name="_Test_backdated_application").name
+		allocation = make_allocation_record(
+			employee, leave_type, previous_month_start, previous_month_end, leaves=10
+		)
+		expire_allocation(allocation, expiry_date=previous_month_end)
+		doc = frappe.new_doc(
+			"Leave Application",
+			employee=employee,
+			leave_type=leave_type,
+			from_date=previous_month_start,
+			to_date=previous_month_start,
+			posting_date=previous_month_end,
+			status="Approved",
+		)
+		doc.save()
+		doc.submit()
+		self.assertEqual(get_leave_balance_on(employee, leave_type, previous_month_end), 9)
+		leave_ledger_entry = frappe.get_all(
+			"Leave Ledger Entry",
+			fields="*",
+			filters={"transaction_name": doc.name},
+			order_by="leaves",
+		)
+		self.assertEqual(len(leave_ledger_entry), 2)
+		self.assertEqual(leave_ledger_entry[0].leaves, doc.total_leave_days * -1)
+		self.assertEqual(leave_ledger_entry[1].leaves, doc.total_leave_days * 1)
+
 
 def create_carry_forwarded_allocation(employee, leave_type, date=None):
 	date = date or nowdate()

hrms/hr/report/employee_birthday/test_employee_birthday.py

@@ -4,12 +4,14 @@
 
 from erpnext.setup.doctype.employee.test_employee import make_employee
 
+from hrms.hr.doctype.staffing_plan.test_staffing_plan import make_company
 from hrms.hr.report.employee_birthday.employee_birthday import execute
 
 
 class TestEmployeeBirthday(FrappeTestCase):
 	def setUp(self):
-		self.company = "_Test Company"
+		make_company(name="_New Test Company", abbr="_NTC")
+		self.company = "_New Test Company"
 		self.birthdate = getdate().replace(year=1990)
 
 	def test_employee_birth_day_report(self):