fix: add department, branch and designaiton filters to salary register report by AyshaHakeem [frappe] PR#3203
From: https://github.com/frappe/hrms/pull/3203
Date: 2025-05-12 12:23:39+05:30
- fix: update salary_register.py to handle apply filters
- fix: Salary Register Report Departmnet, Designation and Branch Filter Update
Diagnostics
pre-commit failed for source commit: 7dc6e2974cfbd7d57c05c7d89ca4f2532830e5b2
[WARNING] repo `https://github.com/pre-commit/pre-commit-hooks` uses deprecated stage names (commit, push) which will be removed in a future version. Hint: often `pre-commit autoupdate --repo https://github.com/pre-commit/pre-commit-hooks` will fix this. if it does not -- consider reporting an issue to that repo.
hrms/payroll/report/salary_register/salary_register.js
Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-3203
# Alternatively, re-take the changes
git switch develop
ft take ft-pr-3203
# 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