-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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: choose correct Salary Structure Assignment when getting data for formula eval #25876
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
sagarvora
force-pushed
the
fix-ssa-selection
branch
4 times, most recently
from
May 28, 2021 19:17
f740087
to
618c3c7
Compare
sagarvora
force-pushed
the
fix-ssa-selection
branch
from
May 30, 2021 09:05
618c3c7
to
89e6729
Compare
sagarvora
force-pushed
the
fix-ssa-selection
branch
from
June 4, 2021 08:23
754362e
to
ab82e08
Compare
Changes have been tested locally. |
sagarvora
force-pushed
the
fix-ssa-selection
branch
from
June 4, 2021 10:39
ab82e08
to
bd92b43
Compare
Breaking tests are unrelated. Directly linked tests have been fixed. |
sagarvora
commented
Jun 7, 2021
Comment on lines
+144
to
+145
if not from_date and payroll_period: | ||
from_date = payroll_period.start_date |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- This code has been added because after newly introduced validation, a Salary Structure Assignment must be applicable on or before the Salary Slip date.
- This code assumes that employee has joined before Payroll Period. Alternatively,
from_date
can be manually passed tomake_salary_structure
in these cases.
LGTM |
ruchamahabal
approved these changes
Jun 8, 2021
@sagarvora Can you also raise a fix for |
asoral
pushed a commit
to asoral/erpnext
that referenced
this pull request
Nov 12, 2021
fix: choose correct Salary Structure Assignment when getting data for formula eval
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.
Resolves #24601
Resolves #21307
Changes Made
order_by
)