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: index in Item and Item Variant Attribute (backport #36133) #36145

Merged
merged 3 commits into from
Jul 15, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 15, 2023

This is an automatic backport of pull request #36133 done by Mergify.
Cherry-pick of 04400eb has failed:

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

You are currently cherry-picking commit 04400eb2e4.
  (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/stock/doctype/item/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 04400eb)

# Conflicts:
#	erpnext/stock/doctype/item/item.json
erpnext/stock/doctype/item/item.json Outdated Show resolved Hide resolved
@s-aga-r s-aga-r removed the conflicts label Jul 15, 2023
@s-aga-r s-aga-r merged commit 120de24 into version-13-hotfix Jul 15, 2023
5 of 6 checks passed
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-36133 branch July 15, 2023 04:50
frappe-pr-bot pushed a commit that referenced this pull request Jul 18, 2023
## [13.52.6](v13.52.5...v13.52.6) (2023-07-18)

### Bug Fixes

* allow manual asset receipt mov from nowhere (backport [#36093](#36093)) ([#36095](#36095)) ([2993eb5](2993eb5))
* HSN code not showing up in GST itemised register reports ([#36142](#36142)) ([1d3917b](1d3917b))
* improve "Update Items" modal ([#36105](#36105)) ([3bc899f](3bc899f))

### Performance Improvements

* index in `Item` and `Item Variant Attribute` (backport [#36133](#36133)) ([#36145](#36145)) ([120de24](120de24))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.52.6 🎉

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 17, 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