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

fix: use smaller font only if the report doesnt have a standard print format (backport #20878) #20946

Merged
merged 4 commits into from
May 9, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 9, 2023

This is an automatic backport of pull request #20878 done by Mergify.
Cherry-pick of 66716fb has failed:

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

You are currently cherry-picking commit 66716fbe12.
  (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:   frappe/public/html/print_template.html

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/public/js/frappe/views/reports/query_report.js
	both modified:   frappe/public/js/frappe/views/reports/report_view.js

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

… format (#20878)

(cherry picked from commit 66716fb)

# Conflicts:
#	frappe/public/js/frappe/views/reports/query_report.js
#	frappe/public/js/frappe/views/reports/report_view.js
@mergify mergify bot requested a review from a team May 9, 2023 14:05
@mergify mergify bot added the conflicts label May 9, 2023
@mergify mergify bot requested review from shariquerik and removed request for a team May 9, 2023 14:05
@mergify mergify bot assigned phot0n May 9, 2023
@phot0n phot0n removed the conflicts label May 9, 2023
@phot0n phot0n merged commit 8b0c1f8 into version-13-hotfix May 9, 2023
6 of 9 checks passed
@phot0n phot0n deleted the mergify/bp/version-13-hotfix/pr-20878 branch May 9, 2023 14:09
frappe-pr-bot pushed a commit that referenced this pull request May 9, 2023
## [13.56.2](v13.56.1...v13.56.2) (2023-05-09)

### Bug Fixes

* ensure that `get_last_email` returns the most recent email ([#20711](#20711)) ([d416159](d416159))
* make operator in link filters translatable (backport [#20884](#20884)) ([#20910](#20910)) ([688a2b4](688a2b4))
* merge conflict ([64d5c8f](64d5c8f))
* translate lowercase operators to german ([#20912](#20912)) ([#20915](#20915)) ([598bdaf](598bdaf))
* use smaller font only if the report doesnt have a standard print format (backport [#20878](#20878)) ([#20946](#20946)) ([8b0c1f8](8b0c1f8))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.56.2 🎉

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 24, 2023
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.

None yet

2 participants