diff --git a/report_layout_config/README.rst b/report_layout_config/README.rst index 6c46ba656..c5a1872cb 100644 --- a/report_layout_config/README.rst +++ b/report_layout_config/README.rst @@ -2,10 +2,13 @@ Report layout configuration =========================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:b3b41741aeb7edc57c143d58911a9c2496218b8731d56e52f9510e6a979967a0 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ Report layout configuration :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/13.0/report_layout_config + :target: https://github.com/OCA/reporting-engine/tree/14.0/report_layout_config :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-13-0/reporting-engine-13-0-report_layout_config + :target: https://translation.odoo-community.org/projects/reporting-engine-14-0/reporting-engine-14-0-report_layout_config :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/13.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=14.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module provides new report template with possibility to add image to replace header and footer. @@ -46,8 +49,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. @@ -63,6 +66,7 @@ Contributors ~~~~~~~~~~~~ * Thomas Nowicki +* Iryna Vyshnevska Maintainers ~~~~~~~~~~~ @@ -77,6 +81,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_layout_config/__manifest__.py b/report_layout_config/__manifest__.py index e27c0401e..6524f68fa 100644 --- a/report_layout_config/__manifest__.py +++ b/report_layout_config/__manifest__.py @@ -12,6 +12,7 @@ "depends": ["web", "base"], "data": [ "views/document_layout.xml", + "templates/assets.xml", "templates/report_templates.xml", "data/report_layout.xml", ], diff --git a/report_layout_config/data/report_layout.xml b/report_layout_config/data/report_layout.xml index 480a10408..1d41271b8 100644 --- a/report_layout_config/data/report_layout.xml +++ b/report_layout_config/data/report_layout.xml @@ -1,14 +1,27 @@ - - Layout images + + Layout images standard /report_layout_config/static/img/preview_standard.png /report_layout_config/static/pdf/preview_standard.pdf + + + Layout images clean + + /report_layout_config/static/img/preview_standard.png + /report_layout_config/static/pdf/preview_standard.pdf + + diff --git a/report_layout_config/i18n/report_layout_config.pot b/report_layout_config/i18n/report_layout_config.pot index cd3e98a9d..f237ae3ec 100644 --- a/report_layout_config/i18n/report_layout_config.pot +++ b/report_layout_config/i18n/report_layout_config.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -13,42 +13,124 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report +msgid "" +"!important;\n" +" }\n" +" }\n" +" tbody {\n" +" tr:last-child td {\n" +" border-bottom: 3px solid" +msgstr "" + +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report +msgid "" +"&.o_clean_footer {\n" +" border-top: 3px solid" +msgstr "" + #. module: report_layout_config #: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report msgid "" "&.o_report_layout_standard {\n" -" h2 {\n" -" color:" -msgstr "" - -#. module: report_layout_config -#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report -msgid "" -";\n" -" }\n" -" #informations strong {\n" -" color:" -msgstr "" - -#. module: report_layout_config -#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report -msgid "" -";\n" -" }\n" -" #total strong{\n" -" color:" -msgstr "" - -#. module: report_layout_config -#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report -msgid "" -";\n" -" }\n" -" table {\n" -" thead {\n" +" h2 {\n" " color:" msgstr "" +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report +msgid "" +";\n" +" background-color:" +msgstr "" + +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report +msgid "" +";\n" +" tr th {\n" +" border-top: 3px solid" +msgstr "" + +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report +msgid "" +";\n" +" }\n" +" }\n" +" }\n" +" #total {\n" +" strong {\n" +" color:" +msgstr "" + +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report +msgid "" +";\n" +" h4 {\n" +" color:" +msgstr "" + +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report +msgid "" +";\n" +" }\n" +" .pagenumber {\n" +" border: 3px solid" +msgstr "" + +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report +msgid "" +";\n" +" }\n" +" }\n" +" &.o_report_layout_clean {\n" +" h1, h2, h3 {\n" +" color:" +msgstr "" + +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report +msgid "" +";\n" +" }\n" +" #informations strong {\n" +" color:" +msgstr "" + +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report +msgid "" +";\n" +" }\n" +" #total strong{\n" +" color:" +msgstr "" + +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report +msgid "" +";\n" +" }\n" +" strong {\n" +" color:" +msgstr "" + +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.styles_company_report +msgid "" +";\n" +" }\n" +" table {\n" +" thead {\n" +" color:" +msgstr "" + #. module: report_layout_config #: model:ir.model,name:report_layout_config.model_res_company msgid "Companies" @@ -60,8 +142,14 @@ msgid "Company Document Layout" msgstr "" #. module: report_layout_config -#: model_terms:ir.ui.view,arch_db:report_layout_config.external_layout_images_template -#: model_terms:ir.ui.view,arch_db:report_layout_config.footer_image +#: model:ir.model.fields,field_description:report_layout_config.field_base_document_layout__display_name +#: model:ir.model.fields,field_description:report_layout_config.field_res_company__display_name +msgid "Display Name" +msgstr "" + +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.external_clean_layout_images_template +#: model_terms:ir.ui.view,arch_db:report_layout_config.external_standard_layout_images_template msgid "Footer logo" msgstr "" @@ -78,29 +166,45 @@ msgid "Full header image" msgstr "" #. module: report_layout_config -#: model_terms:ir.ui.view,arch_db:report_layout_config.external_layout_images_template -#: model_terms:ir.ui.view,arch_db:report_layout_config.header_image +#: model:ir.model.fields,field_description:report_layout_config.field_base_document_layout__id +#: model:ir.model.fields,field_description:report_layout_config.field_res_company__id +msgid "ID" +msgstr "" + +#. module: report_layout_config +#: model:ir.model.fields,field_description:report_layout_config.field_base_document_layout____last_update +#: model:ir.model.fields,field_description:report_layout_config.field_res_company____last_update +msgid "Last Modified on" +msgstr "" + +#. module: report_layout_config +#: model_terms:ir.ui.view,arch_db:report_layout_config.external_clean_layout_images_template +#: model_terms:ir.ui.view,arch_db:report_layout_config.external_standard_layout_images_template msgid "Logo" msgstr "" #. module: report_layout_config -#: model:ir.model.fields,field_description:report_layout_config.field_base_document_layout__need_images_layout -msgid "Need Images Layout" -msgstr "" - -#. module: report_layout_config -#: model_terms:ir.ui.view,arch_db:report_layout_config.external_layout_images_template +#: model_terms:ir.ui.view,arch_db:report_layout_config.external_clean_layout_images_template +#: model_terms:ir.ui.view,arch_db:report_layout_config.external_standard_layout_images_template msgid "Page: / " msgstr "" #. module: report_layout_config #: model:ir.model.fields,help:report_layout_config.field_base_document_layout__full_footer_img +msgid "Replaces whole footer, disables footer logo" +msgstr "" + +#. module: report_layout_config +#: model:ir.model.fields,help:report_layout_config.field_base_document_layout__full_header_img +msgid "Replaces whole header with image" +msgstr "" + +#. module: report_layout_config #: model:ir.model.fields,help:report_layout_config.field_res_company__full_footer_img msgid "This image will replace all footer." msgstr "" #. module: report_layout_config -#: model:ir.model.fields,help:report_layout_config.field_base_document_layout__full_header_img #: model:ir.model.fields,help:report_layout_config.field_res_company__full_header_img msgid "This image will replace all header." msgstr "" diff --git a/report_layout_config/migrations/14.0.1.0.0/pre-migrate.py b/report_layout_config/migrations/14.0.1.0.0/pre-migrate.py new file mode 100644 index 000000000..fd4459fee --- /dev/null +++ b/report_layout_config/migrations/14.0.1.0.0/pre-migrate.py @@ -0,0 +1,18 @@ +# Copyright 2021 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + + +from openupgradelib.openupgrade import rename_xmlids + + +def migrate(cr, version): + + rename_xmlids( + cr, + [ + ( + "report_layout_config.external_layout_images", + "report_layout_config.external_standard_layout_images_template", + ) + ], + ) diff --git a/report_layout_config/models/base_document_layout.py b/report_layout_config/models/base_document_layout.py index 387ce0ba4..11a353d1f 100644 --- a/report_layout_config/models/base_document_layout.py +++ b/report_layout_config/models/base_document_layout.py @@ -8,22 +8,16 @@ class BaseDocumentLayout(models.TransientModel): _inherit = "base.document.layout" full_header_img = fields.Binary( - related="company_id.full_header_img", readonly=False + related="company_id.full_header_img", + readonly=False, + help="Replaces whole header with image", ) full_footer_img = fields.Binary( - related="company_id.full_footer_img", readonly=False + related="company_id.full_footer_img", + readonly=False, + help="Replaces whole footer, disables footer logo", ) - need_images_layout = fields.Boolean( - compute="_compute_need_images_layout", readonly=True - ) - - @api.depends("report_layout_id") - def _compute_need_images_layout(self): - self.ensure_one() - img_lay = self.env.ref("report_layout_config.external_layout_images").view_id - self.need_images_layout = self.external_report_layout_id == img_lay - @api.depends( "full_footer_img", "full_header_img", diff --git a/report_layout_config/readme/CONTRIBUTORS.rst b/report_layout_config/readme/CONTRIBUTORS.rst index 0a9139f76..429d07530 100644 --- a/report_layout_config/readme/CONTRIBUTORS.rst +++ b/report_layout_config/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Thomas Nowicki +* Iryna Vyshnevska diff --git a/report_layout_config/static/description/index.html b/report_layout_config/static/description/index.html index 7e457c7af..b94468150 100644 --- a/report_layout_config/static/description/index.html +++ b/report_layout_config/static/description/index.html @@ -1,20 +1,20 @@ - + - + Report layout configuration