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.

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

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

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 14, 2024

Fix frappe/hrms#1847

Please provide enough information so that others can review your pull request:

Fixes the issue where the date format in the error message doesn't adhere to the system settings for the date format.

Explain the details for making this change. What existing problem does the pull request solve?

The new patch uses the default system format for the error message too.

Screenshots/GIFs

Before:
Screenshot 2024-08-02 at 9 58 58 PM

After:
Screenshot 2024-08-02 at 9 59 25 PM


This is an automatic backport of pull request #42606 done by [Mergify](https://mergify.com).

#42606)

* fix(holiday-list): use same date format for same holiday error message

* chore: fix formatting

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit a435441)

# Conflicts:
#	erpnext/setup/doctype/holiday_list/holiday_list.py
@mergify mergify bot added the conflicts label Sep 14, 2024
Copy link
Contributor Author

mergify bot commented Sep 14, 2024

Cherry-pick of a435441 has failed:

On branch mergify/bp/version-14-hotfix/pr-42606
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit a435441536.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/setup/doctype/holiday_list/holiday_list.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Sep 14, 2024
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-42606 branch September 14, 2024 07:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants