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

perf: pull latest details only for referenced vouchers (backport #36649) #36679

Merged
merged 2 commits into from
Aug 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 17, 2023

This is an automatic backport of pull request #36649 done by Mergify.
Cherry-pick of deb0d71 has failed:

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

You are currently cherry-picking commit deb0d71294.
  (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_entry/payment_entry.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 deb0d71)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
@mergify mergify bot added the conflicts label Aug 17, 2023
@github-actions github-actions bot added accounts needs-tests This PR needs automated unit-tests. labels Aug 17, 2023
@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-14-hotfix/pr-36649 branch from 69db599 to 3f33d4c Compare August 17, 2023 05:38
@ruthra-kumar ruthra-kumar merged commit 6366f5a into version-14-hotfix Aug 19, 2023
9 of 10 checks passed
@ruthra-kumar ruthra-kumar removed needs-tests This PR needs automated unit-tests. conflicts labels Aug 19, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36649 branch August 19, 2023 13:59
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.36.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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.

3 participants