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: handle None values in earnings and deductions to avoid TypeError (backport #2715) #2724

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 29, 2025

Update calculations of payable amount to ensure None values in earnings or deductions default to 0. This prevents TypeError.


This is an automatic backport of pull request #2715 done by Mergify.

(cherry picked from commit 8f5581f)

# Conflicts:
#	hrms/payroll/doctype/payroll_entry/payroll_entry.py
@mergify mergify bot requested a review from ruchamahabal as a code owner January 29, 2025 06:51
@mergify mergify bot added the conflicts label Jan 29, 2025
Copy link
Contributor Author

mergify bot commented Jan 29, 2025

Cherry-pick of 8f5581f has failed:

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

You are currently cherry-picking commit 8f5581f7.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

@AyshaHakeem AyshaHakeem requested review from AyshaHakeem and removed request for ruchamahabal February 3, 2025 07:08
@AyshaHakeem AyshaHakeem marked this pull request as draft February 3, 2025 09:03
@AyshaHakeem AyshaHakeem closed this Feb 3, 2025
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.

1 participant