Merge branch 'develop' into patch-1

Author: Gubbu77

.github/workflows/stale.yml

@@ -16,11 +16,22 @@ jobs:
           days-before-pr-close: 3
           stale-pr-label: 'Inactive'
           exempt-draft-pr: true
-          days-before-issue-stale: -1
-          days-before-issue-close: -1
+          days-before-issue-stale: 5
+          days-before-issue-close: 2
+          stale-issue-label: 'Inactive'
+          any-of-issue-labels: "question,can't replicate"
+          remove-issue-stale-when-updated: true
+          labels-to-remove-when-unstale: 'Inactive'
           stale-pr-message: |
             This pull request is being marked as inactive because of no recent activity. 
             If your PR hasn't been reviewed, it's likely because it doesn't fullfill the [contribution guidelines](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines). Please read them carefully and fix the pull request. When you are sure all items are checked, please ping relevant codeowner in the comment. Be nice, they have a lot on their plate too.
             
             It will be closed in 3 days if no further activity occurs.
             Thank you for contributing!
+          stale-issue-message: |
+            Hi, this is your friendly neighbourhood bot :)
+            
+            Thank you for taking time to report the issue, however your description of the issue is insufficient to understand the exact problem and/or to replicate and fix it. Please provide the information requested by the maintainers, so this can be fixed. More the steps/screenshots/videos the better.
+
+            It will be closed in 2 days if no further activity occurs.
+            Beep Boop!

hrms/hr/doctype/attendance/attendance.json

@@ -81,7 +81,7 @@
    "fieldname": "working_hours",
    "fieldtype": "Float",
    "label": "Working Hours",
-   "precision": "1",
+   "precision": "2",
    "read_only": 1
   },
   {
@@ -259,7 +259,7 @@
  "idx": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2025-07-10 11:39:04.327505",
+ "modified": "2025-12-16 17:44:13.859387",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Attendance",

hrms/hr/doctype/overtime_type/test_overtime_type.py

@@ -21,7 +21,7 @@ def create_overtime_type(**args):
 	args = frappe._dict(args)
 
 	overtime_type = frappe.new_doc("Overtime Type")
-	overtime_type.name = "_Test Overtime"
+	overtime_type.name = args.get("name") or "_Test Overtime"
 	overtime_type.overtime_calculation_method = args.overtime_calculation_method or "Salary Component Based"
 	overtime_type.standard_multiplier = 1
 	overtime_type.applicable_for_weekend = args.applicable_for_weekend or 0

hrms/hr/doctype/shift_assignment/shift_assignment.py

@@ -601,6 +601,8 @@ def get_shift_details(shift_type_name: str, for_timestamp: datetime | None = Non
 
 	actual_start = start_datetime - timedelta(minutes=shift_type.begin_check_in_before_shift_start_time)
 	actual_end = end_datetime + timedelta(minutes=shift_type.allow_check_out_after_shift_end_time)
+	allow_overtime = shift_type.allow_overtime
+	overtime_type = shift_type.overtime_type
 
 	return frappe._dict(
 		{
@@ -609,6 +611,8 @@ def get_shift_details(shift_type_name: str, for_timestamp: datetime | None = Non
 			"end_datetime": end_datetime,
 			"actual_start": actual_start,
 			"actual_end": actual_end,
+			"allow_overtime": allow_overtime,
+			"overtime_type": overtime_type,
 		}
 	)
 
@@ -623,6 +627,8 @@ def get_shift_type(shift_type_name: str) -> dict:
 			"end_time",
 			"begin_check_in_before_shift_start_time",
 			"allow_check_out_after_shift_end_time",
+			"allow_overtime",
+			"overtime_type",
 		],
 		as_dict=1,
 	)

hrms/hr/doctype/shift_assignment/test_shift_assignment.py

@@ -1,18 +1,23 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
+from datetime import timedelta
+
 import frappe
-from frappe.utils import add_days, get_datetime, getdate, nowdate
+from frappe.utils import add_days, get_datetime, getdate, now_datetime, nowdate
 
 from erpnext.setup.doctype.employee.test_employee import make_employee
 
+from hrms.hr.doctype.employee_checkin.test_employee_checkin import make_checkin
+from hrms.hr.doctype.overtime_type.test_overtime_type import create_overtime_type
 from hrms.hr.doctype.shift_assignment.shift_assignment import (
 	MultipleShiftError,
 	OverlappingShiftError,
 	get_actual_start_end_datetime_of_shift,
 	get_events,
 )
 from hrms.hr.doctype.shift_type.test_shift_type import make_shift_assignment, setup_shift_type
+from hrms.payroll.doctype.salary_component.test_salary_component import create_salary_component
 from hrms.tests.utils import HRMSTestSuite
 
 test_dependencies = ["Shift Type"]
@@ -251,3 +256,52 @@ def test_shift_details_on_consecutive_days_with_overlapping_timings(self):
 		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"))
+
+	def test_auto_attendance_calculates_ot_for_default_shift(self):
+		"""Ensure overtime is calculated when employee works beyond default shift hours."""
+		salary_component = create_salary_component("Overtime")
+
+		overtime_type = create_overtime_type(
+			name="_Test Overtime Type",
+			maximum_overtime_hours_allowed=5,
+			overtime_calculation_method="Fixed Hourly Rate",
+			overtime_salary_component=salary_component.name,
+		)
+
+		shift_type = setup_shift_type(
+			shift_type="_Test OT Shift",
+			start_time="08:00:00",
+			end_time="17:00:00",
+			allow_overtime=1,
+			overtime_type=overtime_type.name,
+			enable_auto_attendance=1,
+			allow_check_out_after_shift_end_time=300,
+			last_sync_of_checkin=now_datetime() + timedelta(days=2),
+		)
+
+		employee = make_employee(
+			"test_ot_default_shift@example.com",
+			company="_Test Company",
+			default_shift=shift_type.name,
+		)
+
+		make_checkin(employee, get_datetime(f"{getdate()} 08:00:00"))
+		make_checkin(employee, get_datetime(f"{getdate()} 19:00:00"), log_type="OUT")
+
+		shift_type.process_auto_attendance()
+
+		attendance = frappe.db.get_value(
+			"Attendance",
+			{
+				"employee": employee,
+				"attendance_date": getdate(),
+				"docstatus": ["!=", 2],
+			},
+			["overtime_type", "working_hours", "actual_overtime_duration"],
+			as_dict=True,
+		)
+
+		self.assertIsNotNone(attendance)
+		self.assertEqual(attendance.overtime_type, shift_type.overtime_type)
+		self.assertEqual(attendance.working_hours, 11.0)
+		self.assertEqual(attendance.actual_overtime_duration, 2.0)

hrms/hr/doctype/shift_assignment_tool/test_shift_assignment_tool.py

@@ -112,6 +112,7 @@ def test_get_employees_for_assigning_shift_schedule(self):
 
 	def test_get_shift_requests(self):
 		today = getdate()
+		setup_shift_type(shift_type="Day Shift")
 
 		for emp in [self.emp1, self.emp2, self.emp3, self.emp4, self.emp5]:
 			employee = frappe.get_doc("Employee", emp)
@@ -251,6 +252,7 @@ def test_bulk_process_shift_requests(self):
 			employee.shift_request_approver = "employee1@test.com"
 			employee.save()
 
+		setup_shift_type(shift_type="Day Shift")
 		request1 = make_shift_request(
 			employee=self.emp1,
 			employee_name="employee1@test.com",

hrms/hr/doctype/shift_type/shift_type.json

@@ -81,14 +81,14 @@
    "fieldname": "working_hours_threshold_for_half_day",
    "fieldtype": "Float",
    "label": "Working Hours Threshold for Half Day",
-   "precision": "1"
+   "precision": "2"
   },
   {
    "description": "Working hours below which Absent is marked. (Zero to disable)",
    "fieldname": "working_hours_threshold_for_absent",
    "fieldtype": "Float",
    "label": "Working Hours Threshold for Absent",
-   "precision": "1"
+   "precision": "2"
   },
   {
    "default": "60",
@@ -210,7 +210,7 @@
   }
  ],
  "links": [],
- "modified": "2024-12-18 19:03:38.278336",
+ "modified": "2025-12-16 16:32:49.169920",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Shift Type",
@@ -251,8 +251,9 @@
   }
  ],
  "quick_entry": 1,
+ "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

hrms/hr/doctype/shift_type/test_shift_type.py

@@ -868,6 +868,52 @@ def test_bg_job_creation_for_large_checkins(self):
 		job = frappe.get_all("RQ Job", {"job_id": f"process_auto_attendance_{shift.name}"})
 		self.assertTrue(job)
 
+	def test_precision_for_working_hours_threshold(self):
+		shift = setup_shift_type(
+			start_time="10:00:00",
+			end_time="18:00:00",
+			working_hours_threshold_for_half_day=4.75,
+			working_hours_threshold_for_absent=1.25,
+		)
+		employee = make_employee(
+			"test_working_hours@example.com", company="_Test Company", default_shift=shift.name
+		)
+		from hrms.hr.doctype.employee_checkin.test_employee_checkin import make_checkin
+
+		in_time = datetime.combine(getdate(), get_time("10:00:00"))
+		make_checkin(employee, in_time)
+
+		# checked out before completing absent hours threshold
+		out_time = datetime.combine(getdate(), get_time("11:14:00"))
+		check_out = make_checkin(employee, out_time)
+		shift.process_auto_attendance()
+		attendance = frappe.get_doc(
+			"Attendance", {"employee": employee, "shift": shift.name, "attendance_date": getdate()}
+		)
+		self.assertEqual(attendance.status, "Absent")
+		attendance.cancel()
+
+		# barely passed absent hour threshold
+		check_out.time = datetime.combine(getdate(), get_time("11:15:00"))
+		check_out.save()
+		shift.process_auto_attendance()
+		attendance = frappe.get_doc(
+			"Attendance", {"employee": employee, "shift": shift.name, "attendance_date": getdate()}
+		)
+		self.assertEqual(attendance.status, "Half Day")
+		self.assertEqual(attendance.working_hours, 1.25)
+		attendance.cancel()
+
+		# barely passed half day hour threshold
+		check_out.time = datetime.combine(getdate(), get_time("14:45:00"))
+		check_out.save()
+		shift.process_auto_attendance()
+		attendance = frappe.get_doc(
+			"Attendance", {"employee": employee, "shift": shift.name, "attendance_date": getdate()}
+		)
+		self.assertEqual(attendance.status, "Present")
+		self.assertEqual(attendance.working_hours, 4.75)
+
 
 def setup_shift_type(**args):
 	args = frappe._dict(args)

hrms/hr/doctype/staffing_plan/staffing_plan.py

@@ -39,11 +39,10 @@ def set_total_estimated_budget(self):
 
 		for detail in self.get("staffing_details"):
 			# Set readonly fields
-			self.set_number_of_positions(detail)
 			designation_counts = get_designation_counts(detail.designation, self.company)
 			detail.current_count = designation_counts["employee_count"]
 			detail.current_openings = designation_counts["job_openings"]
-
+			self.set_number_of_positions(detail)
 			detail.total_estimated_cost = 0
 			if detail.number_of_positions > 0:
 				if detail.vacancies and detail.estimated_cost_per_position:
@@ -181,12 +180,14 @@ def set_job_requisitions(self, job_reqs):
 
 			self.staffing_details = []
 			for req in requisitions:
+				current_count = get_designation_counts(req.designation, self.company)["employee_count"]
 				self.append(
 					"staffing_details",
 					{
 						"designation": req.designation,
 						"vacancies": req.no_of_positions,
 						"estimated_cost_per_position": req.expected_compensation,
+						"number_of_positions": cint(current_count) + cint(req.no_of_positions),
 					},
 				)
 

hrms/hr/doctype/staffing_plan/test_staffing_plan.py

@@ -3,16 +3,22 @@
 
 import frappe
 from frappe.tests import IntegrationTestCase
-from frappe.utils import add_days, nowdate
+from frappe.utils import add_days, get_first_day, get_last_day, getdate, nowdate
+
+from erpnext.setup.doctype.employee.test_employee import make_employee
 
 from hrms.hr.doctype.staffing_plan.staffing_plan import ParentCompanyError, SubsidiaryCompanyError
 
 test_dependencies = ["Designation"]
 
 
 class TestStaffingPlan(IntegrationTestCase):
+	def setUp(self):
+		for doctype in ["Staffing Plan", "Staffing Plan Detail"]:
+			frappe.db.delete(doctype)
+		make_company()
+
 	def test_staffing_plan(self):
-		_set_up()
 		frappe.db.set_value("Company", "_Test Company 3", "is_group", 1)
 		if frappe.db.exists("Staffing Plan", "Test"):
 			return
@@ -45,7 +51,6 @@ def test_staffing_plan_subsidiary_company(self):
 		self.assertRaises(SubsidiaryCompanyError, staffing_plan.insert)
 
 	def test_staffing_plan_parent_company(self):
-		_set_up()
 		if frappe.db.exists("Staffing Plan", "Test"):
 			return
 		staffing_plan = frappe.new_doc("Staffing Plan")
@@ -74,11 +79,32 @@ def test_staffing_plan_parent_company(self):
 		staffing_plan.insert()
 		self.assertRaises(ParentCompanyError, staffing_plan.submit)
 
+	def test_staffing_details_from_job_requisition(self):
+		from hrms.hr.doctype.job_requisition.test_job_requisition import make_job_requisition
 
-def _set_up():
-	for doctype in ["Staffing Plan", "Staffing Plan Detail"]:
-		frappe.db.sql(f"delete from `tab{doctype}`")
-	make_company()
+		employee = make_employee("test_sp@example.com", company="_Test Company", designation="Accountant")
+		requisition = make_job_requisition(requested_by=employee, designation="Accountant", no_of_positions=4)
+		staffing_plan = frappe.get_doc(
+			{
+				"doctype": "Staffing Plan",
+				"__newname": "Test JR",
+				"company": "_Test Company",
+				"from_date": get_first_day(getdate()),
+				"to_date": get_last_day(getdate()),
+			}
+		)
+		staffing_plan.set_job_requisitions([requisition.name])
+		staffing_plan.save()
+		staffing_plan_detail = frappe.db.get_values(
+			"Staffing Plan Detail",
+			{"parent": staffing_plan.name},
+			["designation", "vacancies", "current_count", "number_of_positions"],
+			as_dict=True,
+		)[0]
+		self.assertEqual(staffing_plan_detail.designation, "Accountant")
+		self.assertEqual(staffing_plan_detail.vacancies, 4)
+		self.assertEqual(staffing_plan_detail.current_count, 1)
+		self.assertEqual(staffing_plan_detail.number_of_positions, 5)
 
 
 def make_company(name=None, abbr=None):