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.

Sign up for GitHub

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

Jump to bottom

perf: use estimated rows instead of actual rows (backport #38830) #38875

Merged
merged 2 commits into from
Dec 20, 2023
Merged

perf: use estimated rows instead of actual rows (backport #38830) #38875

merged 2 commits into from
Dec 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 20, 2023

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

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

You are currently cherry-picking commit 9983283f95.
  (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/report/batch_wise_balance_history/batch_wise_balance_history.py

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

@ankush @mergify
perf: use estimated rows instead of actual rows (#38830)
10a5e95 
(cherry picked from commit 9983283)

# Conflicts:
#	erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
@mergify mergify bot requested a review from rohitwaghchaure as a code owner December 20, 2023 07:47
@mergify mergify bot added the conflicts label Dec 20, 2023
@mergify mergify bot requested a review from s-aga-r as a code owner December 20, 2023 07:47
@mergify mergify bot assigned ankush Dec 20, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Dec 20, 2023
@ankush ankush merged commit 4d1ccd9 into version-14-hotfix Dec 20, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-38830 branch December 20, 2023 12:48
frappe-pr-bot pushed a commit that referenced this pull request Dec 27, 2023
@frappe-bot
chore(release): Bumped to Version 14.57.0
6e479f9 
# [14.57.0](v14.56.0...v14.57.0) (2023-12-27)

### Bug Fixes

* allow to set rate manually for service item in BOM ([#38880](#38880)) ([c2f692a](c2f692a))
* display all item rate stop messages ([226d0e0](226d0e0))
* do not reset the basic rate for the material receipt stock entry ([#38896](#38896)) ([98bfcc4](98bfcc4))
* first name error on customer creation ([#38927](#38927)) ([28f052d](28f052d))
* german translations for Lost Quotations ([#38435](#38435)) ([81b5e6c](81b5e6c))
* groups for current accounts in German CoAs ([39aa36e](39aa36e))
* incorrect price list in customer-wise item price report ([7577706](7577706))
* min order qty optional in production plan (backport [#38956](#38956)) ([#38957](#38957)) ([f6f2712](f6f2712))
* remove rows with zero consumed qty ([f2f4100](f2f4100))
* reposting not fixing valuation rate for sales return using movin… ([#38895](#38895)) ([3a668bb](3a668bb))
* reset the incoming rate on changing of the warehouse ([#38909](#38909)) ([2770ca1](2770ca1))
* skip jvs against bank accounts ([98198d3](98198d3))
* **test:** expect account currency when party account is specified. ([30cb218](30cb218))
* unset discount amount from coupon discounts ([87e8dd0](87e8dd0))
* use party account currency when party account is specified ([d9e0d55](d9e0d55))
* **ux:** make PR and PI Item rate field readonly based on `Maintain Same Rate` (backport [#38942](#38942)) ([#38943](#38943)) ([1eee203](1eee203))

### Features

* in_party_currency option for AR/AP reports ([3c717db](3c717db))
* total_asset_cost field (backport [#38879](#38879)) ([#38886](#38886)) ([8169c7d](8169c7d))

### Performance Improvements

* Drop unused/duplicate/sub-optimal indexes (backport [#38884](#38884)) ([#38912](#38912)) ([b254a72](b254a72))
* use estimated rows instead of actual rows (backport [#38830](#38830)) ([#38875](#38875)) ([4d1ccd9](4d1ccd9))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.57.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 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

@s-aga-r s-aga-r Awaiting requested review from s-aga-r

Assignees

@ankush ankush

Labels
conflicts needs-tests This PR needs automated unit-tests. released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @ankush