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: calculate leaves for months passed even when policy assignment is based on custom range (backport #1697) #1885

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 12, 2024

issue: When we assign a leave policy without selecting "based on" (DOJ/Leave Period) then earned leave count shows as 0


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

…s based on custom range (#1697)

* fix: remove condition( if not self.assignment_based_on:)

* chore: pre-commit run

* fix: test case

* chore: pre_commit_run

* chore: fix test name

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 4adf500)
@mergify mergify bot requested a review from ruchamahabal as a code owner June 12, 2024 05:34
@ruchamahabal ruchamahabal merged commit 6e22a2a into version-15-hotfix Jun 12, 2024
8 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1697 branch June 12, 2024 05:55
frappe-pr-bot pushed a commit that referenced this pull request Jun 12, 2024
## [15.22.2](v15.22.1...v15.22.2) (2024-06-12)

### Bug Fixes

* calculate leaves for months passed even when policy assignment is based on custom range (backport [#1697](#1697)) ([#1885](#1885)) ([6e22a2a](6e22a2a))
* disabled Link field ([77f27e1](77f27e1))
* frappe-ui version ([c4e5808](c4e5808))
* make link field value non-mandatory ([3964609](3964609))
* render normal Autocomplete for link fields with predefined options ([00228f2](00228f2))
* **Salary Slip:** remove company filter from employee (backport [#1873](#1873)) ([#1877](#1877)) ([afef6e3](afef6e3))
* **Salary Structure Assignment:** Preview Salary Slip date (backport [#1869](#1869)) ([#1879](#1879)) ([9437b85](9437b85))
* **Shift Assignment:** type error while comparing dates during computation of previous/next shift (backport [#1839](#1839)) ([#1883](#1883)) ([1fb427c](1fb427c))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.22.2 🎉

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