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

refactor: rewrite batch.py queries in QB (backport #34632) #34786

Merged
merged 2 commits into from
Apr 8, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 8, 2023

This is an automatic backport of pull request #34632 done by Mergify.
Cherry-pick of 517b5f8 has failed:

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

You are currently cherry-picking commit 517b5f8567.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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 517b5f8)

# Conflicts:
#	erpnext/stock/doctype/batch/batch.py
@mergify mergify bot added the conflicts label Apr 8, 2023
@mergify mergify bot assigned s-aga-r Apr 8, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Apr 8, 2023
@s-aga-r s-aga-r marked this pull request as draft April 8, 2023 07:43
@s-aga-r s-aga-r removed the conflicts label Apr 8, 2023
@s-aga-r s-aga-r removed the needs-tests This PR needs automated unit-tests. label Apr 8, 2023
@s-aga-r s-aga-r marked this pull request as ready for review April 8, 2023 13:42
@s-aga-r s-aga-r merged commit 66fdd1c into version-14-hotfix Apr 8, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-34632 branch April 8, 2023 16:40
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.21.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 May 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants