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: internal Purchase Receipt GL Entries (backport #34912) #34945

Merged
merged 5 commits into from
Apr 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 20, 2023

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

On branch mergify/bp/version-13-hotfix/pr-34912
Your branch is ahead of 'origin/version-13-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c86c543fbf.
  (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/purchase_receipt/test_purchase_receipt.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 c86c543)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@mergify mergify bot added the conflicts label Apr 20, 2023
@s-aga-r s-aga-r marked this pull request as draft April 20, 2023 06:08
@s-aga-r s-aga-r removed the conflicts label Apr 20, 2023
@s-aga-r s-aga-r force-pushed the mergify/bp/version-13-hotfix/pr-34912 branch from d6705a6 to 102ac9f Compare April 20, 2023 10:50
@s-aga-r s-aga-r marked this pull request as ready for review April 20, 2023 11:42
@s-aga-r s-aga-r merged commit 813b4d4 into version-13-hotfix Apr 20, 2023
6 checks passed
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-34912 branch April 20, 2023 11:43
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.49.14 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 25, 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.

None yet

2 participants