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

refactor: validate total weightage in all appraisal forms (backport #1976) #1977

Merged
merged 2 commits into from
Jul 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 15, 2024

Validation for total weightage exceeding 100 was missing in appraisal form. Created a mixin for it and used it everywhere


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

(cherry picked from commit bb1b916)

# Conflicts:
#	hrms/hr/doctype/appraisal/appraisal.py
Copy link
Contributor Author

mergify bot commented Jul 15, 2024

Cherry-pick of bb1b916 has failed:

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

You are currently cherry-picking commit bb1b916f5.
  (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/hr/doctype/appraisal_template/appraisal_template.py
	modified:   hrms/hr/doctype/employee_performance_feedback/employee_performance_feedback.py
	new file:   hrms/mixins/appraisal.py

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

@ruchamahabal ruchamahabal merged commit c2266c9 into version-14-hotfix Jul 15, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1976 branch July 15, 2024 13:44
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.29.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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants