8000 fix: make max report rows configurable (backport #32582) by mergify[bot] · Pull Request #32584 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: make max report rows configurable (backport #32582) #32584

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

Merged
merged 2 commits into from
May 20, 2025

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented May 19, 2025

This PR makes the max rows to show in report configurable
#32419 (comment)


This is an automatic backport of pull request #32582 done by Mergify.

* fix: make max report rows configurable

* fix: add description to setting and use sysdefaults

(cherry picked from commit ea3050a)

# Conflicts:
#	frappe/core/doctype/system_settings/system_settings.json
#	frappe/core/doctype/system_settings/system_settings.py
#	frappe/public/js/frappe/views/reports/query_report.js
@mergify mergify bot added the conflicts label May 19, 2025
Copy link
Contributor Author
mergify bot commented May 19, 2025

Cherry-pick of ea3050a has failed:

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

You are currently cherry-picking commit ea3050a751.
  (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:   frappe/core/doctype/system_settings/system_settings.json
	both modified:   frappe/core/doctype/system_settings/system_settings.py
	both modified:   frappe/public/js/frappe/views/reports/query_report.js

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@sokumon sokumon added Skip CI Doesn't run Ci for this PR. and removed conflicts labels May 20, 2025
@sokumon sokumon merged commit 26c2be9 into version-14-hotfix May 20, 2025
8 of 13 checks passed
@sokumon sokumon deleted the mergify/bp/version-14-hotfix/pr-32582 branch May 20, 2025 11:52
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.96.4 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 4, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
released Skip CI Doesn't run Ci for this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0