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: autofill skills on entering designation in Interview Round (backport #1706) #1735

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 1, 2024

Before: Selecting designation didn't fetch skills for Interview Round.
After: Resets and autofills skills on entering designation.
designation
closes: #1671


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

* fix: auto-fill skills on entering designation in Interview Round

* fix: move designation field above skillset to convey association

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 64386f1)

# Conflicts:
#	hrms/hr/doctype/interview_round/interview_round.js
#	hrms/hr/doctype/interview_round/interview_round.json
@mergify mergify bot requested a review from ruchamahabal as a code owner May 1, 2024 07:03
@mergify mergify bot added the conflicts label May 1, 2024
Copy link
Contributor Author

mergify bot commented May 1, 2024

Cherry-pick of 64386f1 has failed:

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

You are currently cherry-picking commit 64386f112.
  (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/hr/doctype/interview_round/interview_round.js
	both modified:   hrms/hr/doctype/interview_round/interview_round.json

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

@ruchamahabal ruchamahabal merged commit f3961b7 into version-15-hotfix May 1, 2024
4 of 6 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1706 branch May 1, 2024 07:24
frappe-pr-bot pushed a commit that referenced this pull request May 1, 2024
## [15.20.2](v15.20.1...v15.20.2) (2024-05-01)

### Bug Fixes

* autofill skills on entering designation in Interview Round (backport [#1706](#1706)) ([#1735](#1735)) ([f3961b7](f3961b7))
* **Employee Advance:** selection of currency ([ee86b5d](ee86b5d))
* **Employee Attendance Tool:** 'On Leave' status showing as undefined in marked attendance summary (backport [#1712](#1712)) ([#1733](#1733)) ([34894c0](34894c0))
* **Leave Application:** half day date picker rendering (backport [#1643](#1643)) ([#1731](#1731)) ([9ff1f14](9ff1f14))
* merge conflicts ([29cbccd](29cbccd))
* ruff linting issues ([aa47352](aa47352))
* semgrep errors ([e77021a](e77021a))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.20.2 🎉

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.

None yet

3 participants