feat: add local holidays #36116
Merged
feat: add local holidays #36116
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #36116 +/- ##
===========================================
+ Coverage 64.21% 64.25% +0.03%
===========================================
Files 785 785
Lines 60677 60708 +31
===========================================
+ Hits 38965 39009 +44
+ Misses 21712 21699 -13
|
For consistency with "weekly off" descriptions
|
Country names are localized now: Bildschirmaufnahme.2023-07-14.um.12.15.28.mov |
|
First option is now blank. Select Country:
Select Subdivision:
|
|
Done @ruchamahabal |
ruchamahabal
approved these changes
Jul 14, 2023
deepeshgarg007
pushed a commit
that referenced
this pull request
Jul 14, 2023
* feat: add local holidays (cherry picked from commit aa18b25) * test(Holiday List): weekly off and local holidays (cherry picked from commit fd23bd0) * feat(Holiday List): display localized country name (cherry picked from commit 4888d75) * fix: German translations of Holiday List (cherry picked from commit 509061f) # Conflicts: # erpnext/translations/de.csv * fix(Holiday List): use current user's language For consistency with "weekly off" descriptions (cherry picked from commit 8271a39) * fix(Holiday List): allow empty value (cherry picked from commit 8aff5a1) * refactor(Holiday List): use autocomplete fieldtype (cherry picked from commit dab9688) * chore: resolve merge conflicts --------- Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jul 18, 2023
# [14.31.0](v14.30.7...v14.31.0) (2023-07-18) ### Bug Fixes * `TypeError` while creating WO from PP (backport [#36136](#36136)) ([#36137](#36137)) ([dd51010](dd51010)) * Account balance patch and query fixes ([#36117](#36117)) ([0147754](0147754)) * Accounts closing balance patch ([#36113](#36113)) ([cf29156](cf29156)) * allow manual asset receipt mov from nowhere ([#36093](#36093)) ([4aaa1a1](4aaa1a1)) * Ambiguous column error while submitting stock entry ([#36058](#36058)) ([a3a052b](a3a052b)) * circular dependency during reposting causing timeout error ([2c21404](2c21404)) * get_dimension with_cost_center_and_project=false is not working ([#35974](#35974)) ([42c93a1](42c93a1)) * Handle multi-company in patch ([#36127](#36127)) ([e7f5754](e7f5754)) * improve "Update Items" modal ([#36105](#36105)) ([b86571d](b86571d)) * incorrect Balance Qty in the stock ledger for the item with Serial and Batch no ([373b868](373b868)) * incorrect Reserved Qty for Production Plan in BIN for multi-uom case ([2f632d0](2f632d0)) * Opening balance in TB report ([#36171](#36171)) ([313ad7a](313ad7a)) * Opening entries showing up incorrectly in TB report ([#36135](#36135)) ([d10e5e6](d10e5e6)) * Remove current fiscal year from Global Defaults ([#35960](#35960)) ([b877fa6](b877fa6)) * Trailing opening entries in Accounts closing balance ([#36175](#36175)) ([8a607db](8a607db)) * validate docs in closed accounting period on save ([#36157](#36157)) ([5985e02](5985e02)) ### Features * add local holidays ([#36116](#36116)) ([94caf7f](94caf7f)) * add project filter in reports importing financial statements js file ([#36097](#36097)) ([63e26e3](63e26e3)) ### Performance Improvements * index in `Item` and `Item Variant Attribute` (backport [#36133](#36133)) ([#36144](#36144)) ([6198983](6198983)) * send SLA doctypes in boot ([adb6918](adb6918))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add controls for easy addition of local holidays. Dates are fetched from https://pypi.org/project/holidays/
Bildschirmaufnahme.2023-07-13.um.13.31.23.mov
Docs: https://docs.erpnext.com/app/wiki-page-patch/efbd6143b1