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: Duplicate Overwritten Salary error for other employee (backport #1217) #1218

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 27, 2023

This is an automatic backport of pull request #1217 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

* fix: Duplicate Overwritten Salary error for other employee

missing to add the employee to validation check

* chore: fix formatting

---------

Co-authored-by: Rucha Mahabal <[email protected]>
(cherry picked from commit 08411c8)
@mergify mergify bot requested a review from ruchamahabal as a code owner December 27, 2023 20:08
@ruchamahabal ruchamahabal merged commit 6a730f1 into version-14-hotfix Dec 27, 2023
8 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1217 branch December 27, 2023 21:39
frappe-pr-bot pushed a commit that referenced this pull request Dec 30, 2023
# [14.21.0](v14.20.1...v14.21.0) (2023-12-30)

### Bug Fixes

* [#1226](#1226) local variable "days_to_add" referenced before assignment (backport [#1227](#1227)) ([#1232](#1232)) ([2113d40](2113d40))
* avoid assigning undefined ([a760c38](a760c38))
* Duplicate Overwritten Salary error for other employee ([#1217](#1217)) ([#1218](#1218)) ([6a730f1](6a730f1))
* update job applicant status on interview submit (backport [#892](#892)) ([#1224](#1224)) ([f63b428](f63b428))

### Features

* Add new doctype for Job offer Term Template ([#1089](#1089)) ([#1237](#1237)) ([787ab36](787ab36))
* **Interview:** Add setting for sender in interview & interview feedback reminder emails (backport [#1033](#1033)) ([#1229](#1229)) ([e8d46b3](e8d46b3))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.21.0 🎉

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants