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: allow to set rate manually for service item in BOM (backport #38880) #38882

Merged
merged 1 commit into from
Dec 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 20, 2023

This is an automatic backport of pull request #38880 done by Mergify.


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

Copy link

codecov bot commented Dec 20, 2023

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (a09241e) 60.19% compared to head (3b190fe) 60.22%.
Report is 13 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #38882      +/-   ##
===========================================
+ Coverage    60.19%   60.22%   +0.02%     
===========================================
  Files          759      759              
  Lines        69767    69785      +18     
===========================================
+ Hits         41995    42025      +30     
+ Misses       27772    27760      -12     
Files Coverage Δ
.../report/accounts_receivable/accounts_receivable.py 89.73% <100.00%> (+0.05%) ⬆️
erpnext/controllers/item_variant.py 68.62% <100.00%> (-2.73%) ⬇️
erpnext/controllers/selling_controller.py 79.94% <100.00%> (ø)
...cturing/doctype/production_plan/production_plan.py 80.73% <100.00%> (+0.56%) ⬆️
...stock/doctype/material_request/material_request.py 69.67% <100.00%> (ø)
...wise_balance_history/batch_wise_balance_history.py 74.69% <100.00%> (+0.94%) ⬆️
erpnext/manufacturing/doctype/bom/bom.py 72.56% <50.00%> (-0.13%) ⬇️

... and 4 files with indirect coverage changes

@rohitwaghchaure rohitwaghchaure merged commit a6ab532 into develop Dec 20, 2023
13 of 14 checks passed
@mergify mergify bot deleted the mergify/bp/develop/pr-38880 branch December 20, 2023 13:03
mergify bot added a commit that referenced this pull request Dec 20, 2023
) (#38882)

fix: allow to set rate manually for service item in BOM (#38880)

(cherry picked from commit c2f692a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit a6ab532)
rohitwaghchaure pushed a commit that referenced this pull request Dec 21, 2023
) (backport #38882) (#38885)

fix: allow to set rate manually for service item in BOM (backport #38880) (#38882)

fix: allow to set rate manually for service item in BOM (#38880)

(cherry picked from commit c2f692a)

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

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request Dec 27, 2023
# [15.8.0](v15.7.0...v15.8.0) (2023-12-27)

### Bug Fixes

* `Reserved Stock` report (backport [#38922](#38922)) ([#38924](#38924)) ([8f643f0](8f643f0))
* allow to set rate manually for service item in BOM (backport [#38880](#38880)) (backport [#38882](#38882)) ([#38885](#38885)) ([74606dc](74606dc))
* do not make serial batch bundle for zero qty (backport [#38949](#38949)) ([#38954](#38954)) ([a41cf62](a41cf62))
* do not reset the basic rate for the material receipt stock entry (backport [#38896](#38896)) ([#38899](#38899)) ([f6eb2b5](f6eb2b5))
* incorrect price list in customer-wise item price report ([e0dbb57](e0dbb57))
* incorrect qty in serial batch bundle against pick list (backport [#38964](#38964)) ([#38966](#38966)) ([5874be0](5874be0))
* local reference error in BOM (backport [#38850](#38850)) ([#38877](#38877)) ([e3be9c1](e3be9c1))
* min order qty optional in production plan (backport [#38956](#38956)) ([#38958](#38958)) ([ab9fce3](ab9fce3))
* not able to import serial batch bundle using csv (backport [#38950](#38950)) ([#38955](#38955)) ([0e48ef7](0e48ef7))
* reposting not fixing valuation rate for sales return using movin… (backport [#38895](#38895)) (backport [#38897](#38897)) ([#38901](#38901)) ([eabb956](eabb956))
* reset the incoming rate on changing of the warehouse (backport [#38925](#38925)) ([#38926](#38926)) ([82960e3](82960e3))
* **test:** expect account currency when party account is specified. ([2d9a0a8](2d9a0a8))
* typeerror on pos order summary to new order screen ([bf98a8f](bf98a8f))
* typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (backport [#38870](#38870)) ([#38871](#38871)) ([d75ac13](d75ac13))
* use party account currency when party account is specified ([32d3d4e](32d3d4e))
* **ux:** make PR and PI Item rate field readonly based on `Maintain Same Rate` (backport [#38942](#38942)) ([#38944](#38944)) ([f704ccb](f704ccb))

### Features

* in_party_currency option for AR/AP reports ([a65bc77](a65bc77))
* provision to add items in Stock Reservation dialog (backport [#38558](#38558)) ([#38920](#38920)) ([8c2c90f](8c2c90f))
* total_asset_cost field (backport [#38879](#38879)) ([#38887](#38887)) ([58f1df5](58f1df5))

### Performance Improvements

* Drop unused/duplicate/sub-optimal indexes (backport [#38884](#38884)) ([#38913](#38913)) ([308c6ff](308c6ff))
* use estimated rows instead of actual rows (backport [#38830](#38830)) ([#38876](#38876)) ([648f275](648f275))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 4, 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.

1 participant