From 30e0a295e4a3ed33eecdc09be30934c341e667c3 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Fri, 15 Nov 2019 13:08:54 +0100 Subject: [PATCH 01/43] [12.0][IMP] - manage different report layouts by brand --- brand_external_report_layout/README.rst | 89 ++++ brand_external_report_layout/__init__.py | 1 + brand_external_report_layout/__manifest__.py | 16 + .../models/__init__.py | 1 + .../models/res_brand.py | 64 +++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/CREDITS.rst | 1 + .../readme/DESCRIPTION.rst | 2 + brand_external_report_layout/readme/USAGE.rst | 6 + .../static/description/index.html | 438 ++++++++++++++++++ .../static/img/res_brand_logo.png | Bin 0 -> 15310 bytes .../views/report_template.xml | 24 + .../views/res_brand.xml | 54 +++ 13 files changed, 697 insertions(+) create mode 100644 brand_external_report_layout/README.rst create mode 100644 brand_external_report_layout/__init__.py create mode 100644 brand_external_report_layout/__manifest__.py create mode 100644 brand_external_report_layout/models/__init__.py create mode 100644 brand_external_report_layout/models/res_brand.py create mode 100644 brand_external_report_layout/readme/CONTRIBUTORS.rst create mode 100644 brand_external_report_layout/readme/CREDITS.rst create mode 100644 brand_external_report_layout/readme/DESCRIPTION.rst create mode 100644 brand_external_report_layout/readme/USAGE.rst create mode 100644 brand_external_report_layout/static/description/index.html create mode 100644 brand_external_report_layout/static/img/res_brand_logo.png create mode 100644 brand_external_report_layout/views/report_template.xml create mode 100644 brand_external_report_layout/views/res_brand.xml diff --git a/brand_external_report_layout/README.rst b/brand_external_report_layout/README.rst new file mode 100644 index 000000000..2910abe69 --- /dev/null +++ b/brand_external_report_layout/README.rst @@ -0,0 +1,89 @@ +============================ +Brand External Report Layout +============================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbrand-lightgray.png?logo=github + :target: https://github.com/OCA/brand/tree/12.0/brand_external_report_layout + :alt: OCA/brand +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/brand-12-0/brand-12-0-brand_external_report_layout + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/284/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows you to have a different layout by brand for your external +reports. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To use this module, you need to: + +#. Go to Settings > Users & Companies > Brands +#. Add a new brand or select an existing one +#. Enter brand information and select the a layout +#. Go to any branded object abd print the PDF report. It includes the information of the brand. + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* CSONE SA/NV + +Contributors +~~~~~~~~~~~~ + +* Souheil Bejaoui + +Other credits +~~~~~~~~~~~~~ + +* ACSONE SA/NV + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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/brand `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/brand_external_report_layout/__init__.py b/brand_external_report_layout/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/brand_external_report_layout/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/brand_external_report_layout/__manifest__.py b/brand_external_report_layout/__manifest__.py new file mode 100644 index 000000000..dd2521b02 --- /dev/null +++ b/brand_external_report_layout/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2019 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Brand External Report Layout', + 'summary': """ + This module allows you to have a different layout by brand for your + external reports.""", + 'version': '12.0.1.0.0', + 'license': 'AGPL-3', + 'author': 'ACSONE SA/NV,' + 'Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/brand', + 'depends': ['base', 'brand', 'web'], + 'data': ['views/res_brand.xml', 'views/report_template.xml'], +} diff --git a/brand_external_report_layout/models/__init__.py b/brand_external_report_layout/models/__init__.py new file mode 100644 index 000000000..3dc20cced --- /dev/null +++ b/brand_external_report_layout/models/__init__.py @@ -0,0 +1 @@ +from . import res_brand diff --git a/brand_external_report_layout/models/res_brand.py b/brand_external_report_layout/models/res_brand.py new file mode 100644 index 000000000..4ecde643f --- /dev/null +++ b/brand_external_report_layout/models/res_brand.py @@ -0,0 +1,64 @@ +# Copyright 2019 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +import base64 +import os +from odoo import api, fields, models, tools, _ + + +class ResBrand(models.Model): + + _inherit = 'res.brand' + + def _get_logo(self): + return base64.b64encode( + open( + os.path.join( + tools.config['root_path'], + 'addons', + 'brand_external_report_layout', + 'static', + 'img', + 'res_brand_logo.png', + ), + 'rb', + ).read() + ) + + logo = fields.Binary( + related='partner_id.image', + default=_get_logo, + string="Brand Logo", + readonly=False, + ) + external_report_layout_id = fields.Many2one( + comodel_name='ir.ui.view', string='Document Template' + ) + report_header = fields.Text( + string='Brand Tagline', + help='Appears by default on the top right corner of your printed ' + 'documents (report header).', + ) + report_footer = fields.Text( + string='Report Footer', + translate=True, + help='Footer text displayed at the bottom of all reports.', + ) + + @api.multi + def change_report_template(self): + self.ensure_one() + form_view = self.env.ref( + 'brand_external_report_layout.res_brand_document_template_form' + ) + return { + 'name': _('Choose Your Document Layout'), + 'type': 'ir.actions.act_window', + 'view_type': 'form', + 'view_mode': 'form', + 'res_id': self.id, + 'res_model': 'res.brand', + 'views': [(form_view.id, 'form')], + 'view_id': form_view.id, + 'target': 'new', + } diff --git a/brand_external_report_layout/readme/CONTRIBUTORS.rst b/brand_external_report_layout/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..50e6298db --- /dev/null +++ b/brand_external_report_layout/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Souheil Bejaoui diff --git a/brand_external_report_layout/readme/CREDITS.rst b/brand_external_report_layout/readme/CREDITS.rst new file mode 100644 index 000000000..ae7e5fb13 --- /dev/null +++ b/brand_external_report_layout/readme/CREDITS.rst @@ -0,0 +1 @@ +* ACSONE SA/NV diff --git a/brand_external_report_layout/readme/DESCRIPTION.rst b/brand_external_report_layout/readme/DESCRIPTION.rst new file mode 100644 index 000000000..4b2e05d7b --- /dev/null +++ b/brand_external_report_layout/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module allows you to have a different layout by brand for your external +reports. diff --git a/brand_external_report_layout/readme/USAGE.rst b/brand_external_report_layout/readme/USAGE.rst new file mode 100644 index 000000000..2f55c0ec8 --- /dev/null +++ b/brand_external_report_layout/readme/USAGE.rst @@ -0,0 +1,6 @@ +To use this module, you need to: + +#. Go to Settings > Users & Companies > Brands +#. Add a new brand or select an existing one +#. Enter brand information and select the a layout +#. Go to any branded object abd print the PDF report. It includes the information of the brand. diff --git a/brand_external_report_layout/static/description/index.html b/brand_external_report_layout/static/description/index.html new file mode 100644 index 000000000..25044158b --- /dev/null +++ b/brand_external_report_layout/static/description/index.html @@ -0,0 +1,438 @@ + + + + + + +Brand External Report Layout + + + +
+

Brand External Report Layout

+ + +

Beta License: AGPL-3 OCA/brand Translate me on Weblate Try me on Runbot

+

This module allows you to have a different layout by brand for your external +reports.

+

Table of contents

+ +
+

Usage

+

To use this module, you need to:

+
    +
  1. Go to Settings > Users & Companies > Brands
    2. +
  2. Add a new brand or select an existing one
    3. +
  3. Enter brand information and select the a layout
    4. +
  4. Go to any branded object abd print the PDF report. It includes the information of the brand.
    5. +
+
+
+

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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • CSONE SA/NV
    • +
+
+
+

Contributors

+ +
+
+

Other credits

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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/brand project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/brand_external_report_layout/static/img/res_brand_logo.png b/brand_external_report_layout/static/img/res_brand_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..99a0afa06fb33cf8b19ba94d8a4043f4307ccf6a GIT binary patch literal 15310 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 literal 0 HcmV?d00001 diff --git a/brand_external_report_layout/views/report_template.xml b/brand_external_report_layout/views/report_template.xml new file mode 100644 index 000000000..2e160dc57 --- /dev/null +++ b/brand_external_report_layout/views/report_template.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/brand_external_report_layout/views/res_brand.xml b/brand_external_report_layout/views/res_brand.xml new file mode 100644 index 000000000..d64c30dae --- /dev/null +++ b/brand_external_report_layout/views/res_brand.xml @@ -0,0 +1,54 @@ + + + + + + + res.brand.document.template.form + res.brand + 9999 + +
+ + + + + + + +
+
+
+ + + + + res.brand + + + +
+
+ + + + + + + From 18a990a7a5cfc2833fd6d7d29f3727dd76131e4c Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Fri, 15 Nov 2019 14:51:44 +0100 Subject: [PATCH 02/43] [12.0][IMP] - Add unit tests --- brand_external_report_layout/__init__.py | 1 + .../models/res_brand.py | 4 ++-- .../static/img/res_brand_logo.png | Bin 15310 -> 0 bytes .../tests/__init__.py | 1 + .../test_brand_external_report_layout.py | 22 ++++++++++++++++++ 5 files changed, 26 insertions(+), 2 deletions(-) delete mode 100644 brand_external_report_layout/static/img/res_brand_logo.png create mode 100644 brand_external_report_layout/tests/__init__.py create mode 100644 brand_external_report_layout/tests/test_brand_external_report_layout.py diff --git a/brand_external_report_layout/__init__.py b/brand_external_report_layout/__init__.py index 0650744f6..0ee8b5073 100644 --- a/brand_external_report_layout/__init__.py +++ b/brand_external_report_layout/__init__.py @@ -1 +1,2 @@ from . import models +from . import tests diff --git a/brand_external_report_layout/models/res_brand.py b/brand_external_report_layout/models/res_brand.py index 4ecde643f..35469c944 100644 --- a/brand_external_report_layout/models/res_brand.py +++ b/brand_external_report_layout/models/res_brand.py @@ -16,10 +16,10 @@ def _get_logo(self): os.path.join( tools.config['root_path'], 'addons', - 'brand_external_report_layout', + 'base', 'static', 'img', - 'res_brand_logo.png', + 'res_company_logo.png', ), 'rb', ).read() diff --git a/brand_external_report_layout/static/img/res_brand_logo.png b/brand_external_report_layout/static/img/res_brand_logo.png deleted file mode 100644 index 99a0afa06fb33cf8b19ba94d8a4043f4307ccf6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15310 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 diff --git a/brand_external_report_layout/tests/__init__.py b/brand_external_report_layout/tests/__init__.py new file mode 100644 index 000000000..d2250bfcf --- /dev/null +++ b/brand_external_report_layout/tests/__init__.py @@ -0,0 +1 @@ +from . import test_brand_external_report_layout diff --git a/brand_external_report_layout/tests/test_brand_external_report_layout.py b/brand_external_report_layout/tests/test_brand_external_report_layout.py new file mode 100644 index 000000000..dc3f23d79 --- /dev/null +++ b/brand_external_report_layout/tests/test_brand_external_report_layout.py @@ -0,0 +1,22 @@ +# Copyright 2019 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests.common import TransactionCase + + +class TestBrandExternalReportLayout(TransactionCase): + def setUp(self): + super(TestBrandExternalReportLayout, self).setUp() + self.brand = self.env['res.brand'].create({'name': 'brand'}) + + def test_change_report_template(self): + self.brand.change_report_template() + self.assertEqual( + self.env.ref( + 'brand_external_report_layout.res_brand_document_template_form' + ).id, + self.brand.change_report_template()['view_id'], + ) + + def test_get_logo(self): + self.assertEqual(self.brand.logo, self.brand._get_logo()) From 0561d0a3cd31f92732dc2ae0687c8eef06ef1f2d Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Fri, 15 Nov 2019 15:32:04 +0100 Subject: [PATCH 03/43] [12.0][IMP] - Add ROADMAP file to readme --- brand_external_report_layout/README.rst | 21 +++++++++- .../readme/ROADMAP.rst | 15 +++++++ .../static/description/index.html | 41 +++++++++++++------ 3 files changed, 63 insertions(+), 14 deletions(-) create mode 100644 brand_external_report_layout/readme/ROADMAP.rst diff --git a/brand_external_report_layout/README.rst b/brand_external_report_layout/README.rst index 2910abe69..ce9486fc5 100644 --- a/brand_external_report_layout/README.rst +++ b/brand_external_report_layout/README.rst @@ -43,6 +43,25 @@ To use this module, you need to: #. Enter brand information and select the a layout #. Go to any branded object abd print the PDF report. It includes the information of the brand. +Known issues / Roadmap +====================== + +To simplify the customization of the external layout we replaced the variable +company that odoo compute in the external_layout view by the object brand. + +With this module, all custom layouts will display brand information out of the box. + +This was possible and easy to implement as the company and the brand models +inherit from partner model and share the same informational fields. + +The computed variable company is used to set report header and footer. It's not +meant to be used in the report business logic itself. But in that case +(if a custom layout use the variable company for some-reason other then header +and footer) this module can cause an issue because the used field can be +missing in the brand model or not correctly set. + +In this case, we recommend to always use document field company for this use-end. + Bug Tracker =========== @@ -59,7 +78,7 @@ Credits Authors ~~~~~~~ -* CSONE SA/NV +* ACSONE SA/NV Contributors ~~~~~~~~~~~~ diff --git a/brand_external_report_layout/readme/ROADMAP.rst b/brand_external_report_layout/readme/ROADMAP.rst new file mode 100644 index 000000000..479e35039 --- /dev/null +++ b/brand_external_report_layout/readme/ROADMAP.rst @@ -0,0 +1,15 @@ +To simplify the customization of the external layout we replaced the variable +company that odoo compute in the external_layout view by the object brand. + +With this module, all custom layouts will display brand information out of the box. + +This was possible and easy to implement as the company and the brand models +inherit from partner model and share the same informational fields. + +The computed variable company is used to set report header and footer. It's not +meant to be used in the report business logic itself. But in that case +(if a custom layout use the variable company for some-reason other then header +and footer) this module can cause an issue because the used field can be +missing in the brand model or not correctly set. + +In this case, we recommend to always use document field company for this use-end. \ No newline at end of file diff --git a/brand_external_report_layout/static/description/index.html b/brand_external_report_layout/static/description/index.html index 25044158b..0d28eacc6 100644 --- a/brand_external_report_layout/static/description/index.html +++ b/brand_external_report_layout/static/description/index.html @@ -374,12 +374,13 @@

Brand External Report Layout

+
+

Known issues / Roadmap

+

To simplify the customization of the external layout we replaced the variable +company that odoo compute in the external_layout view by the object brand.

+

With this module, all custom layouts will display brand information out of the box.

+

This was possible and easy to implement as the company and the brand models +inherit from partner model and share the same informational fields.

+

The computed variable company is used to set report header and footer. It’s not +meant to be used in the report business logic itself. But in that case +(if a custom layout use the variable company for some-reason other then header +and footer) this module can cause an issue because the used field can be +missing in the brand model or not correctly set.

+

In this case, we recommend to always use document field company for this use-end.

+
-

Bug Tracker

+

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 @@ -403,27 +418,27 @@

Bug Tracker

Do not contact contributors directly about support or help with technical issues.

-

Credits

+

Credits

-

Authors

+

Authors

    -
  • CSONE SA/NV
    • +
  • ACSONE SA/NV
-

Maintainers

+

Maintainers

This module is maintained by the OCA.

Odoo Community Association

OCA, or the Odoo Community Association, is a nonprofit organization whose From d84492f40d7b49c8831724d268baa7cbe3b3434f Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Sat, 16 Nov 2019 09:57:27 +0100 Subject: [PATCH 04/43] [12.0][RMV] - Remove useless section in readme --- brand_external_report_layout/README.rst | 5 ----- brand_external_report_layout/models/res_brand.py | 4 ++-- brand_external_report_layout/readme/CREDITS.rst | 1 - .../static/description/index.html | 11 ++--------- .../tests/test_brand_external_report_layout.py | 4 ++-- 5 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 brand_external_report_layout/readme/CREDITS.rst diff --git a/brand_external_report_layout/README.rst b/brand_external_report_layout/README.rst index ce9486fc5..a6524a121 100644 --- a/brand_external_report_layout/README.rst +++ b/brand_external_report_layout/README.rst @@ -85,11 +85,6 @@ Contributors * Souheil Bejaoui -Other credits -~~~~~~~~~~~~~ - -* ACSONE SA/NV - Maintainers ~~~~~~~~~~~ diff --git a/brand_external_report_layout/models/res_brand.py b/brand_external_report_layout/models/res_brand.py index 35469c944..6dcb4cc16 100644 --- a/brand_external_report_layout/models/res_brand.py +++ b/brand_external_report_layout/models/res_brand.py @@ -10,7 +10,7 @@ class ResBrand(models.Model): _inherit = 'res.brand' - def _get_logo(self): + def _get_default_brand_logo(self): return base64.b64encode( open( os.path.join( @@ -27,7 +27,7 @@ def _get_logo(self): logo = fields.Binary( related='partner_id.image', - default=_get_logo, + default=_get_default_brand_logo, string="Brand Logo", readonly=False, ) diff --git a/brand_external_report_layout/readme/CREDITS.rst b/brand_external_report_layout/readme/CREDITS.rst deleted file mode 100644 index ae7e5fb13..000000000 --- a/brand_external_report_layout/readme/CREDITS.rst +++ /dev/null @@ -1 +0,0 @@ -* ACSONE SA/NV diff --git a/brand_external_report_layout/static/description/index.html b/brand_external_report_layout/static/description/index.html index 0d28eacc6..3797b63c2 100644 --- a/brand_external_report_layout/static/description/index.html +++ b/brand_external_report_layout/static/description/index.html @@ -379,8 +379,7 @@

Brand External Report Layout

  • Credits
    • @@ -431,14 +430,8 @@

    Contributors

  • Souheil Bejaoui <souheil.bejaoui@acsone.eu>
    • -
    -

    Other credits

    - -
    -

    Maintainers

    +

    Maintainers

    This module is maintained by the OCA.

    Odoo Community Association

    OCA, or the Odoo Community Association, is a nonprofit organization whose diff --git a/brand_external_report_layout/tests/test_brand_external_report_layout.py b/brand_external_report_layout/tests/test_brand_external_report_layout.py index dc3f23d79..547b44061 100644 --- a/brand_external_report_layout/tests/test_brand_external_report_layout.py +++ b/brand_external_report_layout/tests/test_brand_external_report_layout.py @@ -18,5 +18,5 @@ def test_change_report_template(self): self.brand.change_report_template()['view_id'], ) - def test_get_logo(self): - self.assertEqual(self.brand.logo, self.brand._get_logo()) + def test_get_default_brand_logo(self): + self.assertEqual(self.brand.logo, self.brand._get_default_brand_logo()) From 550397139e6463229f1d9c52ccfffbd2ddca92ea Mon Sep 17 00:00:00 2001 From: Bejaoui Souheil Date: Sat, 16 Nov 2019 09:58:43 +0100 Subject: [PATCH 05/43] [12.0][IMP] - Change field label MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Stéphane Bidoul (ACSONE) --- .../i18n/brand_external_report_layout.pot | 96 +++++++++++++++++++ .../models/res_brand.py | 2 +- .../static/description/index.html | 2 +- 3 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 brand_external_report_layout/i18n/brand_external_report_layout.pot diff --git a/brand_external_report_layout/i18n/brand_external_report_layout.pot b/brand_external_report_layout/i18n/brand_external_report_layout.pot new file mode 100644 index 000000000..c134ca1bb --- /dev/null +++ b/brand_external_report_layout/i18n/brand_external_report_layout.pot @@ -0,0 +1,96 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * brand_external_report_layout +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: brand_external_report_layout +#: model:ir.model.fields,help:brand_external_report_layout.field_res_brand__report_header +msgid "Appears by default on the top right corner of your printed documents (report header)." +msgstr "" + +#. module: brand_external_report_layout +#: model:ir.model,name:brand_external_report_layout.model_res_brand +msgid "Brand" +msgstr "" + +#. module: brand_external_report_layout +#: model:ir.model.fields,field_description:brand_external_report_layout.field_res_brand__logo +msgid "Brand Logo" +msgstr "" + +#. module: brand_external_report_layout +#: model_terms:ir.ui.view,arch_db:brand_external_report_layout.res_brand_document_template_form +msgid "Cancel" +msgstr "" + +#. module: brand_external_report_layout +#: model_terms:ir.ui.view,arch_db:brand_external_report_layout.res_brand_form_view +msgid "Change Document Template" +msgstr "" + +#. module: brand_external_report_layout +#: code:addons/brand_external_report_layout/models/res_brand.py:55 +#, python-format +msgid "Choose Your Document Layout" +msgstr "" + +#. module: brand_external_report_layout +#: model:ir.model.fields,field_description:brand_external_report_layout.field_res_brand__external_report_layout_id +msgid "Document Template" +msgstr "" + +#. module: brand_external_report_layout +#: model_terms:ir.ui.view,arch_db:brand_external_report_layout.res_brand_document_template_form +msgid "Footer" +msgstr "" + +#. module: brand_external_report_layout +#: model:ir.model.fields,help:brand_external_report_layout.field_res_brand__report_footer +msgid "Footer text displayed at the bottom of all reports." +msgstr "" + +#. module: brand_external_report_layout +#: model:ir.model.fields,field_description:brand_external_report_layout.field_res_brand__report_footer +msgid "Report Footer" +msgstr "" + +#. module: brand_external_report_layout +#: model:ir.model.fields,field_description:brand_external_report_layout.field_res_brand__report_header +msgid "Report Header" +msgstr "" + +#. module: brand_external_report_layout +#: model_terms:ir.ui.view,arch_db:brand_external_report_layout.res_brand_document_template_form +msgid "Save" +msgstr "" + +#. module: brand_external_report_layout +#: model_terms:ir.ui.view,arch_db:brand_external_report_layout.res_brand_document_template_form +msgid "Template" +msgstr "" + +#. module: brand_external_report_layout +#: model:ir.model.fields,help:brand_external_report_layout.field_res_brand__logo +msgid "This field holds the image used as avatar for this contact, limited to 1024x1024px" +msgstr "" + +#. module: brand_external_report_layout +#: model_terms:ir.ui.view,arch_db:brand_external_report_layout.res_brand_document_template_form +msgid "e.g. Global Business Solutions" +msgstr "" + +#. module: brand_external_report_layout +#: model_terms:ir.ui.view,arch_db:brand_external_report_layout.res_brand_document_template_form +msgid "e.g. Opening hours, bank accounts (one per line)" +msgstr "" + diff --git a/brand_external_report_layout/models/res_brand.py b/brand_external_report_layout/models/res_brand.py index 6dcb4cc16..24ad48655 100644 --- a/brand_external_report_layout/models/res_brand.py +++ b/brand_external_report_layout/models/res_brand.py @@ -35,7 +35,7 @@ def _get_default_brand_logo(self): comodel_name='ir.ui.view', string='Document Template' ) report_header = fields.Text( - string='Brand Tagline', + string='Report Header', help='Appears by default on the top right corner of your printed ' 'documents (report header).', ) diff --git a/brand_external_report_layout/static/description/index.html b/brand_external_report_layout/static/description/index.html index 3797b63c2..2eeb7498d 100644 --- a/brand_external_report_layout/static/description/index.html +++ b/brand_external_report_layout/static/description/index.html @@ -3,7 +3,7 @@ - + Brand External Report Layout