10000 fix: do not show hidden filters in export or print (backport #28331) by mergify[bot] · Pull Request #31898 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: do not show hidden filters in export or print (backport #28331) #31898

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
Merged
merged 2 commits into from
Apr 22, 2025
Merged

fix: do not show hidden filters in export or print (backport #28331) #31898

merged 2 commits into from
Apr 22, 2025

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Mar 25, 2025

Issue: Hidden filters shown in print format and Excel export create confusion.

Before:
image
image

After:
image
image

backport-version-15

Frappe Support Issue: https://support.frappe.io/helpdesk/tickets/20815

This is an automatic backport of pull request #28331 done by [Mergify](https://mergify.com).

@ljain112 @mergify
fix: do not show hidden filters in export or print
f4f3237 
(cherry picked from commit bbaed45)

# Conflicts:
#	frappe/public/js/frappe/views/reports/query_report.js
@mergify mergify bot added the conflicts label Mar 25, 2025
@mergify Mergify
Copy link
Contributor Author
mergify bot commented Mar 25, 2025

Cherry-pick of bbaed45 has failed:

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

You are currently cherry-picking commit bbaed45d46.
  (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/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

@ruthra-kumar
Copy link
Member

@venkat102

Backport created as requested.

@akhilnarang akhilnarang merged commit 9dd6b55 into version-14-hotfix Apr 22, 2025
9 of 10 checks passed
@akhilnarang akhilnarang deleted the mergify/bp/version-14-hotfix/pr-28331 branch April 22, 2025 07:37
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.96.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 May 7, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ruthra-kumar @frappe-pr-bot @akhilnarang @ljain112
0