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: Issues related to RFQ and Supplier Quotation on Portal (backport #37565) (backport #37577) #37588

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 19, 2023

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

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

You are currently cherry-picking commit e1504efd40.
  (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/party.py
	modified:   erpnext/templates/includes/order/order_macros.html
	modified:   erpnext/templates/includes/rfq/rfq_macros.html
	modified:   erpnext/templates/pages/order.html
	modified:   erpnext/templates/pages/rfq.html

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/templates/includes/rfq.js

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

…37565) (#37577)

* fix: Issues related to RFQ and Supplier Quotation on Portal (#37565)

fix: RFQ and Supplier Quotation for Portal
(cherry picked from commit 2851a41)

* chore: removed backport changes

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit e1504ef)

# Conflicts:
#	erpnext/templates/includes/rfq.js
@mergify mergify bot requested a review from deepeshgarg007 as a code owner October 19, 2023 10:30
@mergify mergify bot added the conflicts label Oct 19, 2023
@mergify mergify bot requested a review from ruthra-kumar as a code owner October 19, 2023 10:30
@rohitwaghchaure rohitwaghchaure merged commit bc907b2 into version-13-hotfix Oct 19, 2023
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-37577 branch October 19, 2023 11:10
frappe-pr-bot pushed a commit that referenced this pull request Oct 19, 2023
## [13.54.5](v13.54.4...v13.54.5) (2023-10-19)

### Bug Fixes

* e-commerce permissions for address (backport [#37554](#37554)) ([#37560](#37560)) ([49d0ab5](49d0ab5))
* **gp:** wrong `allocated_amount` on multi sales person invoice ([7805c3a](7805c3a))
* Issues related to RFQ and Supplier Quotation on Portal (backport [#37565](#37565)) (backport [#37577](#37577)) ([#37588](#37588)) ([bc907b2](bc907b2))
* keep customer/supplier website role by default ([52aff1f](52aff1f))
* negative valuation rate in PR return (backport [#37424](#37424)) ([#37462](#37462)) ([66ad823](66ad823))
* use `flt` to ignore TypeError (backport [#37481](#37481)) ([#37489](#37489)) ([8b4e692](8b4e692))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.54.5 🎉

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 20, 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