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

feat: Formula-based Final Score calculation in Appraisals (backport #1670) #1821

Merged
merged 13 commits into from
May 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 29, 2024

Description: Added field in Appraisal Cycle to calculate final score for an employee appraisal using custom formula. Checking the field makes "Final Score Formula" field visible wherein you can add a Python Expression using autocompletion suggestions for various Employee master, Appraisal and Appraisal Cycle fields. This will automatically calculate the final score when creating new Appraisal

image

appraisal

Closes #690

docs: https://frappehr.com/docs/v14/en/appraisal-cycle


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

vinyselopal and others added 12 commits May 29, 2024 13:10
(cherry picked from commit 1712990)

# Conflicts:
#	hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json
(cherry picked from commit dc6610a)
(cherry picked from commit 546d5e2)
(cherry picked from commit 3a8091d)

# Conflicts:
#	hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json
(cherry picked from commit 969c2e8)
- remove unnecessary conditions

- get cached doc for formula eval

- rearrange related code blocks together

(cherry picked from commit a2c2a8c)
…ox is enabled

(cherry picked from commit 70e30c7)

# Conflicts:
#	hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json
@mergify mergify bot requested a review from ruchamahabal as a code owner May 29, 2024 13:11
@mergify mergify bot added the conflicts label May 29, 2024
Copy link
Contributor Author

mergify bot commented May 29, 2024

Cherry-pick of 1712990 has failed:

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

You are currently cherry-picking commit 1712990de.
  (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/appraisal.py
	modified:   hrms/hr/doctype/appraisal/test_appraisal.py
	modified:   hrms/hr/doctype/appraisal_cycle/appraisal_cycle.js
	modified:   hrms/hr/doctype/appraisal_cycle/test_appraisal_cycle.py
	modified:   hrms/public/js/hrms.bundle.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json

Cherry-pick of 3a8091d has failed:

On branch mergify/bp/version-15-hotfix/pr-1670
Your branch is ahead of 'origin/version-15-hotfix' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3a8091d11.
  (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/appraisal_cycle/appraisal_cycle.json

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

Cherry-pick of 70e30c7 has failed:

On branch mergify/bp/version-15-hotfix/pr-1670
Your branch is ahead of 'origin/version-15-hotfix' by 11 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 70e30c72f.
  (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/appraisal_cycle/appraisal_cycle.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 a00425e into version-15-hotfix May 29, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1670 branch May 29, 2024 13:36
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.22.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.

None yet

3 participants