-
Notifications
You must be signed in to change notification settings - Fork 891
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: process leave encashment via payment entry (backport #2775) #2802
Conversation
…d and other changes (cherry picked from commit 7166782) # Conflicts: # hrms/hr/doctype/leave_encashment/leave_encashment.json
(cherry picked from commit 9af2020) # Conflicts: # hrms/hr/doctype/leave_encashment/leave_encashment.json
(cherry picked from commit e4386af) # Conflicts: # hrms/hr/doctype/leave_encashment/leave_encashment.json
(cherry picked from commit 8cc94d8)
(cherry picked from commit 882b1d1) # Conflicts: # hrms/hr/doctype/leave_encashment/leave_encashment.json
(cherry picked from commit a608e13)
(cherry picked from commit 989bdaf) # Conflicts: # hrms/hooks.py
(cherry picked from commit b7b2b58)
(cherry picked from commit aa8cd80)
(cherry picked from commit 31201b0)
(cherry picked from commit b4b76c4) # Conflicts: # hrms/hr/doctype/leave_encashment/test_leave_encashment.py
(cherry picked from commit 411d1e1) # Conflicts: # hrms/hr/doctype/leave_encashment/leave_encashment.json
(cherry picked from commit 502bbe5)
(cherry picked from commit faa6ddf)
(cherry picked from commit 6b26fb5)
(cherry picked from commit fa49658) # Conflicts: # hrms/hr/doctype/leave_encashment/leave_encashment.json
Cherry-pick of 7166782 has failed:
Cherry-pick of 9af2020 has failed:
Cherry-pick of e4386af has failed:
Cherry-pick of 882b1d1 has failed:
Cherry-pick of 989bdaf has failed:
Cherry-pick of b4b76c4 has failed:
Cherry-pick of 411d1e1 has failed:
Cherry-pick of fa49658 has failed:
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 |
<<<<<<< HEAD | ||
advance_payment_doctypes = ["Gratuity", "Employee Advance"] | ||
======= | ||
advance_payment_payable_doctypes = ["Leave Encashment", "Gratuity", "Employee Advance"] | ||
>>>>>>> 989bdafc (feat: payment entry for leave encashment) |
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.
<<<<<<< HEAD | |
advance_payment_doctypes = ["Gratuity", "Employee Advance"] | |
======= | |
advance_payment_payable_doctypes = ["Leave Encashment", "Gratuity", "Employee Advance"] | |
>>>>>>> 989bdafc (feat: payment entry for leave encashment) | |
advance_payment_payable_doctypes = ["Leave Encashment", "Gratuity", "Employee Advance"] |
"modified": "2023-10-23 16:49:16.737157", | ||
"modified": "2025-02-21 13:11:01.939992", |
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.
"modified": "2023-10-23 16:49:16.737157", | |
"modified": "2025-02-21 13:11:01.939992", | |
"modified": "2025-02-21 13:11:01.939992", |
Previously, Leave Encashment was always processed by creating an Additional Salary on submission, which was later paid through the Salary Slip.
Patch to update payment status of existing, submitted leave encashment docs based on whether they have been paid via salary slip
Before:

No status tracking, only Salary Slip-based payment.
After:

Documentation Link: https://docs.frappe.io/hr/leave-encashment
This is an automatic backport of pull request #2775 done by [Mergify](https://mergify.com).