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: Employee advance cancellation (backport #2297) #2300

Merged
merged 3 commits into from
Oct 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 17, 2024

Issue:
Unable to cancel employee advance because of the payment reference in payment entry.
ref:22530

Employee.Advance.Cacellation.webm

Fix:

HR.Setting.to.Control.Payment.Unlink.webm

Backport needed: v15


This is an automatic backport of pull request #2297 done by [Mergify](https://mergify.com).

(cherry picked from commit 3bbe0ce)

# Conflicts:
#	hrms/hr/doctype/employee_advance/test_employee_advance.py
@mergify mergify bot requested a review from ruchamahabal as a code owner October 17, 2024 11:29
@mergify mergify bot added the conflicts label Oct 17, 2024
Copy link
Contributor Author

mergify bot commented Oct 17, 2024

Cherry-pick of 3bbe0ce has failed:

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

You are currently cherry-picking commit 3bbe0ceb2.
  (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/salary_slip/test_salary_slip.py
	modified:   hrms/payroll/doctype/salary_structure/test_salary_structure.py

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

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

@krantheman
Copy link
Member

@l0gesh29 can you fix conflicts?

@krantheman krantheman changed the title Employee advance cancellation (backport #2297) fix: Employee advance cancellation (backport #2297) Oct 17, 2024
@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-15-hotfix/pr-2297 branch from 73d6f27 to 12774c0 Compare October 18, 2024 04:56
@ruthra-kumar
Copy link
Member

@krantheman
Conflict addressed.

@krantheman krantheman merged commit 7bd1e10 into version-15-hotfix Oct 18, 2024
7 checks passed
@krantheman krantheman deleted the mergify/bp/version-15-hotfix/pr-2297 branch October 18, 2024 05:29
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.33.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

4 participants