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: Rate for internal PI have non stock UOM items (backport #32144) #32166

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 12, 2022

This is an automatic backport of pull request #32144 done by Mergify.
Cherry-pick of 0f655e4 has failed:

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

You are currently cherry-picking commit 0f655e4430.
  (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 0f655e4)

# Conflicts:
#	erpnext/controllers/buying_controller.py
@codecov
Copy link

codecov bot commented Sep 13, 2022

Codecov Report

Merging #32166 (dda057d) into version-14-hotfix (86e5f36) will increase coverage by 0.02%.
The diff coverage is 100.00%.

Additional details and impacted files
@@                  Coverage Diff                  @@
##           version-14-hotfix   #32166      +/-   ##
=====================================================
+ Coverage              63.62%   63.64%   +0.02%     
=====================================================
  Files                    813      812       -1     
  Lines                  57714    57626      -88     
=====================================================
- Hits                   36719    36677      -42     
+ Misses                 20995    20949      -46     
Impacted Files Coverage Δ
erpnext/controllers/buying_controller.py 84.50% <100.00%> (+0.03%) ⬆️
...unts/report/purchase_register/purchase_register.py 34.21% <0.00%> (-37.51%) ⬇️
...e_purchase_register/item_wise_purchase_register.py 57.42% <0.00%> (-16.84%) ⬇️
...rial_no_valuation/incorrect_serial_no_valuation.py 85.96% <0.00%> (-10.53%) ⬇️
erpnext/accounts/party.py 77.71% <0.00%> (-4.18%) ⬇️
...e_sales_analytics/supplier_wise_sales_analytics.py 86.88% <0.00%> (-3.28%) ⬇️
...value/warehouse_wise_item_balance_age_and_value.py 89.02% <0.00%> (-2.44%) ⬇️
...rpnext/stock/report/stock_balance/stock_balance.py 86.04% <0.00%> (-1.87%) ⬇️
erpnext/stock/doctype/item_price/item_price.py 92.98% <0.00%> (-1.76%) ⬇️
erpnext/stock/reorder_item.py 73.33% <0.00%> (-1.67%) ⬇️
... and 23 more

@deepeshgarg007 deepeshgarg007 merged commit 9fd8fff into version-14-hotfix Sep 13, 2022
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-32144 branch September 13, 2022 09:11
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.1.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 Sep 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
buying needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants