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(Payment Reconciliation): clear child tables on company/party change (backport #28008) #28194

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 2, 2021

This is an automatic backport of pull request #28008 done by Mergify.
Cherry-pick of 1a6e98e has failed:

On branch mergify/bp/version-13-pre-release/pr-28008
Your branch is up to date with 'origin/version-13-pre-release'.

You are currently cherry-picking commit 1a6e98ed48.
  (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/utils.py

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

…ge (#28008)

(cherry picked from commit 1a6e98e)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@nextchamp-saqib nextchamp-saqib merged commit 50fbc16 into version-13-pre-release Nov 2, 2021
@mergify mergify bot deleted the mergify/bp/version-13-pre-release/pr-28008 branch November 2, 2021 11:42
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 8, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants