Merge pull request #1517 from frappe/mergify/bp/version-15-hotfix/pr-…

…1367

feat: Bulk Salary Structure Assignment (backport #1367)

hrms/hr/doctype/leave_control_panel/leave_control_panel.py

@@ -3,12 +3,14 @@
 
 
 import frappe
-from frappe import _, msgprint
+from frappe import _
 from frappe.model.document import Document
-from frappe.utils import cint, comma_and, flt
+from frappe.utils import cint, flt
 
 from erpnext import get_default_company
 
+from hrms.hr.utils import notify_bulk_action_status
+
 
 class LeaveControlPanel(Document):
 	def validate_fields(self, employees: list):
@@ -65,7 +67,7 @@ def create_leave_allocations(self, employees: list) -> dict:
 				allocation.log_error(f"Leave Allocation failed for employee {employee}")
 				failure.append(employee)
 
-		self.notify_status("Leave Allocation", failure, success)
+		notify_bulk_action_status("Leave Allocation", failure, success)
 		return {"failed": failure, "success": success}
 
 	def create_leave_policy_assignments(self, employees: list) -> dict:
@@ -96,7 +98,7 @@ def create_leave_policy_assignments(self, employees: list) -> dict:
 				assignment.log_error(f"Leave Policy Assignment failed for employee {employee}")
 				failure.append(employee)
 
-		self.notify_status("Leave Policy Assignment", failure, success)
+		notify_bulk_action_status("Leave Policy Assignment", failure, success)
 		return {"failed": failure, "success": success}
 
 	def get_from_to_date(self):
@@ -107,44 +109,6 @@ def get_from_to_date(self):
 		else:
 			return self.from_date, self.to_date
 
-	def notify_status(self, doctype: str, failure: list, success: list) -> None:
-		frappe.clear_messages()
-
-		msg = ""
-		title = ""
-		if failure:
-			msg += _("Failed to create/submit {0} for employees:").format(doctype)
-			msg += " " + comma_and(failure, False) + "<hr>"
-			msg += (
-				_("Check {0} for more details")
-				.format("<a href='/app/List/Error Log?reference_doctype={0}'>{1}</a>")
-				.format(doctype, _("Error Log"))
-			)
-
-			if success:
-				title = _("Partial Success")
-				msg += "<hr>"
-			else:
-				title = _("Creation Failed")
-		else:
-			title = _("Success")
-
-		if success:
-			msg += _("Successfully created {0} records for:").format(doctype)
-			msg += " " + comma_and(success, False)
-
-		if failure:
-			indicator = "orange" if success else "red"
-		else:
-			indicator = "green"
-
-		msgprint(
-			msg,
-			indicator=indicator,
-			title=title,
-			is_minimizable=True,
-		)
-
 	@frappe.whitelist()
 	def get_employees(self, advanced_filters: list) -> list:
 		from_date, to_date = self.get_from_to_date()

hrms/hr/utils.py

@@ -6,6 +6,7 @@
 from frappe.model.document import Document
 from frappe.utils import (
 	add_days,
+	comma_and,
 	cstr,
 	flt,
 	format_datetime,
@@ -773,3 +774,42 @@ def get_ec_matching_query(bank_account, company, exact_match, from_date=None, to
 			AND mode_of_payment in {mode_of_payments}
 			{filter_by_date}
 	"""
+
+
+def notify_bulk_action_status(doctype: str, failure: list, success: list) -> None:
+	frappe.clear_messages()
+
+	msg = ""
+	title = ""
+	if failure:
+		msg += _("Failed to create/submit {0} for employees:").format(doctype)
+		msg += " " + comma_and(failure, False) + "<hr>"
+		msg += (
+			_("Check {0} for more details")
+			.format("<a href='/app/List/Error Log?reference_doctype={0}'>{1}</a>")
+			.format(doctype, _("Error Log"))
+		)
+
+		if success:
+			title = _("Partial Success")
+			msg += "<hr>"
+		else:
+			title = _("Creation Failed")
+	else:
+		title = _("Success")
+
+	if success:
+		msg += _("Successfully created {0} for employees:").format(doctype)
+		msg += " " + comma_and(success, False)
+
+	if failure:
+		indicator = "orange" if success else "red"
+	else:
+		indicator = "green"
+
+	frappe.msgprint(
+		msg,
+		indicator=indicator,
+		title=title,
+		is_minimizable=True,
+	)