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: permission error while creating Supplier Quotation from Portal (backport #37864) #37872

Merged
merged 2 commits into from
Nov 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 3, 2023

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

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

You are currently cherry-picking commit e019d43d0b.
  (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/controllers/buying_controller.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 e019d43)

# Conflicts:
#	erpnext/controllers/buying_controller.py
@mergify mergify bot requested a review from deepeshgarg007 as a code owner November 3, 2023 06:28
@mergify mergify bot added the conflicts label Nov 3, 2023
@mergify mergify bot requested a review from rohitwaghchaure as a code owner November 3, 2023 06:28
@mergify mergify bot assigned s-aga-r Nov 3, 2023
@s-aga-r s-aga-r merged commit 6952f0f into version-13-hotfix Nov 3, 2023
7 checks passed
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-37864 branch November 3, 2023 10:57
frappe-pr-bot pushed a commit that referenced this pull request Nov 8, 2023
## [13.54.10](v13.54.9...v13.54.10) (2023-11-08)

### Bug Fixes

* add missing disbursement account in update_old_loans patch ([37b1a0e](37b1a0e))
* bump pygithub requirement to handle conflict ([#37800](#37800)) ([13d5eec](13d5eec))
* e-invoice jwt verification error ([#37818](#37818)) ([8f4ded6](8f4ded6))
* permission error while creating Supplier Quotation from Portal (backport [#37864](#37864)) ([#37872](#37872)) ([6952f0f](6952f0f))
* Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (backport [#37499](#37499)) ([#37918](#37918)) ([4789eca](4789eca))
* remove voucher type and no for Item and Warehouse based reposting (backport [#37849](#37849)) (backport [#37850](#37850)) ([#37938](#37938)) ([8cb0f69](8cb0f69))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.54.10 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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