fix: fieldnames in get_value by asmitahase [frappe] PR#3273
From: https://github.com/frappe/hrms/pull/3273
Date: 2025-06-27 13:21:38+05:30
- fix: remove redundant test salary slip test case for loan, set applicant type
- test: remove test_loan_write_off_salary_slip due to loan status being set incorrectly via lending app
- test: fix lending related tests to comply with lending develop branch
- fix: fieldname syntax in get_value
Diagnostics
Conflicts detected for source commit: 54eb5852039e6afdf2f94955f6d7bf95e45ba99c
- DU .github/helper/install.sh
Cleaning files from denylist:
.github/helper/install.sh | 61 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
Conflicts detected for source commit: 756b6c5ff8e020f86ec7a8fbbd8ad25e73723b83
- DU .github/helper/install.sh
Cleaning files from denylist:
.github/helper/install.sh | 61 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-3273
# Alternatively, re-take the changes
git switch develop
ft take ft-pr-3273
# 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