From 58fcd9d99972f5ee522e70c92f2d4b3bc26ea921 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 9 Jul 2024 14:56:25 +0530 Subject: [PATCH 1/2] 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 ad137250fc8c9421fd085afd83ed439dcbbd0568) # Conflicts: # erpnext/setup/doctype/holiday_list/holiday_list.py --- erpnext/setup/doctype/holiday_list/holiday_list.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/setup/doctype/holiday_list/holiday_list.py b/erpnext/setup/doctype/holiday_list/holiday_list.py index 94ec0b95675e..88da6e2c69d7 100644 --- a/erpnext/setup/doctype/holiday_list/holiday_list.py +++ b/erpnext/setup/doctype/holiday_list/holiday_list.py @@ -19,6 +19,11 @@ class HolidayList(Document): def validate(self): self.validate_days() self.total_holidays = len(self.holidays) +<<<<<<< HEAD +======= + self.validate_duplicate_date() + self.sort_holidays() +>>>>>>> ad137250fc (fix(Holiday List): sort holidays on save to avoid disorienting the user (#42236)) @frappe.whitelist() def get_weekly_off_dates(self): @@ -33,8 +38,6 @@ def get_weekly_off_dates(self): 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 @@ -76,8 +79,6 @@ def get_local_holidays(self): "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)): From fb32ea39bbca4f32ad33a39949ded5cb52708fdf Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 9 Jul 2024 17:53:09 +0530 Subject: [PATCH 2/2] chore: fix conflicts --- erpnext/setup/doctype/holiday_list/holiday_list.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/setup/doctype/holiday_list/holiday_list.py b/erpnext/setup/doctype/holiday_list/holiday_list.py index 88da6e2c69d7..4b51011c87d9 100644 --- a/erpnext/setup/doctype/holiday_list/holiday_list.py +++ b/erpnext/setup/doctype/holiday_list/holiday_list.py @@ -19,11 +19,7 @@ class HolidayList(Document): def validate(self): self.validate_days() self.total_holidays = len(self.holidays) -<<<<<<< HEAD -======= - self.validate_duplicate_date() self.sort_holidays() ->>>>>>> ad137250fc (fix(Holiday List): sort holidays on save to avoid disorienting the user (#42236)) @frappe.whitelist() def get_weekly_off_dates(self):