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: possible deadlock while using auto reconciliation (backport #45154) #45157

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 8, 2025

  1. Remove deadlock
  2. Remove 'Experimental' tag

ref: 28772


This is an automatic backport of pull request #45154 done by Mergify.

(cherry picked from commit 4620025)

# Conflicts:
#	erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
Copy link
Contributor Author

mergify bot commented Jan 8, 2025

Cherry-pick of 4620025 has failed:

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

You are currently cherry-picking commit 4620025dcd.
  (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:   erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
	modified:   erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json

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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jan 8, 2025
@ruthra-kumar ruthra-kumar merged commit 19dc997 into version-15-hotfix Jan 8, 2025
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-45154 branch January 8, 2025 04:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant