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: Salary Withholding (backport #1935) #2002

Merged
merged 24 commits into from
Jul 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 23, 2024

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

image
This is an automatic backport of pull request #1935 done by [Mergify](https://mergify.com).

Co-authored-by: Viny Selopal <[email protected]>
(cherry picked from commit 3024be9)
- remove unnecessary fields

(cherry picked from commit 93b8238)
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)
… for read-only fields

(cherry picked from commit 37e3205)
(cherry picked from commit 234d072)
…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 b220c46)
@mergify mergify bot added the conflicts label Jul 23, 2024
@mergify mergify bot requested a review from ruchamahabal as a code owner July 23, 2024 10:09
Copy link
Contributor Author

mergify bot commented Jul 23, 2024

Cherry-pick of 9c5e4c8 has failed:

On branch mergify/bp/version-15-hotfix/pr-1935
Your branch is ahead of 'origin/version-15-hotfix' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9c5e4c87a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/payroll/doctype/payroll_entry/payroll_entry.py
	modified:   hrms/payroll/doctype/salary_withholding/salary_withholding.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/payroll_employee_detail/payroll_employee_detail.json

Cherry-pick of a0fef7c has failed:

On branch mergify/bp/version-15-hotfix/pr-1935
Your branch is ahead of 'origin/version-15-hotfix' by 16 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a0fef7c96.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/payroll/doctype/payroll_entry/payroll_entry.py
	modified:   hrms/payroll/doctype/salary_withholding/salary_withholding.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/payroll_employee_detail/payroll_employee_detail.json

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

@ruchamahabal ruchamahabal merged commit a861f4f into version-15-hotfix Jul 23, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1935 branch July 23, 2024 12:20
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 15.25.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants