fix: HRA calculation if there are multiple salary structure assignments for the current payroll period (backport #2691) #2694
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
…ts for the current payroll period (cherry picked from commit e71278b)
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jan 24, 2025
## [15.38.2](v15.38.1...v15.38.2) (2025-01-24) ### Bug Fixes * add company_data_to_be_ignored hook ([4ba4193](4ba4193)) * add doctype list to ignore to hooks directly ([defbcf6](defbcf6)) * allow setting payroll frequency for timesheet based payroll entry, calculate salary slip dates if payroll frequency is set not if its not a timesheet based salary slip ([650c05b](650c05b)) * clear company field in single docs, delete other linked docs ([d026ca5](d026ca5)) * edit company_data_to_be_ignored hook content ([466e487](466e487)) * HRA calculation if there are multiple salary structure assignments for the current payroll period (backport [#2691](#2691)) ([#2694](#2694)) ([490e580](490e580)) * set company field empty for single and master doctypes during company deletion ([2c2229e](2c2229e)) * set payment frequency in payroll entry for timesheet based salary slips ([489b8df](489b8df)) * update function clearing company field and replace SQL with query builder ([17970d9](17970d9))
|
🎉 This PR is included in version 15.38.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
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.
HRA calculation was wrong if there were multiple salary structure assignments for the current payroll period and last assignment start date was before the current payroll period start date.
Example:
Payroll Period: 01/04/2024 - 31/03/2025
Assignment 1 Start Date: 01/09/2023
Assignment 2 Start Date: 01/07/2024
This is an automatic backport of pull request #2691 done by [Mergify](https://mergify.com).