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: Production Plan: load document defaults for plan items & remove name column from listview (backport #26584) #44201

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 19, 2024

fixes #26566


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

…name column from listview (#26584)

(cherry picked from commit 69d88a9)

# Conflicts:
#	erpnext/manufacturing/doctype/production_plan/production_plan.py
#	erpnext/manufacturing/doctype/production_plan/production_plan_list.js
Copy link
Contributor Author

mergify bot commented Nov 19, 2024

Cherry-pick of 69d88a9 has failed:

On branch mergify/bp/develop/pr-26584
Your branch is up to date with 'origin/develop'.

You are currently cherry-picking commit 69d88a9212.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/manufacturing/doctype/production_plan/production_plan.py
	both modified:   erpnext/manufacturing/doctype/production_plan/production_plan_list.js

no changes added to commit (use "git add" and/or "git commit -a")

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 19, 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
1 participant