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

perf: optimize update_purchase_cost method (backport #38298) #38318

Merged
merged 5 commits into from
Nov 24, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 24, 2023

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

On branch mergify/bp/version-14-hotfix/pr-38298
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bcbe6c4a53.
  (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/projects/doctype/project/project.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/projects/doctype/project/project.py

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

# Conflicts:
#	erpnext/projects/doctype/project/project.py
@mergify mergify bot requested a review from rohitwaghchaure as a code owner November 24, 2023 06:20
@mergify mergify bot added the conflicts label Nov 24, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Nov 24, 2023
@ruthra-kumar ruthra-kumar merged commit 7601861 into version-14-hotfix Nov 24, 2023
9 of 10 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-38298 branch November 24, 2023 06:51
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.50.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 Jan 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants