fix: ignore the self-approval setting a workfow is active on Leave Ap…

…plication

hrms/hr/doctype/leave_application/leave_application.js

@@ -136,6 +136,7 @@ frappe.ui.form.on("Leave Application", {
 		if (frm.doc.leave_approver) {
 			frm.set_value("leave_approver_name", frappe.user.full_name(frm.doc.leave_approver));
 		}
+		frm.trigger("prevent_self_leave_approval");
 	},
 
 	leave_type: function (frm) {
@@ -257,17 +258,19 @@ frappe.ui.form.on("Leave Application", {
 		}
 	},
 
-	leave_approver: function (frm) {
-		frm.trigger("prevent_self_leave_approval");
-	},
 	prevent_self_leave_approval: async function (frm) {
 		let is_invalid_leave_approver = invalid_leave_approver(
 			frm.doc.employee,
 			await hrms.get_current_employee(),
 			await self_approval_not_allowed(),
 		);
 
-		if (frm.doc.docstatus === 0 && is_invalid_leave_approver && !frm.is_dirty()) {
+		if (
+			frm.doc.docstatus === 0 &&
+			is_invalid_leave_approver &&
+			!frm.is_dirty() &&
+			!frappe.model.has_workflow(frm.doctype)
+		) {
 			frm.page.clear_primary_action();
 			$(".form-message").prop("hidden", true);
 		}

hrms/hr/doctype/leave_application/leave_application.py

@@ -5,6 +5,7 @@
 
 import frappe
 from frappe import _
+from frappe.model.workflow import get_workflow_name
 from frappe.query_builder.functions import Max, Min, Sum
 from frappe.utils import (
 	add_days,
@@ -797,7 +798,10 @@ def create_ledger_entry_for_intermediate_allocation_expiry(self, expiry_date, su
 
 	def validate_for_self_approval(self):
 		self_leave_approval_allowed = frappe.db.get_single_value("HR Settings", "allow_self_leave_approval")
-		if (not self_leave_approval_allowed) and (self.employee == get_current_employee_info()["name"]):
+		if (not self_leave_approval_allowed) and (
+			self.employee == get_current_employee_info()["name"]
+			and not get_workflow_name("Leave Application")
+		):
 			frappe.throw(_("Self approval for leaves is not allowed"), frappe.ValidationError)