schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(Holiday List): sort holidays on save to avoid disorienting the user (backport #42236) (#42250)

Browse Source 
fix(Holiday List): sort holidays on save to avoid disorienting the user (#42236)

fix: sort holidays on save to avoid disorienting the user
(cherry picked from commit ad137250fc)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
This commit is contained in:
mergify[bot]
2024-07-09 17:53:38 +05:30
committed by GitHub
parent 2deea33a85
commit b5556156c1
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,7 @@ class HolidayList(Document):
self.validate_days()
self.total_holidays = len(self.holidays)
self.validate_duplicate_date()
self.sort_holidays()
@frappe.whitelist()
def get_weekly_off_dates(self):
@@ -57,8 +58,6 @@ class HolidayList(Document):
self.append("holidays", {"description": _(self.weekly_off), "holiday_date": d, "weekly_off": 1})
self.sort_holidays()
@frappe.whitelist()
def get_supported_countries(self):
from holidays.utils import list_supported_countries
@@ -100,8 +99,6 @@ class HolidayList(Document):
"holidays", {"description": holiday_name, "holiday_date": holiday_date, "weekly_off": 0}
)
self.sort_holidays()
def sort_holidays(self):
self.holidays.sort(key=lambda x: getdate(x.holiday_date))
for i in range(len(self.holidays)):