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: deduplicate gain/loss JE creation for journals as payment (backport #36911) #36925

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 3, 2023

This is an automatic backport of pull request #36911 done by Mergify.
Cherry-pick of 79c6f01 has failed:

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

You are currently cherry-picking commit 79c6f0165b.
  (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/controllers/accounts_controller.py

Cherry-pick of d6a3b9a has failed:

On branch mergify/bp/version-14-hotfix/pr-36911
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 d6a3b9a5c7.
  (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/payment_reconciliation_allocation/payment_reconciliation_allocation.json
	modified:   erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
	modified:   erpnext/accounts/utils.py
	modified:   erpnext/controllers/accounts_controller.py

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

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.com

(cherry picked from commit 79c6f01)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
(cherry picked from commit 79fa562)
(cherry picked from commit d6a3b9a)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-14-hotfix/pr-36911 branch from 9d234fc to 5523bc5 Compare September 3, 2023 05:00
@ruthra-kumar ruthra-kumar merged commit 553ff11 into version-14-hotfix Sep 3, 2023
10 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36911 branch September 3, 2023 05:27
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.38.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants