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: payroll bank entry with the loan repayment amount (backport #2283) #2285

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 15, 2024

Support Ticket: https://support.frappe.io/app/hd-ticket/23315 & https://support.frappe.io/app/hd-ticket/21676

before_loan_bank_entry.webm

Before this change, the payroll entry was not correctly deducting loan repayments from the total salary, so the bank entry and Journal Entry didn’t match the actual pay after loans were taken out. we fixed this issue. Now, the payroll process accurately subtracts loan repayments, which means the Journal Entry shows the correct amount that employees receive after loan deductions.

after_loan_bank_entry.webm

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

(cherry picked from commit 44ffdb0)

# Conflicts:
#	hrms/payroll/doctype/payroll_entry/payroll_entry.py
Copy link
Contributor Author

mergify bot commented Oct 15, 2024

Cherry-pick of 44ffdb0 has failed:

On branch mergify/bp/version-14-hotfix/pr-2283
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 44ffdb0c9.
  (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/test_payroll_entry.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/payroll_entry/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

@krantheman krantheman closed this Oct 15, 2024
@krantheman krantheman deleted the mergify/bp/version-14-hotfix/pr-2283 branch October 15, 2024 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants