Merged
Conversation
(cherry picked from commit 9626ad7) # Conflicts: # hrms/hooks.py
(cherry picked from commit 05c4afd)
(cherry picked from commit 0e89c28)
…4394 refactor: restrict reposting to only supported doctypes (backport #4394)
…4399 fix(test): missing repost defaults (backport #4399)
…type (cherry picked from commit 7140a36)
…llowed cap set in leave type (cherry picked from commit 5f7ea0d)
…ned leave exceeds leave type limit fix: set the partially allocated earned leave in the schedule test: partially allocated earned leave in the schedule (cherry picked from commit cabfb23)
(cherry picked from commit 0e06b33)
…4398 fix: allocate earned leaves as applicable patially when max allowed leave limit is hit (backport #4398)
(cherry picked from commit a8b15d3)
(cherry picked from commit cf0b0b4) # Conflicts: # hrms/hr/doctype/interview/interview.py # hrms/hr/doctype/interview_round/interview_round.js # hrms/hr/doctype/interview_round/interview_round.py # hrms/hr/doctype/job_applicant/job_applicant.js # hrms/hr/doctype/job_applicant/job_applicant.py # hrms/patches.txt
fix(Interview Type): missing type hints for whilelisted methods fix(Job Applicant): missing type hints for whilelisted methods (cherry picked from commit 92527aa) # Conflicts: # hrms/hr/doctype/interview/interview.py
fix: make designation part of job opening template (cherry picked from commit 19e8051)
fix(Job Opening Template): make pay details part of job opening template (cherry picked from commit e8ff733)
(cherry picked from commit 307df2c)
(cherry picked from commit 3eab1f7)
(cherry picked from commit 60cccc0)
…ick filters (cherry picked from commit cb96cf6)
fix(Job Applicant): added 3 coumn layout in the first section fix(Job Applicant): reordered resume section (cherry picked from commit f8ed6ea)
fix(Job Applicant): filter interview type by designation while creating interview fix(Job Applicant): new Shortlisted status (cherry picked from commit 21b424e) # Conflicts: # hrms/hr/doctype/job_applicant/job_applicant.py
…licants fix: moved Salary Expeactations to new tab fix: moved source section at the bottom (cherry picked from commit 89957a6)
(cherry picked from commit b6311df)
fix: make get_interview_details return None instead of partical dictionary if no interview exists (cherry picked from commit 90306fb)
fix: show button to open resume link in new tab if preview fails (cherry picked from commit 649a99b)
fix: change height of review frame to 1000px (cherry picked from commit 87a24bd)
(cherry picked from commit 849d6a2) # Conflicts: # hrms/patches.txt
(cherry picked from commit 202417a)
(cherry picked from commit bca1962)
(cherry picked from commit b411191) # Conflicts: # hrms/hr/doctype/interview/interview.py # hrms/hr/doctype/interview_feedback/interview_feedback.py
(cherry picked from commit df9ed34)
(cherry picked from commit 9f0f805)
(cherry picked from commit a497440)
(cherry picked from commit e7cba79)
…4139 fix(Recruitment): UX Fixes (backport #4139)
(cherry picked from commit b83b9e3)
…leave, create resource for hr settings (cherry picked from commit 0fae64e)
(cherry picked from commit e4dee64)
(cherry picked from commit 3e9fee7) # Conflicts: # hrms/hr/doctype/job_opening_template/job_opening_template.json
…doctypes in frappe app (cherry picked from commit c6e46fc) # Conflicts: # hrms/hr/doctype/job_applicant/job_applicant.json # hrms/hr/doctype/job_opening/job_opening.json # hrms/hr/doctype/job_opening_template/job_opening_template.json # hrms/setup.py
(cherry picked from commit 4a8fff8) # Conflicts: # hrms/setup.py
(cherry picked from commit 4ad1dec) # Conflicts: # hrms/hr/doctype/job_opening_template/job_opening_template.json
(cherry picked from commit 3e8274a) # Conflicts: # hrms/setup.py
… docperm (cherry picked from commit 37158b6) # Conflicts: # hrms/setup.py
(cherry picked from commit 739fdfb) # Conflicts: # hrms/patches.txt
(cherry picked from commit 44ca81e) # Conflicts: # hrms/hr/doctype/job_opening_template/job_opening_template.json
…post Accounting Ledger Settings is merged into accounts settings (cherry picked from commit af99a2f) # Conflicts: # hrms/hr/doctype/expense_claim/test_expense_claim.py
(cherry picked from commit a712930)
(cherry picked from commit 5bee40d)
frappe-pr-bot
requested review from
AyshaHakeem,
asmitahase and
ruchamahabal
as code owners
Member
|
Tests pass, typehints can go later, merging! |
Collaborator
Author
|
🎉 This PR is included in version 16.5.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Automated Release.