Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(holiday-list): use same date format for same holiday error message (backport #42606) #43221

Closed
wants to merge 1 commit into from
Closed

fix(holiday-list): use same date format for same holiday error message (backport #42606) #43221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions erpnext/setup/doctype/holiday_list/holiday_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,21 @@ def get_weekly_off_date_list(self, start_date, end_date):
def clear_table(self):
self.set("holidays", [])

<<<<<<< HEAD
=======
def validate_duplicate_date(self):
unique_dates = []
for row in self.holidays:
if row.holiday_date in unique_dates:
frappe.throw(
_("Holiday Date {0} added multiple times").format(
frappe.bold(formatdate(row.holiday_date))
)
)

unique_dates.append(row.holiday_date)

>>>>>>> a435441536 (fix(holiday-list): use same date format for same holiday error message (#42606))

@frappe.whitelist()
def get_events(start, end, filters=None):
Expand Down
Loading