Skip to content

refactor!: dynamically compute bom_level (backport #29522) - #29540

Merged
ankush merged 5 commits into
version-13-hotfixfrom
mergify/bp/version-13-hotfix/pr-29522
Jan 31, 2022
Merged

refactor!: dynamically compute bom_level (backport #29522)#29540
ankush merged 5 commits into
version-13-hotfixfrom
mergify/bp/version-13-hotfix/pr-29522

Conversation

@mergify

@mergify mergify Bot commented Jan 31, 2022

Copy link
Copy Markdown
Contributor

This is an automatic backport of pull request #29522 done by Mergify.
Cherry-pick of 157b4b3 has failed:

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

You are currently cherry-picking commit 157b4b33fe.
  (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.json
	modified:   erpnext/manufacturing/doctype/production_plan/production_plan.py
	modified:   erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
	modified:   erpnext/manufacturing/report/bom_explorer/bom_explorer.py
	modified:   erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
	deleted:    erpnext/patches/v13_0/update_level_in_bom.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/manufacturing/doctype/bom/bom.py
	both modified:   erpnext/patches.txt

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 157b4b3)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.py
#	erpnext/patches.txt
@ankush ankush added squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. and removed conflicts labels Jan 31, 2022
@ankush
ankush merged commit 5ac11a4 into version-13-hotfix Jan 31, 2022
@ankush
ankush deleted the mergify/bp/version-13-hotfix/pr-29522 branch January 31, 2022 11:41
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Jan 12, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants