fix: stop leave allocation for left employees #2358
Merged
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
changed the title
ruchamahabal
changed the title
ruchamahabal
approved these changes
Oct 30, 2024
mergify bot
pushed a commit
that referenced
this pull request
Oct 30, 2024
(cherry picked from commit 852c13f)
mergify bot
pushed a commit
that referenced
this pull request
Oct 30, 2024
(cherry picked from commit 852c13f)
This was referenced Oct 30, 2024
ruchamahabal
pushed a commit
that referenced
this pull request
Oct 30, 2024
Co-authored-by: Aysha <[email protected]>
ruchamahabal
pushed a commit
that referenced
this pull request
Oct 30, 2024
Co-authored-by: Aysha <[email protected]>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Oct 31, 2024
# [14.35.0](v14.34.2...v14.35.0) (2024-10-31) ### Bug Fixes * stop leave allocation for left employees (backport [#2358](#2358)) ([#2362](#2362)) ([ec0b808](ec0b808)) * submit attendance request for future dates (backport [#2352](#2352)) ([#2365](#2365)) ([5ed555f](5ed555f)) ### Features * add Payroll Entry to Bank Account dashboard (backport [#2369](#2369)) ([#2371](#2371)) ([b5e51f4](b5e51f4))
frappe-pr-bot
pushed a commit
that referenced
this pull request
Oct 31, 2024
# [15.34.0](v15.33.2...v15.34.0) (2024-10-31) ### Bug Fixes * **appraisal_cycle:** Value missing for Appraisal: Company while creating Appraisal from Appraisal Cycle (backport [#2336](#2336)) ([#2338](#2338)) ([57ffe17](57ffe17)) * correct bank entry calculation and update the testcase ([f0be056](f0be056)) * correct bank entry calculation with deductions and prevent multiple loan repayment deductions ([4d93cfa](4d93cfa)) * daily work summary page not found error (backport [#2208](#2208)) ([#2328](#2328)) ([bf0be70](bf0be70)) * merge conflicts ([d83d3df](d83d3df)) * **PWA:** broken translation strings ([87504dc](87504dc)) * **PWA:** broken translation strings in expense tables ([5caf1de](5caf1de)) * **PWA:** Fix translated toast message ([fb41efb](fb41efb)) * **PWA:** Fix translation of durations ([07c14e0](07c14e0)) * **PWA:** post login redirection fails due to `default_route` conflict with other app (backport [#2351](#2351)) ([#2353](#2353)) ([a07bca5](a07bca5)) * **PWA:** replace datepicker with input component (backport [#2366](#2366)) ([#2368](#2368)) ([a9b85d3](a9b85d3)) * **PWA:** Use standard formatter for currency ([48d4996](48d4996)) * remove function call ([ecd5aef](ecd5aef)) * stop leave allocation for left employees (backport [#2358](#2358)) ([#2363](#2363)) ([eccc11c](eccc11c)) * submit attendance request for future dates (backport [#2352](#2352)) ([#2364](#2364)) ([8afd526](8afd526)) * translate passed message in EmptyState component instead of translating it everywhere ([e178078](e178078)) * translation function used without injecting ([f9951db](f9951db)) * update the testcase ([962ddcf](962ddcf)) ### Features * add Payroll Entry to Bank Account dashboard (backport [#2369](#2369)) ([#2372](#2372)) ([940c6dc](940c6dc)) * allow fractional values for "Current Work Experience" field in gratuity doctype ([#2340](#2340)) ([08984a6](08984a6)) * **PWA:** Add translations loader plugin ([d24ec2c](d24ec2c)) * **PWA:** Add translations to bootinfo ([4a5ecca](4a5ecca)) * **PWA:** Translate app ([32c50d6](32c50d6)) * **PWA:** Translate Attendance dashboard ([561c9dc](561c9dc))
There was a problem hiding this comment.
Would this exclude employees who left in the middle of the month and who need allocate partial leave to be paid in final settlement?
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.
This pr updates the leave allocation process to exclude employees with the status of 'Left'.