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

chore: release v15

hrms/controllers/employee_reminders.py

@@ -61,9 +61,10 @@ def send_holidays_reminder_in_advance(employee, holidays):
 	employee_doc = frappe.get_doc("Employee", employee)
 	employee_email = get_employee_email(employee_doc)
 	frequency = frappe.db.get_single_value("HR Settings", "frequency")
-
+	sender_email = get_sender_email()
 	email_header = _("Holidays this Month.") if frequency == "Monthly" else _("Holidays this Week.")
 	frappe.sendmail(
+		sender=sender_email,
 		recipients=[employee_email],
 		subject=_("Upcoming Holidays Reminder"),
 		template="holiday_reminder",
@@ -85,10 +86,12 @@ def send_holidays_reminder_in_advance(employee, holidays):
 # ------------------
 def send_birthday_reminders():
 	"""Send Employee birthday reminders if no 'Stop Birthday Reminders' is not set."""
+
 	to_send = int(frappe.db.get_single_value("HR Settings", "send_birthday_reminders"))
 	if not to_send:
 		return
 
+	sender = get_sender_email()
 	employees_born_today = get_employees_who_are_born_today()
 
 	for company, birthday_persons in employees_born_today.items():
@@ -97,15 +100,15 @@ def send_birthday_reminders():
 		recipients = list(set(employee_emails) - set(birthday_person_emails))
 
 		reminder_text, message = get_birthday_reminder_text_and_message(birthday_persons)
-		send_birthday_reminder(recipients, reminder_text, birthday_persons, message)
+		send_birthday_reminder(recipients, reminder_text, birthday_persons, message, sender)
 
 		if len(birthday_persons) > 1:
 			# special email for people sharing birthdays
 			for person in birthday_persons:
 				person_email = person["user_id"] or person["personal_email"] or person["company_email"]
 				others = [d for d in birthday_persons if d != person]
 				reminder_text, message = get_birthday_reminder_text_and_message(others)
-				send_birthday_reminder(person_email, reminder_text, others, message)
+				send_birthday_reminder(person_email, reminder_text, others, message, sender)
 
 
 def get_birthday_reminder_text_and_message(birthday_persons):
@@ -124,8 +127,9 @@ def get_birthday_reminder_text_and_message(birthday_persons):
 	return reminder_text, message
 
 
-def send_birthday_reminder(recipients, reminder_text, birthday_persons, message):
+def send_birthday_reminder(recipients, reminder_text, birthday_persons, message, sender=None):
 	frappe.sendmail(
+		sender=sender,
 		recipients=recipients,
 		subject=_("Birthday Reminder"),
 		template="birthday_reminder",
@@ -206,6 +210,7 @@ def send_work_anniversary_reminders():
 	if not to_send:
 		return
 
+	sender = get_sender_email()
 	employees_joined_today = get_employees_having_an_event_today("work_anniversary")
 
 	message = _("A friendly reminder of an important date for our team.")
@@ -218,15 +223,15 @@ def send_work_anniversary_reminders():
 		recipients = list(set(employee_emails) - set(anniversary_person_emails))
 
 		reminder_text = get_work_anniversary_reminder_text(anniversary_persons)
-		send_work_anniversary_reminder(recipients, reminder_text, anniversary_persons, message)
+		send_work_anniversary_reminder(recipients, reminder_text, anniversary_persons, message, sender)
 
 		if len(anniversary_persons) > 1:
 			# email for people sharing work anniversaries
 			for person in anniversary_persons:
 				person_email = person["user_id"] or person["personal_email"] or person["company_email"]
 				others = [d for d in anniversary_persons if d != person]
 				reminder_text = get_work_anniversary_reminder_text(others)
-				send_work_anniversary_reminder(person_email, reminder_text, others, message)
+				send_work_anniversary_reminder(person_email, reminder_text, others, message, sender)
 
 
 def get_work_anniversary_reminder_text(anniversary_persons: list) -> str:
@@ -261,8 +266,15 @@ def get_pluralized_years(years):
 	return f"{years} years"
 
 
-def send_work_anniversary_reminder(recipients, reminder_text, anniversary_persons, message):
+def send_work_anniversary_reminder(
+	recipients,
+	reminder_text,
+	anniversary_persons,
+	message,
+	sender=None,
+):
 	frappe.sendmail(
+		sender=sender,
 		recipients=recipients,
 		subject=_("Work Anniversary Reminder"),
 		template="anniversary_reminder",
@@ -273,3 +285,7 @@ def send_work_anniversary_reminder(recipients, reminder_text, anniversary_person
 		),
 		header=_("Work Anniversary Reminder"),
 	)
+
+
+def get_sender_email() -> str | None:
+	return frappe.db.get_single_value("HR Settings", "sender_email")

hrms/hr/doctype/attendance/attendance_list.js

@@ -86,6 +86,7 @@ frappe.listview_settings["Attendance"] = {
 						fieldtype: "MultiCheck",
 						options: [],
 						columns: 2,
+						select_all: true,
 					},
 				],
 				primary_action(data) {

hrms/hr/doctype/hr_settings/hr_settings.js

@@ -2,6 +2,15 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('HR Settings', {
+	refresh: function (frm) {
+		frm.set_query("sender", () => {
+			return {
+				filters: {
+					enable_outgoing: 1,
+				},
+			};
+		});
+	}
 });
 
 frappe.tour['HR Settings'] = [

hrms/hr/doctype/hr_settings/hr_settings.json

@@ -12,12 +12,14 @@
   "column_break_9",
   "retirement_age",
   "reminders_section",
-  "send_birthday_reminders",
   "column_break_11",
   "send_work_anniversary_reminders",
-  "column_break_18",
+  "send_birthday_reminders",
   "send_holiday_reminders",
   "frequency",
+  "column_break_hyec",
+  "sender",
+  "sender_email",
   "leave_and_expense_claim_settings",
   "send_leave_notification",
   "leave_approval_notification_template",
@@ -71,10 +73,6 @@
    "fieldtype": "Check",
    "label": "Expense Approver Mandatory In Expense Claim"
   },
-  {
-   "fieldname": "column_break_18",
-   "fieldtype": "Column Break"
-  },
   {
    "default": "1",
    "fieldname": "leave_approver_mandatory_in_leave_application",
@@ -251,13 +249,31 @@
   {
    "fieldname": "column_break_34",
    "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "sender",
+   "fieldtype": "Link",
+   "label": "Sender",
+   "options": "Email Account"
+  },
+  {
+   "depends_on": "eval:doc.sender",
+   "fetch_from": "sender.email_id",
+   "fieldname": "sender_email",
+   "fieldtype": "Data",
+   "label": "Sender Email",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_hyec",
+   "fieldtype": "Column Break"
   }
  ],
  "icon": "fa fa-cog",
  "idx": 1,
  "issingle": 1,
  "links": [],
- "modified": "2022-10-04 17:29:45.926918",
+ "modified": "2023-11-01 11:06:31.329718",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "HR Settings",
@@ -275,5 +291,6 @@
  ],
  "sort_field": "modified",
  "sort_order": "ASC",
+ "states": [],
  "track_changes": 1
 }

hrms/payroll/doctype/payroll_entry/payroll_entry.js

@@ -212,7 +212,7 @@ frappe.ui.form.on('Payroll Entry', {
 		let filters = {};
 
 		let fields = ['company', 'start_date', 'end_date', 'payroll_frequency', 'payroll_payable_account',
-			'currency', 'department', 'branch', 'designation', 'salary_slip_based_on_timesheet'];
+			'currency', 'department', 'branch', 'designation', 'salary_slip_based_on_timesheet','grade'];
 
 		fields.forEach(field => {
 			if (frm.doc[field]) {
@@ -283,7 +283,9 @@ frappe.ui.form.on('Payroll Entry', {
 	department: function (frm) {
 		frm.events.clear_employee_table(frm);
 	},
-
+	grade: function (frm) {
+		frm.events.clear_employee_table(frm);
+	},
 	designation: function (frm) {
 		frm.events.clear_employee_table(frm);
 	},

hrms/payroll/doctype/payroll_entry/payroll_entry.json

@@ -29,6 +29,7 @@
   "department",
   "column_break_21",
   "designation",
+  "grade",
   "number_of_employees",
   "section_break_24",
   "employees",
@@ -324,12 +325,18 @@
    "fieldtype": "Tab Break",
    "label": "Connections",
    "show_dashboard": 1
+  },
+  {
+   "fieldname": "grade",
+   "fieldtype": "Link",
+   "label": "Grade",
+   "options": "Employee Grade"
   }
  ],
  "icon": "fa fa-cog",
  "is_submittable": 1,
  "links": [],
- "modified": "2023-07-13 12:27:33.418702",
+ "modified": "2023-10-10 14:21:24.517349",
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Payroll Entry",

hrms/payroll/doctype/payroll_entry/payroll_entry.py

@@ -149,6 +149,7 @@ def make_filters(self):
 			branch=self.branch,
 			department=self.department,
 			designation=self.designation,
+			grade=self.grade,
 			currency=self.currency,
 			start_date=self.start_date,
 			end_date=self.end_date,
@@ -1186,7 +1187,7 @@ def set_filter_conditions(query, filters, qb_object):
 	if filters.get("employees"):
 		query = query.where(qb_object.name.notin(filters.get("employees")))
 
-	for fltr_key in ["branch", "department", "designation"]:
+	for fltr_key in ["branch", "department", "designation", "grade"]:
 		if filters.get(fltr_key):
 			query = query.where(qb_object[fltr_key] == filters[fltr_key])
 

hrms/payroll/doctype/payroll_settings/payroll_settings.js

@@ -2,6 +2,16 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Payroll Settings', {
+	refresh: function (frm) {
+		frm.set_query("sender", () => {
+			return {
+				filters: {
+					enable_outgoing: 1,
+				},
+			};
+		});
+	},
+
 	encrypt_salary_slips_in_emails: function(frm) {
 		let encrypt_state = frm.doc.encrypt_salary_slips_in_emails;
 		frm.set_df_property('password_policy', 'reqd', encrypt_state);

hrms/payroll/doctype/payroll_settings/payroll_settings.json

@@ -20,6 +20,8 @@
   "show_leave_balances_in_salary_slip",
   "email_section",
   "email_salary_slip_to_employee",
+  "sender",
+  "sender_email",
   "column_break_iewr",
   "encrypt_salary_slips_in_emails",
   "password_policy",
@@ -155,13 +157,28 @@
    "fieldname": "consider_marked_attendance_on_holidays",
    "fieldtype": "Check",
    "label": "Consider Marked Attendance on Holidays"
+  },
+  {
+   "depends_on": "eval:doc.email_salary_slip_to_employee",
+   "fieldname": "sender",
+   "fieldtype": "Link",
+   "label": "Sender",
+   "options": "Email Account"
+  },
+  {
+   "depends_on": "eval:doc.sender",
+   "fetch_from": "sender.email_id",
+   "fieldname": "sender_email",
+   "fieldtype": "Data",
+   "label": "Sender Email",
+   "read_only": 1
   }
  ],
  "icon": "fa fa-cog",
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-09-25 14:03:59.215240",
+ "modified": "2023-11-01 13:51:04.225492",
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Payroll Settings",

hrms/payroll/doctype/salary_slip/salary_slip.py

@@ -1791,6 +1791,7 @@ def email_salary_slip(self):
 
 		if receiver:
 			email_args = {
+				"sender": payroll_settings.sender_email,
 				"recipients": [receiver],
 				"message": _(message),
 				"subject": "Salary Slip - from {0} to {1}".format(self.start_date, self.end_date),

hrms/payroll/doctype/salary_slip/salary_slip_loan_utils.py

@@ -79,6 +79,7 @@ def _get_loan_details(doc: "SalarySlip"):
 			"docstatus": 1,
 			"repay_from_salary": 1,
 			"company": doc.company,
+			"status": ("!=", "Closed"),
 		},
 	)