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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 4 commits into from
Dec 30, 2023
Merged

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

merged 4 commits into from
Dec 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 29, 2023

This is an automatic backport of pull request #38992 done by Mergify.
Cherry-pick of 70abedc has failed:

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

You are currently cherry-picking commit 70abedc57a.
  (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/manufacturing/doctype/bom/bom.py
	modified:   erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
	modified:   erpnext/manufacturing/doctype/production_plan/test_production_plan.py
	modified:   erpnext/stock/doctype/stock_entry/stock_entry.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
	both modified:   erpnext/manufacturing/doctype/work_order/test_work_order.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

@rohitwaghchaure @mergify
fix: work order with multi level, fetch operting cost from sub-assemb…
5545d66 
…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
@mergify mergify bot requested a review from rohitwaghchaure as a code owner December 29, 2023 11:21
@mergify mergify bot added the conflicts label Dec 29, 2023
@mergify mergify bot requested a review from s-aga-r as a code owner December 29, 2023 11:21
@rohitwaghchaure rohitwaghchaure merged commit 88e5c9e into version-14-hotfix Dec 30, 2023
10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-38992 branch December 30, 2023 05:44
frappe-pr-bot pushed a commit that referenced this pull request Jan 3, 2024
@frappe-bot
chore(release): Bumped to Version 14.58.0
b6a3627 
# [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
Copy link
Collaborator

🎉 This PR is included in version 14.58.0 🎉

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 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

@s-aga-r s-aga-r Awaiting requested review from s-aga-r

Assignees

@rohitwaghchaure rohitwaghchaure

Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @rohitwaghchaure