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): accrual entry creation fails if any employee has no earnings (backport #1214) #1215

Merged
merged 3 commits into from
Dec 27, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 27, 2023

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

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…nings (#1214)

(cherry picked from commit 271fc92)

# Conflicts:
#	hrms/payroll/doctype/payroll_entry/payroll_entry.py
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (a8a1341) 74.35% compared to head (127bc9a) 74.35%.

Additional details and impacted files
@@                Coverage Diff                 @@
##           version-14-hotfix    #1215   +/-   ##
==================================================
  Coverage              74.35%   74.35%           
==================================================
  Files                    193      193           
  Lines                  10156    10156           
==================================================
  Hits                    7551     7551           
  Misses                  2605     2605           
Files Coverage Δ
...rms/payroll/doctype/payroll_entry/payroll_entry.py 84.20% <100.00%> (ø)

@ruchamahabal ruchamahabal merged commit 451c622 into version-14-hotfix Dec 27, 2023
8 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1214 branch December 27, 2023 08:42
frappe-pr-bot pushed a commit that referenced this pull request Dec 27, 2023
## [14.20.1](v14.20.0...v14.20.1) (2023-12-27)

### Bug Fixes

* **Payroll:** accrual entry creation fails if any employee has no earnings (backport [#1214](#1214)) ([#1215](#1215)) ([451c622](451c622))
* Retention Bonus doc cancellation. (backport [#1189](#1189)) ([#1208](#1208)) ([a8a1341](a8a1341))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.20.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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