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: recursion issue while submitting work order (backport #40400) #40401

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 12, 2024

This is an automatic backport of pull request #40400 done by Mergify.
Cherry-pick of 72614bb has failed:

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

You are currently cherry-picking commit 72614bb8ff.
  (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/job_card/job_card.py

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


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 72614bb)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py
@mergify mergify bot requested a review from rohitwaghchaure as a code owner March 12, 2024 10:59
@mergify mergify bot added the conflicts label Mar 12, 2024
@mergify mergify bot requested a review from s-aga-r as a code owner March 12, 2024 10:59
Copy link
Contributor Author

mergify bot commented Mar 12, 2024

Cherry-pick of 72614bb has failed:

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

You are currently cherry-picking commit 72614bb8ff.
  (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/job_card/job_card.py

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 Mar 12, 2024
@rohitwaghchaure rohitwaghchaure removed needs-tests This PR needs automated unit-tests. conflicts labels Mar 12, 2024
@rohitwaghchaure rohitwaghchaure merged commit 06e3874 into version-14-hotfix Mar 12, 2024
10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-40400 branch March 12, 2024 11:23
frappe-pr-bot pushed a commit that referenced this pull request Mar 12, 2024
## [14.65.1](v14.65.0...v14.65.1) (2024-03-12)

### Bug Fixes

* barcode field on line item not working (backport [#40381](#40381)) ([#40383](#40383)) ([80df609](80df609))
* conditionally apply `is_group` filter in accounting dimension query (backport [#40414](#40414)) ([#40415](#40415)) ([cd40038](cd40038))
* error message wording ([#40403](#40403)) ([7402303](7402303))
* Filter for projects in Sales Cycle ([8d63d19](8d63d19))
* get_user_default_as_list args order ([e0d1b4b](e0d1b4b))
* incorrect work order status (backport [#40407](#40407)) ([#40410](#40410)) ([c413b04](c413b04))
* load ignored doctype and include Mode of Payment Account ([#40334](#40334)) ([411157c](411157c))
* message for subscription when no current inv ([e9c2f6d](e9c2f6d))
* MR Default Supplier search query (backport [#40273](#40273)) ([#40350](#40350)) ([c6fe409](c6fe409))
* qc created for raw materials during manufacture entry (backport [#40408](#40408)) ([#40412](#40412)) ([21b57d9](21b57d9))
* recursion issue while submitting work order (backport [#40400](#40400)) ([#40401](#40401)) ([06e3874](06e3874))
* Sender email in process statements of accounts ([ea605e7](ea605e7))
* **Shipment Parcel:** make length, width and height non-mandatory ([911a582](911a582))
* subcontracting receipt -> alllow to change Batch / Serial Nos (v14) ([#40371](#40371)) ([ffd04b3](ffd04b3))
* UAE tax computation fix ([02cd8c4](02cd8c4))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.65.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants