From b1ab01e36bdc8f191e664751a514da07b567bdb2 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Mon, 12 Dec 2022 22:51:45 +0100 Subject: [PATCH] [MIG] report_py3o_fusion_server to v16 Migration of report_py3o_fusion_server from v14 to v16 --- report_py3o_fusion_server/README.rst | 23 +++++---- report_py3o_fusion_server/__manifest__.py | 4 +- .../models/py3o_pdf_options.py | 27 ++++------ .../models/py3o_report.py | 2 +- .../static/description/index.html | 50 ++++++++++--------- .../views/py3o_pdf_options.xml | 8 +-- .../views/py3o_server.xml | 7 +-- requirements.txt | 1 + .../odoo/addons/report_py3o_fusion_server | 1 + setup/report_py3o_fusion_server/setup.py | 6 +++ 10 files changed, 69 insertions(+), 60 deletions(-) create mode 120000 setup/report_py3o_fusion_server/odoo/addons/report_py3o_fusion_server create mode 100644 setup/report_py3o_fusion_server/setup.py diff --git a/report_py3o_fusion_server/README.rst b/report_py3o_fusion_server/README.rst index f8d433b4c..2504fa420 100644 --- a/report_py3o_fusion_server/README.rst +++ b/report_py3o_fusion_server/README.rst @@ -2,10 +2,13 @@ Py3o Report Engine - Fusion server support ========================================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:ce9546831300e0c5d41211fac8272f14abfb1207bed3bf9acafc2653c5de68b6 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ Py3o Report Engine - Fusion server support :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github - :target: https://github.com/OCA/reporting-engine/tree/14.0/report_py3o_fusion_server + :target: https://github.com/OCA/reporting-engine/tree/16.0/report_py3o_fusion_server :alt: OCA/reporting-engine .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/reporting-engine-14-0/reporting-engine-14-0-report_py3o_fusion_server + :target: https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-report_py3o_fusion_server :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/143/14.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&target_branch=16.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module was written to let a py3o fusion server handle format conversion instead of local libreoffice. If you install this module above the *report_py3o* module, you will have to deploy additionnal software components and run 3 daemons (libreoffice, py3o.fusion and py3o.renderserver). This additionnal complexiy comes with several advantages: @@ -139,8 +142,8 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -177,6 +180,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/reporting-engine `_ project on GitHub. +This module is part of the `OCA/reporting-engine `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/report_py3o_fusion_server/__manifest__.py b/report_py3o_fusion_server/__manifest__.py index 23e9752bb..faec18a1f 100644 --- a/report_py3o_fusion_server/__manifest__.py +++ b/report_py3o_fusion_server/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Py3o Report Engine - Fusion server support", "summary": "Let the fusion server handle format conversion.", - "version": "14.0.1.0.0", + "version": "16.0.1.0.0", "category": "Reporting", "license": "AGPL-3", "author": "XCG Consulting," @@ -13,7 +13,7 @@ "website": "https://github.com/OCA/reporting-engine", "depends": ["report_py3o"], "external_dependencies": { - "python": ["py3o.template", "py3o.formats"], + "python": ["py3o.template", "py3o.formats", "mock"], "deb": ["libreoffice"], }, "demo": ["demo/report_py3o.xml", "demo/py3o_pdf_options.xml"], diff --git a/report_py3o_fusion_server/models/py3o_pdf_options.py b/report_py3o_fusion_server/models/py3o_pdf_options.py index 7a6399e09..cf560bfbb 100644 --- a/report_py3o_fusion_server/models/py3o_pdf_options.py +++ b/report_py3o_fusion_server/models/py3o_pdf_options.py @@ -19,7 +19,6 @@ class Py3oPdfOptions(models.Model): # UseLosslessCompression (bool) image_compression = fields.Selection( [("lossless", "Lossless Compression"), ("jpeg", "JPEG Compression")], - string="Image Compression", default="jpeg", ) # Quality (int) @@ -65,11 +64,11 @@ class Py3oPdfOptions(models.Model): # AllowDuplicateFieldNames (bool) pdf_form_allow_duplicate = fields.Boolean("Allow Duplicate Field Names") # ExportBookmarks (bool) - export_bookmarks = fields.Boolean("Export Bookmarks", default=True) + export_bookmarks = fields.Boolean(default=True) # ExportPlaceholders (bool) - export_placeholders = fields.Boolean("Export Placeholders", default=True) + export_placeholders = fields.Boolean(default=True) # ExportNotes (bool) - export_comments = fields.Boolean("Export Comments") + export_comments = fields.Boolean() # ExportHiddenSlides (bool) ?? export_hidden_slides = fields.Boolean("Export Automatically Insered Blank Pages") # Doesn't make sense to have the option "View PDF after export" ! :) @@ -81,7 +80,7 @@ class Py3oPdfOptions(models.Model): default="0", ) # InitialPage (int) - initial_page = fields.Integer(string="Initial Page", default=1) + initial_page = fields.Integer(default=1) # Magnification (int) magnification = fields.Selection( [ @@ -91,7 +90,6 @@ class Py3oPdfOptions(models.Model): ("3", "Fit Visible"), ("4", "Zoom"), ], - string="Magnification", default="0", ) # Zoom (int) @@ -106,7 +104,6 @@ class Py3oPdfOptions(models.Model): ("2", "Continuous"), ("3", "Continuous Facing"), ], - string="Page Layout", default="0", ) # USER INTERFACE TAB @@ -119,11 +116,11 @@ class Py3oPdfOptions(models.Model): # OpenInFullScreenMode (bool) open_fullscreen = fields.Boolean(string="Open in Full Screen Mode") # DisplayPDFDocumentTitle (bool) - display_document_title = fields.Boolean(string="Display Document Title") + display_document_title = fields.Boolean() # HideViewerMenubar (bool) - hide_menubar = fields.Boolean(string="Hide Menubar") + hide_menubar = fields.Boolean() # HideViewerToolbar (bool) - hide_toolbar = fields.Boolean(string="Hide Toolbar") + hide_toolbar = fields.Boolean() # HideViewerWindowControls (bool) hide_window_controls = fields.Boolean(string="Hide Windows Controls") # OpenBookmarkLevels (int) -1 = all (default) from 1 to 10 @@ -167,13 +164,13 @@ class Py3oPdfOptions(models.Model): ) # SECURITY TAB # EncryptFile (bool) - encrypt = fields.Boolean("Encrypt") + encrypt = fields.Boolean() # DocumentOpenPassword (char) - document_password = fields.Char(string="Document Password") + document_password = fields.Char() # RestrictPermissions (bool) - restrict_permissions = fields.Boolean("Restrict Permissions") + restrict_permissions = fields.Boolean() # PermissionPassword (char) - permission_password = fields.Char(string="Permission Password") + permission_password = fields.Char() # TODO PreparedPasswords + PreparedPermissionPassword # I don't see those fields in the LO interface ! # But they are used in the LO code... @@ -184,7 +181,6 @@ class Py3oPdfOptions(models.Model): ("1", "Low Resolution (150 dpi)"), ("2", "High Resolution"), ], - string="Printing", default="2", ) # Changes (int) @@ -196,7 +192,6 @@ class Py3oPdfOptions(models.Model): ("3", "Commenting, Filling in Form Fields"), ("4", "Any Except Extracting Pages"), ], - string="Changes", default="4", ) # EnableCopyingOfContent (bool) diff --git a/report_py3o_fusion_server/models/py3o_report.py b/report_py3o_fusion_server/models/py3o_report.py index d6f9734d3..bf33030c7 100644 --- a/report_py3o_fusion_server/models/py3o_report.py +++ b/report_py3o_fusion_server/models/py3o_report.py @@ -83,7 +83,7 @@ class Py3oReport(models.TransientModel): fields["pdf_options"] = json.dumps(pdf_options_dict) logger.debug("PDF Export options: %s", pdf_options_dict) start_chrono = datetime.now() - r = requests.post(url, data=fields, files=files) + r = requests.post(url, data=fields, files=files, timeout=10) if r.status_code != 200: # server says we have an issue... let's tell that to enduser logger.error("Py3o fusion server error: %s", r.text) diff --git a/report_py3o_fusion_server/static/description/index.html b/report_py3o_fusion_server/static/description/index.html index 9fd40d881..22243b049 100644 --- a/report_py3o_fusion_server/static/description/index.html +++ b/report_py3o_fusion_server/static/description/index.html @@ -1,20 +1,20 @@ - + - + Py3o Report Engine - Fusion server support