-
Notifications
You must be signed in to change notification settings - Fork 810
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: update status of gratuity record referenced in fnf (backport #2518) #2634
Conversation
(cherry picked from commit 885cf10) # Conflicts: # hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py
(cherry picked from commit b5af146) # Conflicts: # hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py
(cherry picked from commit 2a131a2)
(cherry picked from commit 5dd9e1e) # Conflicts: # hrms/hr/doctype/full_and_final_statement/test_full_and_final_statement.py
(cherry picked from commit 9079dbb) # Conflicts: # hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py
(cherry picked from commit 8f98b70) # Conflicts: # hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py
(cherry picked from commit da2d504)
(cherry picked from commit f1d2d5e)
- payment is handled via JV so cancelling FnF -> cancel JV -> update status (cherry picked from commit 3007ff0) # Conflicts: # hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py
(cherry picked from commit 62de9a3)
(cherry picked from commit 5f70a97)
(cherry picked from commit 2c023e8)
Cherry-pick of 885cf10 has failed:
Cherry-pick of b5af146 has failed:
Cherry-pick of 5dd9e1e has failed:
Cherry-pick of 9079dbb has failed:
Cherry-pick of fb788e1 has failed:
Cherry-pick of 8f98b70 has failed:
Cherry-pick of 3007ff0 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 |
When a Gratuity record is referenced under Payables in a Full and Final statement, and the statement is paid, the gratuity record status is updated accordingly. The same update occurs when the Full and Final statement is cancelled.
This is an automatic backport of pull request #2518 done by Mergify.