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): sort holidays on save to avoid disorienting the user #42236

Merged
merged 1 commit into from
Jul 9, 2024

Conversation

ruchamahabal
Copy link
Member

If the holidays table already has some weekly holidays and local holidays are added using the button, they get sorted even before saving. This might be disorienting for the user if they want to check and remove/change some local holidays. Append holidays at the end of the table and sort on save instead.

holiday-list.mp4

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jul 8, 2024
@ruchamahabal ruchamahabal removed the needs-tests This PR needs automated unit-tests. label Jul 8, 2024
@ruchamahabal ruchamahabal merged commit ad13725 into frappe:develop Jul 9, 2024
14 checks passed
mergify bot pushed a commit that referenced this pull request Jul 9, 2024
…er (#42236)

fix: sort holidays on save to avoid disorienting the user
(cherry picked from commit ad13725)
@ruchamahabal ruchamahabal added the backport version-14-hotfix backport to version 14 label Jul 9, 2024
mergify bot pushed a commit that referenced this pull request Jul 9, 2024
…er (#42236)

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

# Conflicts:
#	erpnext/setup/doctype/holiday_list/holiday_list.py
ruchamahabal added a commit that referenced this pull request Jul 9, 2024
…er (backport #42236) (#42250)

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 ad13725)

Co-authored-by: Rucha Mahabal <[email protected]>
ruchamahabal added a commit that referenced this pull request Jul 9, 2024
…er (backport #42236) (#42251)

* 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 ad13725)

# Conflicts:
#	erpnext/setup/doctype/holiday_list/holiday_list.py

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <[email protected]>
frappe-pr-bot pushed a commit that referenced this pull request Jul 10, 2024
## [14.70.10](v14.70.9...v14.70.10) (2024-07-10)

### Bug Fixes

* add missing german translations ([d5c1c62](d5c1c62))
* empty item-wise sales/purchase register reports on initial load ([13895fa](13895fa))
* fetch expence account from asset category ([4d6a71a](4d6a71a))
* group by in item-wise purchase register ([62ad466](62ad466))
* **Holiday List:** sort holidays on save to avoid disorienting the user (backport [#42236](#42236)) ([#42251](#42251)) ([fcf6500](fcf6500))
* manual pick allow to pick more than available stock (backport [#42155](#42155)) ([#42158](#42158)) ([454e147](454e147))
* multiple free items on same Item Group ([701dd9e](701dd9e))
* removed max discount validation for sales return ([4195c50](4195c50))
* stock qty validation in SCR (backport [#42124](#42124)) ([#42224](#42224)) ([e2f8e02](e2f8e02))
* tax on stock_rbnb on repost of Purchase Receipt ([106c154](106c154))
* **tds:** use doctype reference when mapping keys across multiple doctypes ([51cbbee](51cbbee))
* updated logic for calculating tax_withholding_net_total in payment entry ([49e5066](49e5066))
* use standard method to get `_doc_before_save` ([9fde733](9fde733))
frappe-pr-bot pushed a commit that referenced this pull request Jul 10, 2024
## [15.29.3](v15.29.2...v15.29.3) (2024-07-10)

### Bug Fixes

* actual qty in sales order (backport [#42248](#42248)) ([#42256](#42256)) ([4866958](4866958))
* add missing german translations ([2f89461](2f89461))
* added filter to show only submitted assets ([19ed6d1](19ed6d1))
* auto serial and batch bundle not creating for Asset Capitalization (backport [#42231](#42231)) ([#42242](#42242)) ([7916d64](7916d64))
* Billed Qty and Qty to Bill Calculation in Purchase Order Analysis (backport [#42100](#42100)) ([#42249](#42249)) ([43c7513](43c7513))
* BOM Creator Recursion Error on duplicate save (backport [#41622](#41622)) ([#42179](#42179)) ([68a39df](68a39df))
* changes as per review ([57896a8](57896a8))
* completed DC will not appear in a delivery trip ([0bab609](0bab609))
* completed DC will not appear in a delivery trip ([#41655](#41655)) ([a3444a0](a3444a0))
* corrected mismatch in the Purchase Receipt Status [#15620](#15620) (backport [#42138](#42138)) ([#42252](#42252)) ([e1b50ef](e1b50ef))
* correcting balance sheet calculation for zero liabilities and equity ([d48a2c9](d48a2c9))
* correcting balance sheet calculation for zero liabilities and equity ([#41497](#41497)) ([2104d90](2104d90))
* custom delimiters ([43ad2fe](43ad2fe))
* download_import_log if rows are greater than 5000 ([4eb251b](4eb251b))
* empty item-wise sales/purchase register reports on initial load ([5ac3b34](5ac3b34))
* field position ([a04938d](a04938d))
* group by in item-wise purchase register ([a967d59](a967d59))
* **Holiday List:** sort holidays on save to avoid disorienting the user (backport [#42236](#42236)) ([#42250](#42250)) ([b555615](b555615))
* import log preview ([62aac8b](62aac8b))
* import status ([71311ff](71311ff))
* **Inventory Dimension:** reduce perms for Stock User (backport [#42226](#42226)) ([#42243](#42243)) ([3cc59e4](3cc59e4))
* manual pick allow to pick more than available stock (backport [#42155](#42155)) ([#42159](#42159)) ([a7b6530](a7b6530))
* Multiple fixes for General Ledger Report ([ca57fd4](ca57fd4))
* multiple free items on same Item Group ([9352863](9352863))
* path of automatically updates the status of asset maintenance log ([5317418](5317418))
* Project Status should be Open again if `percent_complete` is not 100 ([90f5c78](90f5c78))
* provision to enable do not use batch-wise valuation (backport [#42186](#42186)) ([#42198](#42198)) ([ec881ac](ec881ac))
* **Putaway Rule:** reduce perms for Stock User (backport [#42227](#42227)) ([#42244](#42244)) ([b78a97d](b78a97d))
* remove deprecated field "statement_import_log" ([2f0b97d](2f0b97d))
* removed max discount validation for sales return ([ab987e9](ab987e9))
* **Stock Entry Type:** reduce perms for Stock User (backport [#42225](#42225)) ([#42245](#42245)) ([954d9ab](954d9ab))
* tax on stock_rbnb on repost of Purchase Receipt ([427439c](427439c))
* **tds:** use doctype reference when mapping keys across multiple doctypes ([#42258](#42258)) ([8264e3b](8264e3b))
* updated logic for calculating tax_withholding_net_total in payment entry ([3fb5c7a](3fb5c7a))
* use standard method to get `_doc_before_save` ([cfda5f6](cfda5f6))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant