feat: Tax for recurring additional salary #27459
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
nabinhait
requested review from
pateljannat and
ruchamahabal
as code owners
nabinhait
force-pushed
the
tax-for-recurring-additional-salary
branch
from
4288ded
to
3651e47
Compare
Codecov Report
@@ Coverage Diff @@
## develop #27459 +/- ##
===========================================
+ Coverage 54.26% 54.43% +0.17%
===========================================
Files 1255 1255
Lines 67831 67845 +14
===========================================
+ Hits 36810 36933 +123
+ Misses 31021 30912 -109
|
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within a week if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within a week if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
ruchamahabal
changed the title
ruchamahabal
force-pushed
the
tax-for-recurring-additional-salary
branch
from
a3fd8bf
to
97c344a
Compare
ruchamahabal
force-pushed
the
tax-for-recurring-additional-salary
branch
from
97c344a
to
7853ee4
Compare
ruchamahabal
approved these changes
Oct 20, 2021
|
@Mergifyio backport version-13-hotfix |
mergify bot
pushed a commit
that referenced
this pull request
Oct 20, 2021
* 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
✅ Backports have been created
|
ruchamahabal
added a commit
that referenced
this pull request
Oct 20, 2021
* feat: Tax for recurring additional salary (#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>
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 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.
Recurring Additional Salary:
Is Recurring Additional Salary checkbox added to Salary Slip detail:
Taxable Amounts will be calculated considering future recurring additional salary records.
#no-docs