-
Notifications
You must be signed in to change notification settings - Fork 7.9k
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
feat: Tax for recurring additional salary (backport #27459) #28024
Merged
ruchamahabal
merged 2 commits into
version-13-hotfix
from
mergify/bp/version-13-hotfix/pr-27459
Oct 20, 2021
Merged
feat: Tax for recurring additional salary (backport #27459) #28024
ruchamahabal
merged 2 commits into
version-13-hotfix
from
mergify/bp/version-13-hotfix/pr-27459
Oct 20, 2021
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
* fix: Logic for tax calculation on recurring additional salary * fix: Get actual amount always in case of overwritten additional salary even if based on payment days * feat: Test case added for recurring additional salary * fix: use query builder to get additional salaries instead of raw SQL * fix: query formatting and remove trailing spaces Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 2ef4844) # Conflicts: # erpnext/payroll/doctype/salary_slip/salary_slip.py # erpnext/payroll/doctype/salary_slip/test_salary_slip.py
ruchamahabal
requested changes
Oct 20, 2021
Codecov Report
@@ Coverage Diff @@
## version-13-hotfix #28024 +/- ##
=====================================================
- Coverage 54.62% 54.36% -0.26%
=====================================================
Files 1334 1255 -79
Lines 70756 67845 -2911
=====================================================
- Hits 38650 36886 -1764
+ Misses 32106 30959 -1147
|
asoral
pushed a commit
to asoral/erpnext
that referenced
this pull request
Nov 12, 2021
…appe#28024) * feat: Tax for recurring additional salary (frappe#27459) * fix: Logic for tax calculation on recurring additional salary * fix: Get actual amount always in case of overwritten additional salary even if based on payment days * feat: Test case added for recurring additional salary * fix: use query builder to get additional salaries instead of raw SQL * fix: query formatting and remove trailing spaces Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 2ef4844) # Conflicts: # erpnext/payroll/doctype/salary_slip/salary_slip.py # erpnext/payroll/doctype/salary_slip/test_salary_slip.py * fix: conflicts Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 is an automatic backport of pull request #27459 done by Mergify.
Cherry-pick of 2ef4844 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/