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) #43222

Merged

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 <[email protected]>
(cherry picked from commit a435441)
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Sep 14, 2024
@ruchamahabal ruchamahabal removed the needs-tests This PR needs automated unit-tests. label Sep 14, 2024
@ruchamahabal ruchamahabal merged commit f101a1c into version-15-hotfix Sep 14, 2024
12 checks passed
@ruchamahabal ruchamahabal deleted the mergify/bp/version-15-hotfix/pr-42606 branch September 14, 2024 08:06
frappe-pr-bot pushed a commit that referenced this pull request Sep 18, 2024
# [15.36.0](v15.35.2...v15.36.0) (2024-09-18)

### Bug Fixes

* A project without tasks should be able to complete ([dea735d](dea735d))
* add currency in options for rate field in pricing rule ([782c9dd](782c9dd))
* batch based item price not working (backport [#43172](#43172)) ([#43206](#43206)) ([61a42ea](61a42ea))
* cancel cost center allocation and journal entry after test ([3d29007](3d29007))
* consistent behaviour on refresh ([01f3068](01f3068))
* create and link address while creating prospect & customer ([d6a3d0d](d6a3d0d))
* create fiscal year without overlapping existing Fiscal Years ([78768f8](78768f8))
* currency changing while making PO from Supplier Quotation (backport [#43187](#43187)) ([#43205](#43205)) ([ef6b172](ef6b172))
* delete exchange gain loss journal entry while deleting payment entry ([5789de2](5789de2))
* do not auto apply tds in purchase order ([741c18b](741c18b))
* do not check appy_tds in Purchase Order Automatically ([5edebb2](5edebb2))
* do not validate purchase document for composite asset ([c505156](c505156))
* fetch cost center allocation percentage only from the applicable allocation ([0fe901a](0fe901a))
* hide and reset discount control on new POS order ([42494db](42494db))
* **holiday-list:** use same date format for same holiday error message (backport [#42606](#42606)) ([#43222](#43222)) ([f101a1c](f101a1c))
* ignore repost logic on Payment Reconciliation ([d91013a](d91013a))
* invalid gp calculation ([291f0a5](291f0a5))
* item list view in website (backport [#43165](#43165)) ([#43207](#43207)) ([c1a6c56](c1a6c56))
* map rows on journal entry by validating account, party, debit and credit value ([86e1818](86e1818))
* prevent KeyError by checking `report_filter` existence ([984acb6](984acb6))
* revert 091c549 ([2ad6d63](2ad6d63))
* set party_type null when payment_type is changed to Internal Transfer ([45ff8fa](45ff8fa))
* set tax_withholding_category from Purchase Order while creating pi form po ([7027be8](7027be8))
* tds workflow in purchase order ([11359bd](11359bd))
* typo with po_date when creating remarks ([1657a83](1657a83))
* updated filtering in depreciation and balances report ([78c6839](78c6839))
* **ux:** set amount based on account currency while adding new row ([f7cedac](f7cedac))
* **ux:** set amount on foreign currency when foreign currency account is selected on last row of journal ([d8d4cd2](d8d4cd2))

### Features

* API for crm integration ([f060534](f060534))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants