feat(Attendance): Half Day Present / Half Day Leave

hrms/hr/doctype/attendance/attendance.js

@@ -11,6 +11,17 @@ frappe.ui.form.on("Attendance", {
 			return {
 				query: "erpnext.controllers.queries.employee_query",
 			};
-		});
+		}),
+			(frm.fields_dict["leave_details"].grid.get_field("leave_application").get_query =
+				function (doc) {
+					return {
+						filters: {
+							company: doc.company,
+							employee: doc.employee,
+							from_date: ["<=", doc.attendance_date],
+							to_date: [">=", doc.attendance_date],
+						},
+					};
+				});
 	},
 });

hrms/hr/doctype/attendance/attendance.json

@@ -11,10 +11,8 @@
   "naming_series",
   "employee",
   "employee_name",
-  "working_hours",
   "status",
-  "leave_type",
-  "leave_application",
+  "half_day_status",
   "column_break0",
   "attendance_date",
   "company",
@@ -25,9 +23,12 @@
   "in_time",
   "out_time",
   "column_break_18",
-  "late_entry",
+  "working_hours",
   "early_exit",
-  "amended_from"
+  "late_entry",
+  "amended_from",
+  "section_break_vxxb",
+  "leave_details"
  ],
  "fields": [
   {
@@ -90,25 +91,6 @@
    "reqd": 1,
    "search_index": 1
   },
-  {
-   "depends_on": "eval:in_list([\"On Leave\", \"Half Day\"], doc.status)",
-   "fieldname": "leave_type",
-   "fieldtype": "Link",
-   "in_standard_filter": 1,
-   "label": "Leave Type",
-   "mandatory_depends_on": "eval:in_list([\"On Leave\", \"Half Day\"], doc.status)",
-   "oldfieldname": "leave_type",
-   "oldfieldtype": "Link",
-   "options": "Leave Type"
-  },
-  {
-   "fieldname": "leave_application",
-   "fieldtype": "Link",
-   "label": "Leave Application",
-   "no_copy": 1,
-   "options": "Leave Application",
-   "read_only": 1
-  },
   {
    "fieldname": "column_break0",
    "fieldtype": "Column Break",
@@ -146,12 +128,14 @@
    "read_only": 1
   },
   {
+   "depends_on": "shift",
    "fieldname": "shift",
    "fieldtype": "Link",
    "label": "Shift",
    "options": "Shift Type"
   },
   {
+   "depends_on": "attendance_request",
    "fieldname": "attendance_request",
    "fieldtype": "Link",
    "label": "Attendance Request",
@@ -170,12 +154,14 @@
   },
   {
    "default": "0",
+   "depends_on": "shift",
    "fieldname": "late_entry",
    "fieldtype": "Check",
    "label": "Late Entry"
   },
   {
    "default": "0",
+   "depends_on": "shift",
    "fieldname": "early_exit",
    "fieldtype": "Check",
    "label": "Early Exit"
@@ -202,13 +188,35 @@
   {
    "fieldname": "column_break_18",
    "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "eval:doc.status==\"Half Day\";",
+   "fieldname": "half_day_status",
+   "fieldtype": "Select",
+   "label": "Status for Other Half",
+   "no_copy": 1,
+   "options": "\nPresent\nAbsent"
+  },
+  {
+   "depends_on": "eval:in_list([\"On Leave\", \"Half Day\"], doc.status)",
+   "fieldname": "leave_details",
+   "fieldtype": "Table",
+   "label": "Leave Details",
+   "mandatory_depends_on": "eval:in_list([\"On Leave\", \"Half Day\"], doc.status)",
+   "no_copy": 1,
+   "options": "Leave Application Detail"
+  },
+  {
+   "fieldname": "section_break_vxxb",
+   "fieldtype": "Section Break"
   }
  ],
+ "grid_page_length": 50,
  "icon": "fa fa-ok",
  "idx": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2025-01-31 11:45:54.846562",
+ "modified": "2025-04-01 12:58:32.491823",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Attendance",
@@ -267,10 +275,11 @@
    "share": 1
   }
  ],
+ "row_format": "Dynamic",
  "search_fields": "employee,employee_name,attendance_date,status",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "employee_name",
  "track_changes": 1
-}
+}

hrms/hr/doctype/attendance/attendance.py

@@ -33,6 +33,9 @@ class OverlappingShiftAttendanceError(frappe.ValidationError):
 
 
 class Attendance(Document):
+	def before_insert(self):
+		self.half_day_status = None if self.half_day_status == "" else self.half_day_status
+
 	def validate(self):
 		from erpnext.controllers.status_updater import validate_status
 
@@ -83,6 +86,7 @@ def get_duplicate_attendance_record(self) -> str | None:
 				& (Attendance.docstatus < 2)
 				& (Attendance.attendance_date == self.attendance_date)
 				& (Attendance.name != self.name)
+				& (Attendance.half_day_status.isnull())
 			)
 			.for_update()
 		)
@@ -159,37 +163,22 @@ def check_leave_record(self):
 				& (LeaveApplication.docstatus == 1)
 			)
 		).run(as_dict=True)
-
 		if leave_record:
-			for d in leave_record:
-				self.leave_type = d.leave_type
-				self.leave_application = d.name
-				if d.half_day_date == getdate(self.attendance_date):
-					self.status = "Half Day"
-					frappe.msgprint(
-						_("Employee {0} on Half day on {1}").format(
-							self.employee, format_date(self.attendance_date)
-						)
-					)
-				else:
-					self.status = "On Leave"
-					frappe.msgprint(
-						_("Employee {0} is on Leave on {1}").format(
-							self.employee, format_date(self.attendance_date)
-						)
-					)
-
-		if self.status in ("On Leave", "Half Day"):
-			if not leave_record:
-				frappe.msgprint(
-					_("No leave record found for employee {0} on {1}").format(
-						self.employee, format_date(self.attendance_date)
-					),
-					alert=1,
+			if len(leave_record) > 1:
+				self.status = "On Leave"
+			elif leave_record[0].half_day_date == getdate(self.attendance_date):
+				self.status = "Half Day"
+				self.half_day_status = "Absent"
+			self.set("leave_details", [])
+			for record in leave_record:
+				self.append(
+					"leave_details",
+					{
+						"leave_application": record["name"],
+						"leave_type": record["leave_type"],
+						"half_day": record["half_day"],
+					},
 				)
-		elif self.leave_type:
-			self.leave_type = None
-			self.leave_application = None
 
 	def validate_employee(self):
 		emp = frappe.db.sql(

hrms/hr/doctype/compensatory_leave_request/compensatory_leave_request.py

@@ -39,6 +39,7 @@ def validate_attendance(self):
 			filters={
 				"attendance_date": ["between", (self.work_from_date, self.work_end_date)],
 				"status": ("in", ["Present", "Work From Home", "Half Day"]),
+				"half_day_status": ("!=", "Absent"),
 				"docstatus": 1,
 				"employee": self.employee,
 			},

hrms/hr/doctype/employee_checkin/employee_checkin.py

@@ -223,21 +223,39 @@ def mark_attendance_and_link_log(
 	elif attendance_status in ("Present", "Absent", "Half Day"):
 		try:
 			frappe.db.savepoint("attendance_creation")
-			attendance = frappe.new_doc("Attendance")
-			attendance.update(
-				{
-					"doctype": "Attendance",
-					"employee": employee,
-					"attendance_date": attendance_date,
-					"status": attendance_status,
-					"working_hours": working_hours,
-					"shift": shift,
-					"late_entry": late_entry,
-					"early_exit": early_exit,
-					"in_time": in_time,
-					"out_time": out_time,
-				}
-			).submit()
+			if attendance_status == "Half Day" and (
+				attendance := get_existing_half_day_attendance(employee, attendance_date)
+			):
+				frappe.db.set_value(
+					"Attendance",
+					attendance.name,
+					{
+						"half_day_status": "Present",
+						"working_hours": working_hours,
+						"shift": shift,
+						"late_entry": late_entry,
+						"early_exit": early_exit,
+						"in_time": in_time,
+						"out_time": out_time,
+					},
+				)
+			else:
+				attendance = frappe.new_doc("Attendance")
+				attendance.update(
+					{
+						"doctype": "Attendance",
+						"employee": employee,
+						"attendance_date": attendance_date,
+						"status": attendance_status,
+						"working_hours": working_hours,
+						"shift": shift,
+						"late_entry": late_entry,
+						"early_exit": early_exit,
+						"in_time": in_time,
+						"out_time": out_time,
+						"half_day_status": "Absent" if attendance_status == "Half Day" else None,
+					}
+				).submit()
 
 			if attendance_status == "Absent":
 				attendance.add_comment(
@@ -254,6 +272,22 @@ def mark_attendance_and_link_log(
 		frappe.throw(_("{} is an invalid Attendance Status.").format(attendance_status))
 
 
+def get_existing_half_day_attendance(employee, attendance_date):
+	attendance_name = frappe.db.exists(
+		"Attendance",
+		{
+			"employee": employee,
+			"attendance_date": attendance_date,
+			"status": "Half Day",
+			"half_day_status": "Absent",
+		},
+	)
+	if attendance_name:
+		attenadance_doc = frappe.get_doc("Attendance", attendance_name)
+		return attenadance_doc
+	return None
+
+
 def calculate_working_hours(logs, check_in_out_type, working_hours_calc_type):
 	"""Given a set of logs in chronological order calculates the total working hours based on the parameters.
 	Zero is returned for all invalid cases.