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

chore: release v15

Author: ruchamahabal

hrms/hr/doctype/leave_application/leave_application.js

@@ -102,6 +102,15 @@ frappe.ui.form.on("Leave Application", {
 		frm.set_intro("");
 		if (frm.doc.__islocal && !in_list(frappe.user_roles, "Employee")) {
 			frm.set_intro(__("Fill the form and save it"));
+		} else if (
+			frm.perm[0] &&
+			frm.perm[0].submit &&
+			!frm.is_dirty() &&
+			!frm.is_new() &&
+			!frappe.model.has_workflow(this.doctype) &&
+			frm.doc.docstatus === 0
+		) {
+			frm.set_intro(__("Submit this Leave Application to confirm."));
 		}
 
 		frm.trigger("set_employee");

hrms/hr/doctype/shift_assignment/shift_assignment.py

@@ -459,7 +459,11 @@ def get_prev_or_next_shift(
 		for date_range in shift_dates:
 			# midnight shifts will span more than a day
 			start_date, end_date = date_range[0], add_days(date_range[1], 1)
-			reverse = next_shift_direction == "reverse"
+
+			if reverse := (next_shift_direction == "reverse"):
+				end_date = min(end_date, for_timestamp.date())
+			elif next_shift_direction == "forward":
+				start_date = max(start_date, for_timestamp.date())
 
 			for dt in generate_date_range(start_date, end_date, reverse=reverse):
 				shift_details = get_employee_shift(

hrms/hr/doctype/shift_assignment/test_shift_assignment.py

@@ -295,3 +295,36 @@ def test_consecutive_day_and_night_shifts(self):
 		self.assertEqual(checkin.shift_type, checkout.shift_type)
 		self.assertEqual(checkin.actual_start.date(), today)
 		self.assertEqual(checkout.actual_end.date(), today)
+
+	def test_shift_details_on_consecutive_days_with_overlapping_timings(self):
+		# defaults
+		employee = make_employee("[email protected]", company="_Test Company")
+		today = getdate()
+		yesterday = add_days(today, -1)
+
+		# shift 1
+		shift_type = setup_shift_type(shift_type="Morning", start_time="07:00:00", end_time="12:00:00")
+		make_shift_assignment(shift_type.name, employee, add_days(yesterday, -1), yesterday)
+
+		# shift 2
+		shift_type = setup_shift_type(shift_type="Afternoon", start_time="09:30:00", end_time="14:00:00")
+		make_shift_assignment(shift_type.name, employee, today, add_days(today, 1))
+
+		# current_shift shift log - checkin in the grace period of current shift, non-overlapping with prev shift
+		current_shift = get_actual_start_end_datetime_of_shift(
+			employee, get_datetime(f"{today} 14:01:00"), True
+		)
+		self.assertEqual(current_shift.shift_type.name, "Afternoon")
+		self.assertEqual(current_shift.actual_start, get_datetime(f"{today} 08:30:00"))
+		self.assertEqual(current_shift.actual_end, get_datetime(f"{today} 15:00:00"))
+
+		# previous shift
+		checkin = get_actual_start_end_datetime_of_shift(
+			employee, get_datetime(f"{yesterday} 07:01:00"), True
+		)
+		checkout = get_actual_start_end_datetime_of_shift(
+			employee, get_datetime(f"{yesterday} 13:00:00"), True
+		)
+		self.assertTrue(checkin.shift_type.name == checkout.shift_type.name == "Morning")
+		self.assertEqual(checkin.actual_start, get_datetime(f"{yesterday} 06:00:00"))
+		self.assertEqual(checkout.actual_end, get_datetime(f"{yesterday} 13:00:00"))

hrms/hr/doctype/shift_type/test_shift_type.py

@@ -371,6 +371,29 @@ def test_mark_absent_for_dates_with_no_attendance_for_midnight_shift(self):
 		self.assertEqual(len(absent_records), 2)
 
 	def test_do_not_mark_absent_before_shift_actual_end_time(self):
+		from hrms.hr.doctype.employee_checkin.test_employee_checkin import make_checkin
+
+		employee = make_employee("[email protected]", company="_Test Company")
+		today = getdate()
+		yesterday = add_days(today, -1)
+
+		# shift 1
+		shift_1 = setup_shift_type(shift_type="Morning", start_time="07:00:00", end_time="12:30:00")
+		make_shift_assignment(shift_1.name, employee, add_days(yesterday, -1), yesterday)
+
+		# shift 2
+		shift_2 = setup_shift_type(shift_type="Afternoon", start_time="09:30:00", end_time="18:00:00")
+		make_shift_assignment(shift_2.name, employee, today, add_days(today, 1))
+
+		# update last sync of checkin for shift 2
+		shift_2.process_attendance_after = add_days(today, -2)
+		shift_2.last_sync_of_checkin = datetime.combine(today, get_time("09:01:00"))
+		shift_2.save()
+		shift_2.process_auto_attendance()
+
+		self.assertIsNone(frappe.db.get_value("Attendance", {"attendance_date": today, "employee": employee}))
+
+	def test_do_not_mark_absent_before_shift_actual_end_time_for_midnight_shift(self):
 		"""
 		Tests employee is not marked absent for a shift spanning 2 days
 		before its actual end time

hrms/patches.txt

@@ -22,4 +22,5 @@ hrms.patches.v15_0.rename_and_update_leave_encashment_fields
 hrms.patches.v14_0.update_title_in_employee_onboarding_and_separation_templates
 hrms.patches.v15_0.make_hr_settings_tab_in_company_master
 hrms.patches.v15_0.enable_allow_checkin_setting
-hrms.patches.v15_0.set_default_asset_action_in_fnf
+hrms.patches.v15_0.set_default_asset_action_in_fnf
+hrms.patches.v15_0.add_loan_docperms_to_ess

hrms/patches/v15_0/add_loan_docperms_to_ess.py

@@ -0,0 +1,8 @@
+import frappe
+
+from hrms.setup import add_lending_docperms_to_ess
+
+
+def execute():
+	if "lending" in frappe.get_installed_apps():
+		add_lending_docperms_to_ess()

hrms/payroll/doctype/payroll_period/payroll_period.json

@@ -53,7 +53,7 @@
   }
  ],
  "links": [],
- "modified": "2020-06-29 17:17:12.689089",
+ "modified": "2024-05-05 14:50:12.419714",
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Payroll Period",
@@ -71,6 +71,15 @@
    "share": 1,
    "write": 1
   },
+  {
+    "email": 1,
+    "export": 1,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "Employee",
+    "share": 1
+   },
   {
    "create": 1,
    "delete": 1,