-
Notifications
You must be signed in to change notification settings - Fork 688
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 #1217
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
missing to add the employee to validation check
Damn, how did I miss this in review. Thanks for fixing! |
ruchamahabal
added
backport version-14-hotfix
backport version-15-hotfix
and removed
needs-tests
labels
Dec 27, 2023
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #1217 +/- ##
========================================
Coverage 72.54% 72.54%
========================================
Files 200 200
Lines 10916 10916
========================================
Hits 7919 7919
Misses 2997 2997
|
Thank you rucha 🙏 for your quick action...and thank you and the Frappe team for your efforts in providing these great products 🌺 |
mergify bot
pushed a commit
that referenced
this pull request
Dec 27, 2023
* 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 bot
pushed a commit
that referenced
this pull request
Dec 27, 2023
* 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)
ruchamahabal
pushed a commit
that referenced
this pull request
Dec 27, 2023
…1218) * 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) Co-authored-by: HoFaks <[email protected]>
ruchamahabal
pushed a commit
that referenced
this pull request
Dec 27, 2023
…1219) * 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) Co-authored-by: HoFaks <[email protected]>
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
pushed a commit
that referenced
this pull request
Jan 3, 2024
# [15.8.0](v15.7.1...v15.8.0) (2024-01-03) ### Bug Fixes * 'NoneType' Iteration Error in Salary Slip Loan Processing (backport [#1247](#1247)) ([#1253](#1253)) ([661b4df](661b4df)) * [#1226](#1226) local variable "days_to_add" referenced before assignment ([#1227](#1227)) ([cb3e803](cb3e803)) * **Appraisal:** Employee Performance Feedback link ([2513ef5](2513ef5)) * avoid assigning undefined ([d268eb3](d268eb3)) * circular progress size ([498ec0a](498ec0a)) * **circular_progress:** file name typo ([a89dffa](a89dffa)) * don't break whitelisted API ([6914c48](6914c48)) * Duplicate Overwritten Salary error for other employee ([#1217](#1217)) ([#1219](#1219)) ([048d916](048d916)) * Feedback rendering of new Interviews ([ebd8ab6](ebd8ab6)) * Feedback Summary subtext ([cb098e5](cb098e5)) * fetching applicable interviewers for interview & feedback ([23567de](23567de)) * font size and spacing ([735d68b](735d68b)) * move Reschedule Interview to Actions ([4ff72c7](4ff72c7)) * move whitelisted getter functions outside class ([6b59f4b](6b59f4b)) * No feedback message ([518b650](518b650)) * notify update after updating average rating in interview ([cc4f7d7](cc4f7d7)) * **Org Chart Mobile:** check if company is set before loading children ([5d3cd90](5d3cd90)) * **Org Chart:** check if company is set before loading children ([919861a](919861a)) * returning to org chart view from employee master does not render chart ([a05e97a](a05e97a)) * rounding ([8853637](8853637)) * run feedback functions serially ([9f78bc8](9f78bc8)) * update job applicant status on interview submit (backport [#892](#892)) ([#1225](#1225)) ([a8b2ed3](a8b2ed3)) * url encoding in job application routes (backport [#1251](#1251)) ([#1252](#1252)) ([bfbf0d5](bfbf0d5)) * use left join in interview feedback query to fetch feedback from non-employee users ([2a676f1](2a676f1)) ### Features * add circular progress bar ([29ef154](29ef154)) * add Feedback Tab ([cc0fe36](cc0fe36)) * add individual ratings ([caac6cd](caac6cd)) * add Interviewers field which automatically fetches interviewers based on Interview Round ([23fa14c](23fa14c)) * Add new doctype for Job offer Term Template ([#1089](#1089)) ([#1236](#1236)) ([4d38033](4d38033)) * add ratings summary ([26f533f](26f533f)) * consider colors for ratings between 0 and 1 ([364f49e](364f49e)) * dynamic circular progress bar ([41491a6](41491a6)) * **Interview:** Add setting for sender in interview & interview feedback reminder emails (backport [#1033](#1033)) ([#1230](#1230)) ([8195835](8195835)) * pull feedback data from server ([0fcce17](0fcce17)) * set current interview timings as default while rescheduling ([bf4af53](bf4af53)) * show hover message for disabled feedback submission ([1d30a39](1d30a39)) * update interview average rating on submitting feedback ([4aafd7d](4aafd7d)) * use circular progress bar for skills ([2b0ca74](2b0ca74)) ### Performance Improvements * remove lazy-loaded bundles from app include js ([465b22a](465b22a))
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current ِadditional salary employee was not added to the validation condition , which led to an error appearing to get error for other employees additional salary
Regression: #1108