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: added Stock UOM field for RM in work order (backport #44185) #44236

Open
wants to merge 1 commit into
base: version-14-hotfix
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 20, 2024

Fixed #43050


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

fix: added UOM field for RM in work order
(cherry picked from commit cc571ac)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order_item/work_order_item.json
#	erpnext/manufacturing/doctype/work_order_item/work_order_item.py
#	erpnext/patches.txt
Copy link
Contributor Author

mergify bot commented Nov 20, 2024

Cherry-pick of cc571ac has failed:

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

You are currently cherry-picking commit cc571aca8f.
  (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:
	new file:   erpnext/patches/v14_0/update_stock_uom_in_work_order_item.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/manufacturing/doctype/work_order_item/work_order_item.json
	both modified:   erpnext/manufacturing/doctype/work_order_item/work_order_item.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant