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

feat(Attendance Request): add 'Include Holidays' checkbox (backport #1040) #1365

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 31, 2024

This is an automatic backport of pull request #1040 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

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)
@mergify mergify bot requested a review from ruchamahabal as a code owner January 31, 2024 08:36
@ruchamahabal ruchamahabal merged commit bf492eb into version-15-hotfix Jan 31, 2024
7 of 8 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1040 branch January 31, 2024 09:00
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))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.10.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants