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: negative valuation rate in PR return (backport #37424) #37462

Merged
merged 2 commits into from
Oct 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 11, 2023

This is an automatic backport of pull request #37424 done by Mergify.
Cherry-pick of 26ad688 has failed:

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

You are currently cherry-picking commit 26ad688584.
  (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/controllers/buying_controller.py
	modified:   erpnext/stock/stock_ledger.py

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

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

* fix: negative valuation rate in PR return

* test: add test case for PR return

(cherry picked from commit 26ad688)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@s-aga-r s-aga-r removed the conflicts label Oct 11, 2023
@s-aga-r s-aga-r merged commit 66ad823 into version-13-hotfix Oct 11, 2023
6 of 7 checks passed
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-37424 branch October 11, 2023 13:47
@s-aga-r
Copy link
Contributor

s-aga-r commented Oct 11, 2023

@Mergifyio backport version-13

@mergify
Copy link
Contributor Author

mergify bot commented Oct 11, 2023

backport version-13

✅ Backports have been created

mergify bot added a commit that referenced this pull request Oct 11, 2023
* fix: negative valuation rate in PR return (#37424)

* fix: negative valuation rate in PR return

* test: add test case for PR return

(cherry picked from commit 26ad688)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit 66ad823)
s-aga-r pushed a commit that referenced this pull request Oct 11, 2023
…37462) (#37463)

fix: negative valuation rate in PR return (backport #37424) (#37462)

* fix: negative valuation rate in PR return (#37424)

* fix: negative valuation rate in PR return

* test: add test case for PR return

(cherry picked from commit 26ad688)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit 66ad823)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request Oct 11, 2023
## [13.54.4](v13.54.3...v13.54.4) (2023-10-11)

### Bug Fixes

* negative valuation rate in PR return (backport [#37424](#37424)) (backport [#37462](#37462)) ([#37463](#37463)) ([f6b3532](f6b3532))
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.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants