Skip to content
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(Payroll): allow overwriting tax component through additional salary #1600

Merged
merged 4 commits into from
Mar 29, 2024

Conversation

ruchamahabal
Copy link
Member

@ruchamahabal ruchamahabal commented Mar 29, 2024

In some months, users might want to overwrite the auto-calculated tax amount through additional salary. While overwriting component amount works for other types of components, it was not supported for tax components. Added support for the same

This is only applicable if the additional salary has Overwrite Salary Structure Amount enabled

Added validation + warning for both cases:

image image

no-docs This works as expected now like overwriting other components. Doesn't require an explicit mention as such

@codecov-commenter
Copy link

codecov-commenter commented Mar 29, 2024

Codecov Report

Attention: Patch coverage is 73.68421% with 5 lines in your changes are missing coverage. Please review.

Project coverage is 72.83%. Comparing base (fdf986b) to head (a2739db).
Report is 5 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #1600   +/-   ##
========================================
  Coverage    72.83%   72.83%           
========================================
  Files          202      202           
  Lines        11169    11188   +19     
========================================
+ Hits          8135     8149   +14     
- Misses        3034     3039    +5     
Files Coverage Δ
hrms/payroll/doctype/salary_slip/salary_slip.py 86.30% <80.00%> (-0.06%) ⬇️
...oll/doctype/additional_salary/additional_salary.py 68.14% <66.66%> (-0.13%) ⬇️

... and 1 file with indirect coverage changes

@ruchamahabal ruchamahabal merged commit f60f564 into frappe:develop Mar 29, 2024
7 checks passed
ruchamahabal added a commit that referenced this pull request Apr 4, 2024
…1600

feat(Payroll): allow overwriting tax component through additional salary (backport #1600)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants