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

refactor: remove Recalculate Rate from SCR Item (backport #36929) #36931

Merged
merged 2 commits into from
Sep 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 3, 2023

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

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

You are currently cherry-picking commit cd8ddae7c5.
  (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/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
	both modified:   erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
	both modified:   erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json

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/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 cd8ddae)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@mergify mergify bot added the conflicts label Sep 3, 2023
@mergify mergify bot assigned s-aga-r Sep 3, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Sep 3, 2023
@s-aga-r s-aga-r removed conflicts needs-tests This PR needs automated unit-tests. labels Sep 3, 2023
@s-aga-r s-aga-r merged commit 11e67c7 into version-14-hotfix Sep 3, 2023
10 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36929 branch September 3, 2023 13:35
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.38.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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