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: Quotation lost update (backport #31396) #31397

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 17, 2022

This is an automatic backport of pull request #31396 done by Mergify.
Cherry-pick of 02f9441 has failed:

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

You are currently cherry-picking commit 02f9441e1a.
  (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/selling/doctype/quotation/quotation.py

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

Cherry-pick of e457288 has failed:

On branch mergify/bp/version-13-hotfix/pr-31396
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 e457288dba.
  (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/selling/doctype/quotation/quotation.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 02f9441)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.py
(cherry picked from commit e457288)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.py
@deepeshgarg007 deepeshgarg007 merged commit 8b3fc15 into version-13-hotfix Jun 21, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-31396 branch June 21, 2022 04:59
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.34.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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