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: the project document timed out while opening (backport #45767) #45775

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 6, 2025

Project performance issue causes

(cherry picked from commit 33d03b1)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.json
Copy link
Contributor Author

mergify bot commented Feb 6, 2025

Cherry-pick of 33d03b1 has failed:

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

You are currently cherry-picking commit 33d03b1542.
  (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/accounts/doctype/sales_invoice/sales_invoice.json
	modified:   erpnext/projects/doctype/project/project.py

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

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 Feb 6, 2025
@rohitwaghchaure rohitwaghchaure removed needs-tests This PR needs automated unit-tests. conflicts labels Feb 6, 2025
@rohitwaghchaure rohitwaghchaure merged commit 39e3746 into version-15-hotfix Feb 10, 2025
10 of 11 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-45767 branch February 10, 2025 04:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant