-
Notifications
You must be signed in to change notification settings - Fork 754
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: Salary Withholding (backport #1935) #2002
feat: Salary Withholding (backport #1935) #2002
Conversation
Co-authored-by: Viny Selopal <[email protected]> (cherry picked from commit 3024be9)
- remove unnecessary fields (cherry picked from commit 93b8238)
(cherry picked from commit 38b0910)
(cherry picked from commit 8155c65)
Co-authored-by: Viny Selopal <[email protected]> (cherry picked from commit 9c5e4c8) # Conflicts: # hrms/payroll/doctype/payroll_employee_detail/payroll_employee_detail.json
Co-authored-by: Viny Selopal <[email protected]> (cherry picked from commit 56a4df7)
Co-authored-by: Viny Selopal <[email protected]> (cherry picked from commit f358d1d)
Co-authored-by: Viny Selopal <[email protected]> (cherry picked from commit 76187bd)
Co-authored-by: Viny Selopal <[email protected]> (cherry picked from commit a2e3e43)
…/cancellation (cherry picked from commit caf484b)
(cherry picked from commit 77954db)
… for read-only fields (cherry picked from commit 37e3205)
(cherry picked from commit 234d072)
…for all cycles (cherry picked from commit b2c3636)
(cherry picked from commit a489dae)
…llation - set salary slips as Submitted/Withheld - set salary release status in withholding cycles + update parent status (cherry picked from commit 7daf23a)
- rename `salary_withheld` to `is_salary_withheld` (cherry picked from commit a0fef7c) # Conflicts: # hrms/payroll/doctype/payroll_employee_detail/payroll_employee_detail.json
(cherry picked from commit b24e822)
(cherry picked from commit 4370cfe)
(cherry picked from commit 33d9777)
(cherry picked from commit b754831)
(cherry picked from commit b220c46)
(cherry picked from commit ea338a7)
Cherry-pick of 9c5e4c8 has failed:
Cherry-pick of a0fef7c has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
hrms/payroll/doctype/payroll_employee_detail/payroll_employee_detail.json
Outdated
Show resolved
Hide resolved
🎉 This issue has been resolved in version 15.25.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Continuing #1726
Salary Withholding
salary-withholding.mp4
Withhold salary slips in payroll
withhold-payroll.mov
Release withheld salaries
release-salary.mp4
Pull withheld salaries in Full & Final Statement
This is an automatic backport of pull request #1935 done by [Mergify](https://mergify.com).