fix: employee & grade filters not considered while allocating leaves via Leave Control Panel #456
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
Field employee not included in get_employees conditions (fetch only specific employee), field already exists "employee"
ruchamahabal
reviewed
May 2, 2023
ruchamahabal
changed the title
ruchamahabal
changed the title
|
@ovresko Congrats on your first contribution to the repo. A note for future contributions: Write semantic commit messages: conventionalcommits.org/en/v1.0.0 |
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #456 +/- ##
===========================================
- Coverage 72.73% 72.70% -0.03%
===========================================
Files 190 190
Lines 9808 9812 +4
===========================================
Hits 7134 7134
- Misses 2674 2678 +4
|
mergify bot
pushed a commit
that referenced
this pull request
May 2, 2023
…via Leave Control Panel (#456) Co-authored-by: Rucha Mahabal <[email protected]> (cherry picked from commit 562b3cc)
ruchamahabal
added a commit
that referenced
this pull request
May 2, 2023
…via Leave Control Panel (backport #456) (#490) Co-authored-by: Rucha Mahabal <[email protected]> Co-authored-by: ovresko <[email protected]>
frappe-pr-bot
pushed a commit
that referenced
this pull request
May 3, 2023
# [14.3.0](v14.2.4...v14.3.0) (2023-05-03) ### Bug Fixes * add msgprint for updated attendance ([b266a3d](b266a3d)) * call update_component_row only if amount is not none ([ac7afd3](ac7afd3)) * consider default value before removed zero valued components ([445e1a3](445e1a3)) * do not consider zero valued rows for accounting ([4089d84](4089d84)) * employee & grade filters not considered while allocating leaves via Leave Control Panel (backport [#456](#456)) ([#490](#490)) ([c39eaad](c39eaad)) * group checkin logs by shift start time ([561994e](561994e)) * rename field ([c55eefa](c55eefa)) * rename field to remove zero valued compoents ([b0cc416](b0cc416)) * shift not fetched in checkin on holidays ([e47932a](e47932a)) * validate overlapping attendance request ([e2d7998](e2d7998)) ### Features * Mark auto attendance on holidays ([74dc49d](74dc49d)) * Mark Auto Attendance on Holidays setting in Shift Type ([cf092f1](cf092f1)) * moved show zero value component setting to salary compoent for better control ([cde30ef](cde30ef)) * overwrite attendance status from attendance request record ([cbcb6c7](cbcb6c7)) * provision to display zero value salary components on salary slip ([109ba11](109ba11)) * provision to remove element if zero valued ([9fe007a](9fe007a)) * rearrange payroll settings form ([8a95e81](8a95e81)) * test case to check compoents with config show zero value component are getting added in salary slip if component amount is zero ([3726f61](3726f61)) * update component row only if the amount is not none ([3e1cd01](3e1cd01)) * **UX:** Show warnings for skipping/overwriting attendance in request ([f165abc](f165abc))
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.
Field employee not included in get_employees conditions (fetch only specific employee), field already exists "employee"
Problem:
Leave Control Panel has an employee field in filters but it doesn't apply that filter while allocating leaves
So leaves get allocated to all the employees meeting other criteria:
Fix:
Consider employee filter while allocating leaves: