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 #20878

Merged
merged 1 commit into from
May 9, 2023

Conversation

phot0n
Copy link
Contributor

@phot0n phot0n commented May 2, 2023

Internal Reference: ISS-23-24-00561

Change: don't control the font size of standard print formats of reports - ideally they should define their own font sizes

@phot0n phot0n requested review from a team, shariquerik and surajshetty3416 and removed request for a team May 2, 2023 18:12
@phot0n phot0n force-pushed the font-size-print-report branch 2 times, most recently from 794c4d9 to fa35f28 Compare May 2, 2023 18:54
@@ -1371,6 +1371,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
columns: this.get_columns_for_print(print_settings, custom_format),
original_data: this.data,
report: this,
is_standard_format: this.report_doc.is_standard === "Yes" && custom_format ? 1 : 0,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this additional check for is_standard is for custom reports created from standard reports

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's probably better to offload this to user somehow? 👀 - in the printview itself?

@phot0n
Copy link
Contributor Author

phot0n commented May 4, 2023

not really sure about this "fix" or if this should be handled this way.

open to suggestions.

@phot0n phot0n force-pushed the font-size-print-report branch 2 times, most recently from 2260f38 to 18a0f76 Compare May 9, 2023 14:03
@phot0n phot0n merged commit 66716fb into frappe:develop May 9, 2023
12 of 14 checks passed
@phot0n phot0n deleted the font-size-print-report branch May 9, 2023 14:05
mergify bot pushed a commit that referenced this pull request May 9, 2023
… 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 bot pushed a commit that referenced this pull request May 9, 2023
phot0n added a commit that referenced this pull request May 9, 2023
… format (#20878) (#20947)

(cherry picked from commit 66716fb)

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
phot0n added a commit that referenced this pull request May 9, 2023
… format (backport #20878) (#20946)

* fix: use smaller font only if the report doesnt have a standard print 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

* Update frappe/public/js/frappe/views/reports/query_report.js

* Update frappe/public/js/frappe/views/reports/report_view.js

* Update frappe/public/js/frappe/views/reports/query_report.js

---------

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
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 pushed a commit that referenced this pull request May 9, 2023
# [14.36.0](v14.35.0...v14.36.0) (2023-05-09)

### Bug Fixes

* ensure that `get_last_email` returns the most recent email (backport [#20711](#20711)) ([624f96b](624f96b))
* escape html from listview row title ([56bec1d](56bec1d))
* escape html from workspace title ([e68fc43](e68fc43))
* ignore virtual doctypes during data export ([#20891](#20891)) ([#20899](#20899)) ([d6bfaae](d6bfaae))
* make operator in link filters translatable (backport [#20884](#20884)) ([#20911](#20911)) ([1ec3bad](1ec3bad))
* message.py executing script ([#20887](#20887)) ([#20897](#20897)) ([1bcf5d4](1bcf5d4))
* **multi-pdf:** change response type to pdf ([997559c](997559c))
* **oauth:** add exp to idToken ([#20694](#20694)) ([#20903](#20903)) ([1a8e671](1a8e671))
* reload communication before re-save ([#20914](#20914)) ([#20921](#20921)) ([37a8ec0](37a8ec0))
* set default letterhead and print format ([a5a6965](a5a6965))
* strip comma, space from recipients before sending email for auto repeat ([#20940](#20940)) ([#20945](#20945)) ([042a1d2](042a1d2))
* translate lowercase operators to german ([#20912](#20912)) ([#20916](#20916)) ([c47b146](c47b146))
* type hints for get_address_display ([#20923](#20923)) ([#20924](#20924)) ([15df963](15df963))
* use smaller font only if the report doesnt have a standard print format ([#20878](#20878)) ([#20947](#20947)) ([35165d0](35165d0))

### Features

* helper method for address display ([#20900](#20900)) ([#20901](#20901)) ([f914770](f914770))
* telemetry using posthog (backport [#20825](#20825)) ([#20934](#20934)) ([bbe29ee](bbe29ee))

### Performance Improvements

* get all file data at once when downloading private file ([#20902](#20902)) ([e106594](e106594))
@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
backport version-14-hotfix backport to version 14
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant