Skip to content
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

Closed
wants to merge 13 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 14, 2025

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.

AyshaHakeem and others added 13 commits January 14, 2025 07:00
(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 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
…urnal entry"

This reverts commit 9079dbb.

(cherry picked from commit fb788e1)

# 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
- 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)
@mergify mergify bot added the conflicts label Jan 14, 2025
@mergify mergify bot requested a review from ruchamahabal as a code owner January 14, 2025 07:00
Copy link
Contributor Author

mergify bot commented Jan 14, 2025

Cherry-pick of 885cf10 has failed:

On branch mergify/bp/version-14-hotfix/pr-2518
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 885cf10b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of b5af146 has failed:

On branch mergify/bp/version-14-hotfix/pr-2518
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b5af146f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 5dd9e1e has failed:

On branch mergify/bp/version-14-hotfix/pr-2518
Your branch is ahead of 'origin/version-14-hotfix' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 5dd9e1eb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py
	modified:   hrms/payroll/doctype/gratuity/test_gratuity.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/full_and_final_statement/test_full_and_final_statement.py

Cherry-pick of 9079dbb has failed:

On branch mergify/bp/version-14-hotfix/pr-2518
Your branch is ahead of 'origin/version-14-hotfix' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9079dbb1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/payroll/doctype/gratuity/gratuity.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py

Cherry-pick of fb788e1 has failed:

On branch mergify/bp/version-14-hotfix/pr-2518
Your branch is ahead of 'origin/version-14-hotfix' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit fb788e1a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/payroll/doctype/gratuity/gratuity.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py

Cherry-pick of 8f98b70 has failed:

On branch mergify/bp/version-14-hotfix/pr-2518
Your branch is ahead of 'origin/version-14-hotfix' by 6 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 8f98b702.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/payroll/doctype/gratuity/gratuity.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py

Cherry-pick of 3007ff0 has failed:

On branch mergify/bp/version-14-hotfix/pr-2518
Your branch is ahead of 'origin/version-14-hotfix' by 9 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3007ff06.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py

no changes added to commit (use "git add" and/or "git commit -a")

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants