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 process loss in job card (backport #35629) #35658

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 12, 2023

This is an automatic backport of pull request #35629 done by Mergify.
Cherry-pick of e9a6191 has failed:

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

You are currently cherry-picking commit e9a6191af9.
  (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/job_card/job_card.js
	modified:   erpnext/manufacturing/doctype/job_card/job_card.py
	modified:   erpnext/manufacturing/doctype/work_order/work_order.js
	modified:   erpnext/manufacturing/doctype/work_order/work_order.json
	modified:   erpnext/manufacturing/doctype/work_order/work_order.py
	modified:   erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
	modified:   erpnext/stock/doctype/stock_entry/stock_entry.js
	modified:   erpnext/stock/doctype/stock_entry/stock_entry.json
	modified:   erpnext/stock/doctype/stock_entry/stock_entry.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/manufacturing/doctype/job_card/job_card.json

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 e9a6191)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.json
(cherry picked from commit 0382eec)
@rohitwaghchaure rohitwaghchaure merged commit 74ffb1d into version-14-hotfix Jun 13, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-35629 branch June 13, 2023 06:23
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.27.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 1, 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.

2 participants