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 return_against on delivery note (backport #38827) #38831

Merged
merged 2 commits into from
Dec 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 18, 2023

This is an automatic backport of pull request #38827 done by Mergify.
Cherry-pick of 8d79365 has failed:

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

You are currently cherry-picking commit 8d79365e0d.
  (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/patches.txt
	modified:   erpnext/stock/doctype/delivery_note/delivery_note.json
	modified:   erpnext/stock/doctype/delivery_note/delivery_note.py
	new file:   erpnext/stock/doctype/delivery_note/patches/__init__.py
	new file:   erpnext/stock/doctype/delivery_note/patches/drop_unused_return_against_index.py
	modified:   erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

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

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

There's a multi-column index but that's useful IFF all parts of column
are part of query.

return against on it's own is VERY unique because it's a primary key, we
don't need a multi-column index here.

(cherry picked from commit 8d79365)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@mergify mergify bot added the conflicts label Dec 18, 2023
@mergify mergify bot assigned ankush Dec 18, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Dec 18, 2023
@ankush ankush merged commit 4114760 into version-14-hotfix Dec 18, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-38827 branch December 18, 2023 12:41
frappe-pr-bot pushed a commit that referenced this pull request Dec 20, 2023
# [14.55.0](v14.54.2...v14.55.0) (2023-12-20)

### Bug Fixes

* close PO on SCO close (backport [#38667](#38667)) ([#38680](#38680)) ([22b442d](22b442d))
* **customer:** contact creation for companies ([#38055](#38055)) ([ed9b38b](ed9b38b))
* **customer:** quick form and integration fixes ([#37386](#37386)) ([6ed7c66](6ed7c66))
* error while filtering on name on reconciliation tool ([30b6321](30b6321))
* fetch exc rate of multi currency journals ([bf585de](bf585de))
* fetch item_tax_template values if fields with fetch_from exisit ([24ae45c](24ae45c))
* get customers for leaderboard ([9dfe342](9dfe342))
* get items for leaderboard ([812b301](812b301))
* get sales partner for leaderboard ([c63f873](c63f873))
* get sales person for leaderboard ([df93447](df93447))
* get suppliers for leaderboard ([7477ff3](7477ff3))
* if not budget then don't validate ([#38861](#38861)) ([d375164](d375164))
* incoming rate for sales return with Moving Average valuation method ([#38849](#38849)) ([7fdac62](7fdac62))
* incorrect limit ([#38818](#38818)) ([e18dc5c](e18dc5c))
* Init internal child table values ([d593f81](d593f81))
* item variant with manufacturer ([#38845](#38845)) ([e0c8ff1](e0c8ff1))
* not able to cancel SCR with Batch ([#38817](#38817)) ([fb5090f](fb5090f))
* not able to make inter-company po from so ([#38826](#38826)) ([23042df](23042df))
* on closed unreserved the production plan qty ([#38848](#38848)) ([2184e8e](2184e8e))
* Reset SLA on issue doesn't work (backport [#38789](#38789)) ([#38790](#38790)) ([942f34a](942f34a))
* supplier removed on selection of item (backport [#38712](#38712)) ([#38732](#38732)) ([dda95ea](dda95ea))
* timezone aware SLA banner (backport [#38745](#38745)) ([#38746](#38746)) ([73d525e](73d525e))
* **ux:** don't override Item Name and Description in MR (backport [#38720](#38720)) ([#38762](#38762)) ([f7bfbd8](f7bfbd8))
* validation error on reconciling PE to Journals as Invoice ([9836205](9836205))
* wrong currency in Stock Balance report (backport [#38778](#38778)) ([#38779](#38779)) ([e05b23c](e05b23c))
* wrong paid and cn amount on pos invoice ([77da0da](77da0da))

### Features

* **RFQ:** special properties in print preview (backport [#38725](#38725)) ([#38726](#38726)) ([2290750](2290750))
* set lead name from email ([1469ca7](1469ca7))

### Performance Improvements

* index `return_against` on delivery note (backport [#38827](#38827)) ([#38831](#38831)) ([4114760](4114760))
@frappe-pr-bot
Copy link
Collaborator

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

Successfully merging this pull request may close these issues.

2 participants