-
Notifications
You must be signed in to change notification settings - Fork 906
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
fix: Exclude advances scheduled for deduction when creating expense claim (backport #2552) #2730
fix: Exclude advances scheduled for deduction when creating expense claim (backport #2552) #2730
Conversation
…inst expense claims (cherry picked from commit 6786671)
(cherry picked from commit 3997c5a)
(cherry picked from commit c0b82e9) # Conflicts: # hrms/hr/doctype/expense_claim_advance/expense_claim_advance.json
(cherry picked from commit 5b018c6)
(cherry picked from commit 3159dbe)
(cherry picked from commit 16196b4) # Conflicts: # hrms/hr/doctype/expense_claim_advance/expense_claim_advance.json
(cherry picked from commit 9c4bde1)
(cherry picked from commit 542cb89) # Conflicts: # hrms/hr/doctype/employee_advance/employee_advance.json
(cherry picked from commit c3e4e05) # Conflicts: # hrms/hr/doctype/expense_claim_advance/expense_claim_advance.json
Cherry-pick of c0b82e9 has failed:
Cherry-pick of 16196b4 has failed:
Cherry-pick of 542cb89 has failed:
Cherry-pick of c3e4e05 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/hr/doctype/expense_claim_advance/expense_claim_advance.json
Outdated
Show resolved
Hide resolved
🎉 This PR is included in version 15.39.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Adjust the calculation of allocation amounts for expense claims against employee advances. Advances scheduled for salary deduction are now excluded, ensuring the allocation amount reflects the accurate claimable advance amount.
Employee advance:

Creating Expense Claim:

Before:
After:

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