feat(Attendance Request): add 'Include Holidays' checkbox #1040
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
…g attendance on holidays
|
@ruchamahabal Please check |
|
@ruchamahabal Please review |
ruchamahabal
requested changes
Dec 20, 2023
|
Add a test too |
Vishnu7025
changed the title
Co-authored-by: Rucha Mahabal <[email protected]>
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## develop #1040 +/- ##
===========================================
- Coverage 73.89% 72.46% -1.44%
===========================================
Files 195 201 +6
Lines 10430 10974 +544
===========================================
+ Hits 7707 7952 +245
- Misses 2723 3022 +299
|
|
@ruchamahabal Please review |
|
@mergify update |
❌ Pull request can't be updated with latest base branch changesMergify needs the author permission to update the base branch of the pull request. |
|
@Vishnu7025 please allow edits from maintainers. Need to update the branch and make a minor change |
|
@ruchamahabal Please check now |
ruchamahabal
approved these changes
Jan 31, 2024
mergify bot
pushed a commit
that referenced
this pull request
Jan 31, 2024
In this PR, added a new feature that introduces the 'Include Holidays' checkbox in the attendance request form. This checkbox allows users to bypass the holiday validation when creating attendance records. It enhances the flexibility of the system by enabling manual attendance marking on holidays when required. Additionally, with this feature, employees can apply for compensatory leave if they work on a holiday. https://github.com/frappe/hrms/assets/105106551/9256d331-2476-4a75-8440-ba8cc3c35b23 `no-docs` (cherry picked from commit f1e3413)
ruchamahabal
pushed a commit
that referenced
this pull request
Jan 31, 2024
…1040) (#1365) In this PR, added a new feature that introduces the 'Include Holidays' checkbox in the attendance request form. This checkbox allows users to bypass the holiday validation when creating attendance records. It enhances the flexibility of the system by enabling manual attendance marking on holidays when required. Additionally, with this feature, employees can apply for compensatory leave if they work on a holiday. https://github.com/frappe/hrms/assets/105106551/9256d331-2476-4a75-8440-ba8cc3c35b23 `no-docs` (cherry picked from commit f1e3413) Co-authored-by: Vishnu VS <[email protected]>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jan 31, 2024
# [15.10.0](v15.9.2...v15.10.0) (2024-01-31) ### Bug Fixes * background scroll ([cbed472](cbed472)) * caching of rendered job openings ([d570998](d570998)) * filter drawer content overflow ([3103da4](3103da4)) * placement of bottom bar in Filters drawer ([c522e35](c522e35)) * rendering of Create buttons for unsubmitted documents ([514dddc](514dddc)) * responsiveness for individual jobs ([b3c7a4b](b3c7a4b)) * search and pagination ([8f4a500](8f4a500)) * template generation ([bc88028](bc88028)) * typos (backport [#1351](#1351)) ([#1354](#1354)) ([44f6083](44f6083)) * utilization of space by Job Title ([e22e6d8](e22e6d8)) ### Features * add Apply Now button ([8b58a6f](8b58a6f)) * add Create button for Income Tax Slab and Salary Structure Assignment ([3934365](3934365)) * add filters for mobile ([c6c63a6](c6c63a6)) * add sorting for mobile ([d9c70d9](d9c70d9)) * **Attendance Request:** add 'Include Holidays' checkbox (backport [#1040](#1040)) ([#1365](#1365)) ([bf492eb](bf492eb)) * **Filters Drawer:** add Close button ([d4d06a8](d4d06a8)) * make cards and general view responsive ([9c79f53](9c79f53)) * **Payroll:** Option to use Email Template when send Salary Slip email ([403ee10](403ee10)) * **Salary Component:** add Create Salary Structure button ([b4ffd3b](b4ffd3b)) * **Salary Structure:** add Create Income Tax Slab button ([1292072](1292072))
|
@Mergifyio backport-v14-hotfix |
mergify bot
pushed a commit
that referenced
this pull request
Apr 30, 2024
In this PR, added a new feature that introduces the 'Include Holidays' checkbox in the attendance request form. This checkbox allows users to bypass the holiday validation when creating attendance records. It enhances the flexibility of the system by enabling manual attendance marking on holidays when required. Additionally, with this feature, employees can apply for compensatory leave if they work on a holiday. https://github.com/frappe/hrms/assets/105106551/9256d331-2476-4a75-8440-ba8cc3c35b23 `no-docs` (cherry picked from commit f1e3413) # Conflicts: # hrms/hr/doctype/attendance_request/attendance_request.json
|
@Mergifyio backport version-14-hotfix |
✅ Backports have been created
|
ruchamahabal
added a commit
that referenced
this pull request
May 1, 2024
…1040) (#1727) * feat(Attendance Request): add 'Include Holidays' checkbox (#1040) In this PR, added a new feature that introduces the 'Include Holidays' checkbox in the attendance request form. This checkbox allows users to bypass the holiday validation when creating attendance records. It enhances the flexibility of the system by enabling manual attendance marking on holidays when required. Additionally, with this feature, employees can apply for compensatory leave if they work on a holiday. https://github.com/frappe/hrms/assets/105106551/9256d331-2476-4a75-8440-ba8cc3c35b23 `no-docs` (cherry picked from commit f1e3413) # Conflicts: # hrms/hr/doctype/attendance_request/attendance_request.json * chore: fix conflicts --------- Co-authored-by: Vishnu VS <[email protected]> Co-authored-by: Rucha Mahabal <[email protected]>
frappe-pr-bot
pushed a commit
that referenced
this pull request
May 1, 2024
# [14.27.0](v14.26.2...v14.27.0) (2024-05-01) ### Bug Fixes * autofill skills on entering designation in Interview Round (backport [#1706](#1706)) ([#1734](#1734)) ([fb5294a](fb5294a)) * **Employee Advance:** selection of currency ([68728db](68728db)) * **Employee Attendance Tool:** 'On Leave' status showing as undefined in marked attendance summary (backport [#1712](#1712)) ([#1732](#1732)) ([af1b2ba](af1b2ba)) * **Leave Application:** half day date picker rendering (backport [#1643](#1643)) ([#1730](#1730)) ([cba9824](cba9824)) * merge conflicts ([cccda2e](cccda2e)) * more ruff linting issues ([f268a10](f268a10)) * ruff linting issues ([7b2685d](7b2685d)) * ruff linting issues ([8141c89](8141c89)) * semgrep errors ([9773e85](9773e85)) ### Features * **Attendance Request:** add 'Include Holidays' checkbox (backport [#1040](#1040)) ([#1727](#1727)) ([12ff8c7](12ff8c7))
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In this PR, added a new feature that introduces the 'Include Holidays' checkbox in the attendance request form. This checkbox allows users to bypass the holiday validation when creating attendance records. It enhances the flexibility of the system by enabling manual attendance marking on holidays when required. Additionally, with this feature, employees can apply for compensatory leave if they work on a holiday.
Docs: https://frappehr.com/docs/v14/en/attendance-request