fix: calculate leaves for months passed even when policy assignment is based on custom range #1697
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
|
@ruchamahabal can you please check |
|
@ruchamahabal Any update? |
|
@ruchamahabal any update? |
ruchamahabal
changed the title
ruchamahabal
changed the title
ruchamahabal
approved these changes
Jun 12, 2024
|
Unrelated testcase failure. Merging |
ruchamahabal
pushed a commit
that referenced
this pull request
Jun 12, 2024
…s based on custom range (backport #1697) (#1884) * 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) Co-authored-by: Jeevan syriac <95610320+Jeevansyriac@users.noreply.github.com>
ruchamahabal
pushed a commit
that referenced
this pull request
Jun 12, 2024
…s based on custom range (backport #1697) (#1885) * 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) Co-authored-by: Jeevan syriac <95610320+Jeevansyriac@users.noreply.github.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jun 12, 2024
## [14.28.5](v14.28.4...v14.28.5) (2024-06-12) ### Bug Fixes * calculate leaves for months passed even when policy assignment is based on custom range (backport [#1697](#1697)) ([#1884](#1884)) ([4b2312d](4b2312d)) * **Salary Slip:** remove company filter from employee (backport [#1873](#1873)) ([#1876](#1876)) ([e9dc0b1](e9dc0b1)) * **Salary Structure Assignment:** Preview Salary Slip date (backport [#1869](#1869)) ([#1878](#1878)) ([f735482](f735482)) * **Shift Assignment:** type error while comparing dates during computation of previous/next shift (backport [#1839](#1839)) ([#1882](#1882)) ([37578e6](37578e6))
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))
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.
issue: When we assign a leave policy without selecting "based on" (DOJ/Leave Period) then earned leave count shows as 0