nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 16:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: half day in holiday list

Browse Source
This commit is contained in:
Asmita Hase
2025-09-10 22:11:33 +05:30
parent 0af4515afd
commit 3ce6da3b71
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/setup/doctype/employee/employee.py
View File

@@ -254,7 +254,11 @@ def get_employee_email(employee_doc):
)
def get_holiday_list_for_employee(employee, raise_exception=True):
def get_holiday_list_for_employee(employee, raise_exception=True, as_on=None):
hrms_override = frappe.get_hooks("employee_holiday_list")
if hrms_override:
return frappe.get_attr(hrms_override[-1])(employee, raise_exception, as_on)
if employee:
holiday_list, company = frappe.get_cached_value("Employee", employee, ["holiday_list", "company"])
else:

20
erpnext/setup/doctype/holiday_list/holiday_list.py
View File

@@ -203,7 +203,25 @@ def is_holiday(holiday_list, date=None):
if date is None:
date = today()
if holiday_list:
return bool(frappe.db.exists("Holiday", {"parent": holiday_list, "holiday_date": date}, cache=True))
return bool(
frappe.db.exists(
"Holiday", {"parent": holiday_list, "holiday_date": date, "is_half_day": 0}, cache=True
)
)
else:
return False
def is_half_holiday(holiday_list, date=None):
"""Returns true if the given date is a half holiday in the given holiday list"""
if date is None:
date = today()
if holiday_list:
return bool(
frappe.db.exists(
"Holiday", {"parent": holiday_list, "holiday_date": date, "is_half_day": 1}, cache=True
)
)
else:
return False