feat: Salary Withholding by ruchamahabal [frappe] PR#1935

Bot Dokosrequested to merge
ft-pr-1935 into develop

From: https://github.com/frappe/hrms/pull/1935
Date: 2024-07-22 18:25:12+05:30

  • chore: set withholding cycles table as read-only
  • chore: remove unused doctype
  • chore: add salary withholding to payroll workspace
  • chore: link salary slips in withholding dashboard
  • fix: validate duplicate salary withholdings
  • test: salary withholding
  • feat: update withholding status in payroll employee table
  • feat: update salary withholding payment status on JV submission/cancellation
  • feat: link bank entry in salary withholdings
  • feat: status field in salary withholding based on withholding status for all cycles
  • chore: fix test
  • feat: add withholding cycle reference to salary slip & enable no-copy for read-only fields
  • feat: pull withheld salary slips in FnF
  • fix(FnF): ignore GL entry links & notify update on payment submission/cancellation
  • feat: btn in Payroll Entry to Release Withheld Salaries
  • fix: skip Bank Entry for withheld salary slips
  • feat: set withholding doc ref & status in salary slip
  • feat: add 'Withheld' status to Salary Slip
  • feat: fetch employees with withheld salaries in payroll entry
  • feat: dashboard connection for Salary Withholding from employee master
  • chore: move salary withholding doctypes to Payroll
  • feat: populate withholding cycles in child table and set To Date
  • feat: add Salary Withholding doctypes


Diagnostics

pre-commit failed for source commit: 3024be95f94e34eacecf2a4d7d0eaf67402db0f5
prettier.................................................................Failed
- hook id: prettier
- files were modified by this hook

hrms/hr/doctype/salary_withholding/salary_withholding.js


pre-commit failed for source commit: 234d07237e22ceb5d76a23e49809c4b821c7f276
Format Python code.......................................................Failed
- hook id: ruff-format
- files were modified by this hook

1 file reformatted


Conflicts detected for source commit: b220c46ba65abf40125534c6a43934cd31364eda
  ↳ Removing file (deleted by them): hrms/hr/doctype/payroll_employee_with_released_salary/payroll_employee_with_released_salary.json


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-1935

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-1935

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports