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

fix: correct bank entry calculation with deductions and prevent multiple loan repayment deductions (backport #2347) #2348

Merged
merged 4 commits into from
Oct 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 28, 2024

Introduced via #2283 & #2324 and loan flow.

Issue:

  • When deductions were present, the bank entry calculation did not work as expected.
  • total_loan_repayment was being subtracted multiple times for each salary detail, leading to an incorrect salary_slip_total in the bank entry.

Resolution:

…ple loan repayment deductions

(cherry picked from commit 3ce5890)
(cherry picked from commit 44cdcc7)

# Conflicts:
#	hrms/payroll/doctype/payroll_entry/test_payroll_entry.py
(cherry picked from commit 4d3e0f5)
Copy link
Contributor Author

mergify bot commented Oct 28, 2024

Cherry-pick of 44cdcc7 has failed:

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

You are currently cherry-picking commit 44cdcc7df.
  (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

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

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 360517e into version-15-hotfix Oct 28, 2024
7 checks passed
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.34.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@ruchamahabal ruchamahabal deleted the mergify/bp/version-15-hotfix/pr-2347 branch October 31, 2024 09:51
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.

3 participants