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: work order with multi level, fetch operting cost from sub-assembly #38992

Conversation

rohitwaghchaure
Copy link
Collaborator

@rohitwaghchaure rohitwaghchaure commented Dec 28, 2023

Why ?

If Work Order has "Use Multi-Level BOM" and user don't want to make job cards then Fetch the operating cost from the sub-assembly. Also if "Use Multi-Level BOM" has enabled then system should fetch the Scrap items from the sub-assembly.

For this added a configuration in the Manufacturing Settings

Screenshot 2023-12-28 at 4 40 42 PM

Use Case

In below BOM tree, the Wheel Assembly and Frame Assembly is semi FG items and if I want to add operating cost of these items in the cost of Bicycle then we need to make individual work orders. But if the "Use Multi-Level BOM" has enabled then system should fetch the operating cost as well scrap items from the sub-assemblies.

image

Copy link

codecov bot commented Dec 28, 2023

Codecov Report

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

Comparison is base (33b631e) 60.03% compared to head (f38f5d2) 60.07%.
Report is 5 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #38992      +/-   ##
===========================================
+ Coverage    60.03%   60.07%   +0.03%     
===========================================
  Files          761      761              
  Lines        70122    70159      +37     
===========================================
+ Hits         42099    42147      +48     
+ Misses       28023    28012      -11     
Files Coverage Δ
erpnext/manufacturing/doctype/bom/bom.py 73.32% <100.00%> (+0.75%) ⬆️
erpnext/stock/doctype/stock_entry/stock_entry.py 79.22% <100.00%> (-0.02%) ⬇️
...e/manufacturing_settings/manufacturing_settings.py 36.36% <0.00%> (-1.14%) ⬇️

... and 2 files with indirect coverage changes

@rohitwaghchaure rohitwaghchaure merged commit 70abedc into frappe:develop Dec 29, 2023
17 checks passed
mergify bot pushed a commit that referenced this pull request Dec 29, 2023
mergify bot pushed a commit that referenced this pull request Dec 29, 2023
…ly (#38992)

(cherry picked from commit 70abedc)

# Conflicts:
#	erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
#	erpnext/manufacturing/doctype/work_order/test_work_order.py
rohitwaghchaure added a commit that referenced this pull request Dec 29, 2023
…ly (backport #38992) (#39028)

fix: work order with multi level, fetch operting cost from sub-assembly (#38992)

(cherry picked from commit 70abedc)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
rohitwaghchaure added a commit that referenced this pull request Dec 30, 2023
…ly (backport #38992) (#39027)

* fix: work order with multi level, fetch operting cost from sub-assembly (#38992)

(cherry picked from commit 70abedc)

# Conflicts:
#	erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
#	erpnext/manufacturing/doctype/work_order/test_work_order.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Jan 3, 2024
# [14.58.0](v14.57.0...v14.58.0) (2024-01-03)

### Bug Fixes

* Add missing french translations (backport [#38368](#38368)) ([#38513](#38513)) ([2c90ee2](2c90ee2))
* **DX:** capture tracebacks with context (backport [#39060](#39060)) ([#39062](#39062)) ([fe9acc8](fe9acc8))
* **Hierarchy Chart:** check if company is set before loading children ([#38985](#38985)) ([e4d6df3](e4d6df3))
* issue occured when creating supplier with contact details (backport [#38147](#38147)) ([#39046](#39046)) ([81ef7b4](81ef7b4))
* Opening balance in bank reconciliation tool ([#38977](#38977)) ([a2cba1b](a2cba1b))
* remove bad defaults (backport [#38986](#38986)) ([#38987](#38987)) ([29d383a](29d383a))
* select options should dynamically load dimensions ([bfc94cf](bfc94cf))
* take quantity into account when setting asset's gross purchase amt (backport [#39056](#39056)) ([#39057](#39057)) ([b8dce3e](b8dce3e))
* undefined error in Budget Variance and Profitability report ([cad15cd](cad15cd))
* use `Stock Qty` while getting `POS Reserved Qty` (backport [#38962](#38962)) ([#38982](#38982)) ([7ad42ec](7ad42ec))
* Validate account in Sales/Purchase Taxes and Charges Template ([#39013](#39013)) ([c0b5980](c0b5980))
* work order with multi level, fetch operting cost from sub-assembly (backport [#38992](#38992)) ([#39027](#39027)) ([88e5c9e](88e5c9e))

### Features

* Merge taxes from mapped docs ([#38346](#38346)) ([c74e6aa](c74e6aa))
* Show Ledger view for Purchase & Sales Register ([#38801](#38801)) ([04fb215](04fb215))

### Performance Improvements

* index item_code in bom explosion item (backport [#39085](#39085)) ([#39087](#39087)) ([558861b](558861b))
frappe-pr-bot pushed a commit that referenced this pull request Jan 3, 2024
# [15.9.0](v15.8.3...v15.9.0) (2024-01-03)

### Bug Fixes

* auto fetch not working if bundle exists (backport [#39002](#39002)) ([#39004](#39004)) ([2e91934](2e91934))
* **DX:** capture tracebacks with context (backport [#39060](#39060)) ([#39063](#39063)) ([8ad7faf](8ad7faf))
* enqueue demo data setup on setup complete (backport [#39043](#39043)) ([#39044](#39044)) ([d8cf994](d8cf994))
* incorrect total when Accumulating values ([7c7c3c9](7c7c3c9))
* Multiple subscription fixes ([#39005](#39005)) ([5158884](5158884))
* non stock uom validation for serial and batch (backport [#39018](#39018)) ([#39026](#39026)) ([89d1069](89d1069))
* not able to cancel sales invoice (backport [#38979](#38979)) ([#38980](#38980)) ([f8625f3](f8625f3))
* on cancellation of document cancel the serial and batch bundle (backport [#39076](#39076)) ([#39082](#39082)) ([2e0abbd](2e0abbd))
* Opening balance in bank reconciliation tool ([#38977](#38977)) ([e0755f9](e0755f9))
* purchase return without item code not working (backport [#39014](#39014)) ([#39015](#39015)) ([2a390ac](2a390ac))
* remove bad defaults (backport [#38986](#38986)) ([#38988](#38988)) ([46035ed](46035ed))
* select options should dynamically load dimensions ([21f9001](21f9001))
* serial and batch bundle company mandatory error (backport [#38994](#38994)) ([#38999](#38999)) ([d2580be](d2580be))
* take quantity into account when setting asset's gross purchase amt (backport [#39056](#39056)) ([#39058](#39058)) ([2e93275](2e93275))
* Unable to save Sales Invoice ([#39059](#39059)) ([73c0f37](73c0f37))
* undefined error in Budget Variance and Profitability report ([9fdf5c8](9fdf5c8))
* undefined error in consolidated financial report ([49f93f9](49f93f9))
* use `Stock Qty` while getting `POS Reserved Qty` (backport [#38962](#38962)) ([#38965](#38965)) ([76c6b50](76c6b50))
* Validate account in Sales/Purchase Taxes and Charges Template ([#39013](#39013)) ([f3254c2](f3254c2))
* work order with multi level, fetch operting cost from sub-assembly (backport [#38992](#38992)) ([#39028](#39028)) ([3a7506e](3a7506e))

### Features

* Against voucher filter in General Ledger ([#39102](#39102)) ([458064f](458064f))
* group by Asset in Asset Depreciations and Balances report (backport [#38923](#38923)) ([#39066](#39066)) ([d85dad7](d85dad7))
* Merge taxes from mapped docs ([#38346](#38346)) ([4e23048](4e23048))
* voucher subtype for general ledger ([#38822](#38822)) ([e5d73c7](e5d73c7))

### Performance Improvements

* index item_code in bom explosion item (backport [#39085](#39085)) ([#39088](#39088)) ([57bcf9f](57bcf9f))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 13, 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