Merge pull request #4106 from frappe/version-16-hotfix

Author: asmitahase

hrms/hr/doctype/attendance/attendance.py

@@ -2,9 +2,12 @@
 # License: GNU General Public License v3. See license.txt
 
 
+from datetime import date
+
 import frappe
 from frappe import _
 from frappe.model.document import Document
+from frappe.query_builder.terms import ValueWrapper
 from frappe.utils import (
 	add_days,
 	cint,
@@ -249,10 +252,11 @@ def publish_update(self):
 
 
 @frappe.whitelist()
-def get_events(start, end, filters=None):
+def get_events(start: date | str, end: date | str, filters: str | list | None = None) -> list[dict]:
 	employee = frappe.db.get_value("Employee", {"user_id": frappe.session.user})
 	if not employee:
 		return []
+
 	if isinstance(filters, str):
 		import json
 
@@ -270,7 +274,7 @@ def add_attendance(filters):
 		"Attendance",
 		fields=[
 			"name",
-			"'Attendance' as doctype",
+			ValueWrapper("Attendance").as_("doctype"),
 			"attendance_date",
 			"employee_name",
 			"status",
@@ -279,7 +283,7 @@ def add_attendance(filters):
 		filters=filters,
 	)
 	for record in attendance:
-		record["title"] = f"{record.employee_name} : {record.status}"
+		record["title"] = f"{record['employee_name']} : {record['status']}"
 	return attendance
 
 
@@ -338,7 +342,7 @@ def mark_attendance(
 
 
 @frappe.whitelist()
-def mark_bulk_attendance(data):
+def mark_bulk_attendance(data: str | dict):
 	import json
 
 	if isinstance(data, str):
@@ -348,11 +352,11 @@ def mark_bulk_attendance(data):
 		frappe.throw(_("Please select a date."))
 		return
 
-	for date in data.unmarked_days:
+	for attendance_date in data.unmarked_days:
 		doc_dict = {
 			"doctype": "Attendance",
 			"employee": data.employee,
-			"attendance_date": get_datetime(date),
+			"attendance_date": get_datetime(attendance_date),
 			"status": data.status,
 			"half_day_status": "Absent" if data.status == "Half Day" else None,
 			"shift": data.shift,

hrms/hr/doctype/attendance/test_attendance.py

@@ -22,6 +22,7 @@
 from hrms.hr.doctype.attendance.attendance import (
 	DuplicateAttendanceError,
 	OverlappingShiftAttendanceError,
+	get_events,
 	get_unmarked_days,
 	mark_attendance,
 )
@@ -268,5 +269,29 @@ def test_duplicate_attendance_when_created_from_checkins_and_tool(self):
 		)
 		self.assertEqual(len(attendances), 1)
 
+	def test_get_events_returns_attendance(self):
+		employee = make_employee("calendar.user@example.com", company="_Test Company")
+
+		attendance_name = mark_attendance(employee, getdate(), status="Present")
+		attendance = frappe.get_value("Attendance", attendance_name, "status")
+
+		self.assertEqual(attendance, "Present")
+
+		frappe.set_user("calendar.user@example.com")
+		try:
+			events = get_events(start=getdate(), end=getdate())
+		finally:
+			frappe.set_user("Administrator")
+
+		self.assertTrue(events)
+		attendance_events = [e for e in events if e.get("doctype") == "Attendance"]
+		self.assertTrue(attendance_events)
+		self.assertEqual(attendance_events[0].get("status"), "Present")
+		self.assertEqual(
+			attendance_events[0].get("employee_name"),
+			frappe.db.get_value("Employee", employee, "employee_name"),
+		)
+		self.assertEqual(attendance_events[0].get("attendance_date"), getdate())
+
 	def tearDown(self):
 		frappe.db.rollback()

hrms/hr/doctype/employee_onboarding/employee_onboarding.json

@@ -70,7 +70,7 @@
    "default": "Pending",
    "fieldname": "boarding_status",
    "fieldtype": "Select",
-   "label": "Status",
+   "label": "Boarding Status",
    "options": "Pending\nIn Process\nCompleted",
    "read_only": 1
   },
@@ -174,11 +174,11 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-27 13:09:39.939109",
+ "modified": "2026-02-05 13:46:25.874832",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Employee Onboarding",
- "naming_rule": "Expression (old style)",
+ "naming_rule": "Expression",
  "owner": "Administrator",
  "permissions": [
   {
@@ -209,9 +209,10 @@
    "write": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "employee_name",
  "track_changes": 1
-}
+}

hrms/hr/doctype/employee_onboarding/employee_onboarding_list.js

@@ -5,7 +5,7 @@ frappe.listview_settings["Employee Onboarding"] = {
 		return [
 			__(doc.boarding_status),
 			frappe.utils.guess_colour(doc.boarding_status),
-			"status,=," + doc.boarding_status,
+			"boarding_status,=," + doc.boarding_status,
 		];
 	},
 };

hrms/hr/report/employee_advance_summary/employee_advance_summary.py

@@ -2,6 +2,8 @@
 # For license information, please see license.txt
 
 
+from pypika import Order
+
 import frappe
 from frappe import _, msgprint
 
@@ -27,6 +29,7 @@ def execute(filters=None):
 			advance.advance_amount,
 			advance.paid_amount,
 			advance.claimed_amount,
+			advance.return_amount,
 			advance.status,
 			advance.currency,
 		]
@@ -80,6 +83,13 @@ def get_columns():
 			"options": "currency",
 			"width": 120,
 		},
+		{
+			"label": _("Returned Amount"),
+			"fieldname": "return_amount",
+			"fieldtype": "Currency",
+			"options": "currency",
+			"width": 120,
+		},
 		{"label": _("Status"), "fieldname": "status", "fieldtype": "Data", "width": 120},
 		{
 			"label": _("Currency"),
@@ -92,31 +102,42 @@ def get_columns():
 	]
 
 
-def get_conditions(filters):
-	conditions = ""
+def get_advances(filters):
+	EmployeeAdvance = frappe.qb.DocType("Employee Advance")
+
+	query = (
+		frappe.qb.from_(EmployeeAdvance)
+		.select(
+			EmployeeAdvance.name,
+			EmployeeAdvance.employee,
+			EmployeeAdvance.paid_amount,
+			EmployeeAdvance.status,
+			EmployeeAdvance.advance_amount,
+			EmployeeAdvance.claimed_amount,
+			EmployeeAdvance.return_amount,
+			EmployeeAdvance.company,
+			EmployeeAdvance.posting_date,
+			EmployeeAdvance.purpose,
+			EmployeeAdvance.currency,
+		)
+		.where(EmployeeAdvance.docstatus < 2)
+	)
 
 	if filters.get("employee"):
-		conditions += "and employee = %(employee)s"
+		query = query.where(EmployeeAdvance.employee == filters.employee)
+
 	if filters.get("company"):
-		conditions += " and company = %(company)s"
+		query = query.where(EmployeeAdvance.company == filters.company)
+
 	if filters.get("status"):
-		conditions += " and status = %(status)s"
-	if filters.get("from_date"):
-		conditions += " and posting_date>=%(from_date)s"
-	if filters.get("to_date"):
-		conditions += " and posting_date<=%(to_date)s"
+		query = query.where(EmployeeAdvance.status == filters.status)
 
-	return conditions
+	if filters.get("from_date"):
+		query = query.where(EmployeeAdvance.posting_date >= filters.from_date)
 
+	if filters.get("to_date"):
+		query = query.where(EmployeeAdvance.posting_date <= filters.to_date)
 
-def get_advances(filters):
-	conditions = get_conditions(filters)
-	return frappe.db.sql(
-		"""select name, employee, paid_amount, status, advance_amount, claimed_amount, company,
-		posting_date, purpose, currency
-		from `tabEmployee Advance`
-		where docstatus<2 %s order by posting_date, name desc"""
-		% conditions,
-		filters,
-		as_dict=1,
+	return query.orderby(EmployeeAdvance.posting_date, EmployeeAdvance.name, order=Order.desc).run(
+		as_dict=True
 	)

hrms/hr/report/shift_attendance/shift_attendance.js

@@ -59,6 +59,12 @@ frappe.query_reports["Shift Attendance"] = {
 			fieldtype: "Check",
 			default: 1,
 		},
+		{
+			fieldname: "include_attendance_without_checkins",
+			label: __("Include Shift Attendance Without Checkins"),
+			fieldtype: "Check",
+			default: 0,
+		},
 	],
 	formatter: (value, row, column, data, default_formatter) => {
 		value = default_formatter(value, row, column, data);

hrms/hr/report/shift_attendance/shift_attendance.py

@@ -5,8 +5,11 @@
 
 import frappe
 from frappe import _
+from frappe.query_builder import Criterion
 from frappe.utils import cint, flt, format_datetime, format_duration
 
+from erpnext.accounts.utils import build_qb_match_conditions
+
 
 def execute(filters=None):
 	columns = get_columns()
@@ -130,9 +133,10 @@ def get_columns():
 
 
 def get_data(filters):
-	query = get_query(filters)
-	data = query.run(as_dict=True)
+	data = get_attendance_with_checkins(filters)
 	data = update_data(data, filters)
+	if filters.include_attendance_without_checkins:
+		data.extend(get_attendance_without_checkins(filters))
 	return data
 
 
@@ -209,15 +213,41 @@ def get_chart_data(data):
 	return chart
 
 
-def get_query(filters):
+def get_attendance_with_checkins(filters):
 	attendance = frappe.qb.DocType("Attendance")
 	checkin = frappe.qb.DocType("Employee Checkin")
 	shift_type = frappe.qb.DocType("Shift Type")
 
 	query = (
-		frappe.qb.from_(attendance)
+		get_base_attendance_query(filters)
 		.inner_join(checkin)
 		.on(checkin.attendance == attendance.name)
+		.select(
+			checkin.shift_start,
+			checkin.shift_end,
+			checkin.shift_actual_start,
+			checkin.shift_actual_end,
+			shift_type.enable_late_entry_marking,
+			shift_type.late_entry_grace_period,
+			shift_type.enable_early_exit_marking,
+			shift_type.early_exit_grace_period,
+		)
+	)
+	for field in filters:
+		if field == "late_entry" and not filters.consider_grace_period:
+			query = query.where(attendance.in_time > checkin.shift_start)
+		elif field == "early_exit" and not filters.consider_grace_period:
+			query = query.where(attendance.out_time < checkin.shift_end)
+	result = query.run(as_dict=True)
+	return result
+
+
+def get_base_attendance_query(filters):
+	attendance = frappe.qb.DocType("Attendance")
+	shift_type = frappe.qb.DocType("Shift Type")
+
+	query = (
+		frappe.qb.from_(attendance)
 		.inner_join(shift_type)
 		.on(attendance.shift == shift_type.name)
 		.select(
@@ -234,36 +264,39 @@ def get_query(filters):
 			attendance.early_exit,
 			attendance.department,
 			attendance.company,
-			checkin.shift_start,
-			checkin.shift_end,
-			checkin.shift_actual_start,
-			checkin.shift_actual_end,
-			shift_type.enable_late_entry_marking,
-			shift_type.late_entry_grace_period,
-			shift_type.enable_early_exit_marking,
-			shift_type.early_exit_grace_period,
 		)
 		.where(attendance.docstatus == 1)
 		.groupby(attendance.name)
 	)
 
-	for filter in filters:
-		if filter == "from_date":
+	for field in filters:
+		if field == "from_date":
 			query = query.where(attendance.attendance_date >= filters.from_date)
-		elif filter == "to_date":
+		elif field == "to_date":
 			query = query.where(attendance.attendance_date <= filters.to_date)
-		elif filter == "consider_grace_period":
+		elif field in ["consider_grace_period", "include_attendance_without_checkins"]:
 			continue
-		elif filter == "late_entry" and not filters.consider_grace_period:
-			query = query.where(attendance.in_time > checkin.shift_start)
-		elif filter == "early_exit" and not filters.consider_grace_period:
-			query = query.where(attendance.out_time < checkin.shift_end)
 		else:
-			query = query.where(attendance[filter] == filters[filter])
+			query = query.where(attendance[field] == filters[field])
 
+	query = query.where(Criterion.all(build_qb_match_conditions("Attendance")))
 	return query
 
 
+def get_attendance_without_checkins(filters):
+	attendance = frappe.qb.DocType("Attendance")
+	checkin = frappe.qb.DocType("Employee Checkin")
+
+	query = (
+		get_base_attendance_query(filters)
+		.left_join(checkin)
+		.on(checkin.attendance == attendance.name)
+		.where(checkin.attendance.isnull())
+	)
+	result = query.run(as_dict=True)
+	return result
+
+
 def update_data(data, filters):
 	for d in data:
 		update_late_entry(d, filters.consider_grace_period)