-
Notifications
You must be signed in to change notification settings - Fork 7.9k
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: Leave policy assignment #23112
feat: Leave policy assignment #23112
Conversation
2b99b18
to
9158d64
Compare
53bb95e
to
3027f15
Compare
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within a week if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
@nabinhait please check. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix conflict
erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.js
Outdated
Show resolved
Hide resolved
erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.js
Outdated
Show resolved
Hide resolved
erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.json
Outdated
Show resolved
Hide resolved
erpnext/patches/v13_0/create_leave_policy_assignment_based_on_employee_current_leave_policy.py
Outdated
Show resolved
Hide resolved
erpnext/patches/v13_0/create_leave_policy_assignment_based_on_employee_current_leave_policy.py
Outdated
Show resolved
Hide resolved
erpnext/patches/v13_0/create_leave_policy_assignment_based_on_employee_current_leave_policy.py
Outdated
Show resolved
Hide resolved
erpnext/patches/v13_0/create_leave_policy_assignment_based_on_employee_current_leave_policy.py
Outdated
Show resolved
Hide resolved
erpnext/patches/v13_0/create_leave_policy_assignment_based_on_employee_current_leave_policy.py
Outdated
Show resolved
Hide resolved
2867cf7
to
34c3f19
Compare
Please Check and test Patch. unsure of that. |
37c6d7f
to
1371394
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Fix travis
- Fix sider
- Fix codacy
- Add docs
e3b110c
to
72f98bc
Compare
erpnext/patches/v13_0/create_leave_policy_assignment_based_on_employee_current_leave_policy.py
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix sider issues
c44aa38
to
95754f2
Compare
95754f2
to
279d491
Compare
Leave Policy Assignment
On granting leave
Grant Leaves in bulk
Bulk Leave policy Assignment
leave allocation Linking and validation for Leave policy assignment
Docs: frappe/erpnext_documentation#136