From 9e4c8d61eaa68574ebe9e69f1f13eb9216111f40 Mon Sep 17 00:00:00 2001 From: Dharmraj Jhala Date: Thu, 18 Mar 2021 13:04:28 +0000 Subject: [PATCH 1/2] [IMP] base, survey: add option to enable smart-shnking This commit adds a boolean field `disable_shrinking` in model `report.paperformat`, which, if set to True, will add one argument `--disable-smart-shrinking` in commands that prevents the pdf shrinking. See issue[1] for more information. This options is utilized for printing survey certificaiton. issue[1] - https://github.com/wkhtmltopdf/wkhtmltopdf/issues/3226 taskID-2483393 --- addons/survey/views/survey_reports.xml | 1 + odoo/addons/base/models/ir_actions_report.py | 2 ++ odoo/addons/base/models/report_paperformat.py | 1 + 3 files changed, 4 insertions(+) diff --git a/addons/survey/views/survey_reports.xml b/addons/survey/views/survey_reports.xml index fb45d5714d3..6476af41959 100644 --- a/addons/survey/views/survey_reports.xml +++ b/addons/survey/views/survey_reports.xml @@ -13,6 +13,7 @@ 0 0 + diff --git a/odoo/addons/base/models/ir_actions_report.py b/odoo/addons/base/models/ir_actions_report.py index c4c37111860..f5072119ad3 100644 --- a/odoo/addons/base/models/ir_actions_report.py +++ b/odoo/addons/base/models/ir_actions_report.py @@ -324,6 +324,8 @@ class IrActionsReport(models.Model): command_args.extend(['--orientation', str(paperformat_id.orientation)]) if paperformat_id.header_line: command_args.extend(['--header-line']) + if paperformat_id.disable_shrinking: + command_args.extend(['--disable-smart-shrinking']) if landscape: command_args.extend(['--orientation', 'landscape']) diff --git a/odoo/addons/base/models/report_paperformat.py b/odoo/addons/base/models/report_paperformat.py index 9c5afdcf03a..3bdce5171ef 100644 --- a/odoo/addons/base/models/report_paperformat.py +++ b/odoo/addons/base/models/report_paperformat.py @@ -182,6 +182,7 @@ class report_paperformat(models.Model): ], 'Orientation', default='Landscape') header_line = fields.Boolean('Display a header line', default=False) header_spacing = fields.Integer('Header spacing', default=35) + disable_shrinking = fields.Boolean('Disable smart shrinking') dpi = fields.Integer('Output DPI', required=True, default=90) report_ids = fields.One2many('ir.actions.report', 'paperformat_id', 'Associated reports', help="Explicitly associated reports") print_page_width = fields.Float('Print page width (mm)', compute='_compute_print_page_size') From 7321ec0deb2270c4499df463c362daefe9dcb885 Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Fri, 19 Mar 2021 13:43:27 +0000 Subject: [PATCH 2/2] [IMP] survey: fixes certification layout, adding dpi and removing width and height in css --- addons/survey/static/src/scss/survey_reports.scss | 6 ++---- addons/survey/views/survey_reports.xml | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/survey/static/src/scss/survey_reports.scss b/addons/survey/static/src/scss/survey_reports.scss index c7c0e8c5161..825a91de43b 100644 --- a/addons/survey/static/src/scss/survey_reports.scss +++ b/addons/survey/static/src/scss/survey_reports.scss @@ -28,13 +28,11 @@ } #o_survey_certification.certification-wrapper { - width: 297mm; - height: 210mm; background-color: #875A7B; position: relative; display: flex; - margin-left: -15px; - margin-right: -15px; + margin-left: -4mm; + margin-right: -4mm; &.blue { background-color: #263e86; diff --git a/addons/survey/views/survey_reports.xml b/addons/survey/views/survey_reports.xml index 6476af41959..14cab2da94d 100644 --- a/addons/survey/views/survey_reports.xml +++ b/addons/survey/views/survey_reports.xml @@ -14,6 +14,7 @@ 0 + 96