From 564e4d91cba1fadd0784dcc6e46154ea5b9b7f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A0n=20Todorovich?= Date: Thu, 2 Jun 2022 08:46:19 -0300 Subject: [PATCH 1/6] [ADD] mail_layout_force --- mail_layout_force/__init__.py | 2 + mail_layout_force/__manifest__.py | 17 +++ mail_layout_force/data/mail_layout.xml | 13 ++ mail_layout_force/demo/mail_layout.xml | 115 ++++++++++++++++++ mail_layout_force/models/__init__.py | 2 + mail_layout_force/models/mail_template.py | 44 +++++++ mail_layout_force/models/mail_thread.py | 20 +++ mail_layout_force/readme/CONFIGURE.rst | 15 +++ mail_layout_force/readme/CONTRIBUTORS.rst | 3 + mail_layout_force/readme/DESCRIPTION.rst | 17 +++ mail_layout_force/tests/__init__.py | 1 + .../tests/test_mail_layout_force.py | 73 +++++++++++ mail_layout_force/views/mail_template.xml | 19 +++ mail_layout_force/wizards/__init__.py | 1 + .../wizards/mail_compose_message.py | 20 +++ 15 files changed, 362 insertions(+) create mode 100644 mail_layout_force/__init__.py create mode 100644 mail_layout_force/__manifest__.py create mode 100644 mail_layout_force/data/mail_layout.xml create mode 100644 mail_layout_force/demo/mail_layout.xml create mode 100644 mail_layout_force/models/__init__.py create mode 100644 mail_layout_force/models/mail_template.py create mode 100644 mail_layout_force/models/mail_thread.py create mode 100644 mail_layout_force/readme/CONFIGURE.rst create mode 100644 mail_layout_force/readme/CONTRIBUTORS.rst create mode 100644 mail_layout_force/readme/DESCRIPTION.rst create mode 100644 mail_layout_force/tests/__init__.py create mode 100644 mail_layout_force/tests/test_mail_layout_force.py create mode 100644 mail_layout_force/views/mail_template.xml create mode 100644 mail_layout_force/wizards/__init__.py create mode 100644 mail_layout_force/wizards/mail_compose_message.py diff --git a/mail_layout_force/__init__.py b/mail_layout_force/__init__.py new file mode 100644 index 000000000..aee8895e7 --- /dev/null +++ b/mail_layout_force/__init__.py @@ -0,0 +1,2 @@ +from . import models +from . import wizards diff --git a/mail_layout_force/__manifest__.py b/mail_layout_force/__manifest__.py new file mode 100644 index 000000000..384371d40 --- /dev/null +++ b/mail_layout_force/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2022 Camptocamp SA (https://www.camptocamp.com). +# @author Iván Todorovich +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Mail Layout Force", + "summary": "Force a mail layout on selected email templates", + "version": "14.0.1.0.0", + "author": "Camptocamp, Odoo Community Association (OCA)", + "maintainers": ["ivantodorovich"], + "website": "https://github.com/OCA/social", + "license": "AGPL-3", + "category": "Marketing", + "depends": ["mail"], + "demo": ["demo/mail_layout.xml"], + "data": ["data/mail_layout.xml", "views/mail_template.xml"], +} diff --git a/mail_layout_force/data/mail_layout.xml b/mail_layout_force/data/mail_layout.xml new file mode 100644 index 000000000..326b4448c --- /dev/null +++ b/mail_layout_force/data/mail_layout.xml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/mail_layout_force/demo/mail_layout.xml b/mail_layout_force/demo/mail_layout.xml new file mode 100644 index 000000000..4ea8cdedd --- /dev/null +++ b/mail_layout_force/demo/mail_layout.xml @@ -0,0 +1,115 @@ + + + + + + + diff --git a/mail_layout_force/models/__init__.py b/mail_layout_force/models/__init__.py new file mode 100644 index 000000000..89e090b24 --- /dev/null +++ b/mail_layout_force/models/__init__.py @@ -0,0 +1,2 @@ +from . import mail_template +from . import mail_thread diff --git a/mail_layout_force/models/mail_template.py b/mail_layout_force/models/mail_template.py new file mode 100644 index 000000000..31d12ec62 --- /dev/null +++ b/mail_layout_force/models/mail_template.py @@ -0,0 +1,44 @@ +# Copyright 2022 Camptocamp SA (https://www.camptocamp.com). +# @author Iván Todorovich +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class MailTemplate(models.Model): + _inherit = "mail.template" + + force_email_layout_id = fields.Many2one( + comodel_name="ir.ui.view", + string="Force Layout", + domain=[("type", "=", "qweb"), ("mode", "=", "primary")], + context={"default_type": "qweb"}, + help="Force a mail layout for this template.", + ) + + def _ensure_force_email_layout_xml_id(self): + missing = self.force_email_layout_id.filtered(lambda rec: not rec.xml_id) + if missing: + vals = [ + { + "module": "__export__", + "name": "force_email_layout_%s" % rec.id, + "model": rec._name, + "res_id": rec.id, + } + for rec in missing + ] + self.env["ir.model.data"].sudo().create(vals) + self.force_email_layout_id.invalidate_cache(["xml_id"]) + + @api.model_create_multi + def create(self, vals_list): + records = super().create(vals_list) + records._ensure_force_email_layout_xml_id() + return records + + def write(self, vals): + res = super().write(vals) + if "force_email_layout_id" in vals: + self._ensure_force_email_layout_xml_id() + return res diff --git a/mail_layout_force/models/mail_thread.py b/mail_layout_force/models/mail_thread.py new file mode 100644 index 000000000..25be8bdda --- /dev/null +++ b/mail_layout_force/models/mail_thread.py @@ -0,0 +1,20 @@ +# Copyright 2022 Camptocamp SA (https://www.camptocamp.com). +# @author Iván Todorovich +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class MailThread(models.AbstractModel): + _inherit = "mail.thread" + + def message_post_with_template( + self, template_id, email_layout_xmlid=None, **kwargs + ): + # OVERRIDE to force the email_layout_xmlid defined on the mail.template + template = self.env["mail.template"].sudo().browse(template_id) + if template.force_email_layout_id: + email_layout_xmlid = template.force_email_layout_id.xml_id + return super().message_post_with_template( + template_id, email_layout_xmlid=email_layout_xmlid, **kwargs + ) diff --git a/mail_layout_force/readme/CONFIGURE.rst b/mail_layout_force/readme/CONFIGURE.rst new file mode 100644 index 000000000..6e42c41e0 --- /dev/null +++ b/mail_layout_force/readme/CONFIGURE.rst @@ -0,0 +1,15 @@ +# Go to Configuration > Technical > Emails > Templates +# Open the desired ``email.template`` record. +# In Advanced Parameters tab, find the Force Layout field. + +You can leave it empty to use the default email layout (chosen by Odoo). +You can force a custom email layout of your own. +You can use the *Mail: No-Layout notification template* to prevent Odoo +from adding a layout. + +To configure a custom layout of your own, some technical knowledge is needed. +You can see how the existing layouts are defined for details or inspiration: + +* ``mail.mail_notification_light`` +* ``mail.mail_notification_paynow`` +* ``mail.mail_notification_borders`` diff --git a/mail_layout_force/readme/CONTRIBUTORS.rst b/mail_layout_force/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..59b447f28 --- /dev/null +++ b/mail_layout_force/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Camptocamp `_ + + * Iván Todorovich diff --git a/mail_layout_force/readme/DESCRIPTION.rst b/mail_layout_force/readme/DESCRIPTION.rst new file mode 100644 index 000000000..e00348fe7 --- /dev/null +++ b/mail_layout_force/readme/DESCRIPTION.rst @@ -0,0 +1,17 @@ +Odoo will add a default email layout on most commercial communications. + +The email layout is a ``QWeb`` view that ends up wrapping the message body +when sending an email. It usually displays the related document reference, +the company logo, and a small footer saying "Powered by Odoo". + +There are notably two main layouts used in Odoo, and the user can't control when +they're used, as it's hardcoded into the different applications. + +* ``mail.mail_notification_light`` +* ``mail.mail_notification_paynow`` + +This module allows to force a specific layout for a given ``email.template``, +effectively overwritting the one hardcoded by Odoo. + +This allows you to fully customize the way Odoo emails are rendered and sent +to your customers. diff --git a/mail_layout_force/tests/__init__.py b/mail_layout_force/tests/__init__.py new file mode 100644 index 000000000..9fd17597d --- /dev/null +++ b/mail_layout_force/tests/__init__.py @@ -0,0 +1 @@ +from . import test_mail_layout_force diff --git a/mail_layout_force/tests/test_mail_layout_force.py b/mail_layout_force/tests/test_mail_layout_force.py new file mode 100644 index 000000000..f143f601d --- /dev/null +++ b/mail_layout_force/tests/test_mail_layout_force.py @@ -0,0 +1,73 @@ +# Copyright 2022 Camptocamp SA (https://www.camptocamp.com). +# @author Iván Todorovich +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo.tests import SavepointCase + + +class TestMailLayoutForce(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.layout_noop = cls.env.ref("mail_layout_force.mail_layout_noop") + cls.layout_test = cls.env["ir.ui.view"].create( + { + "name": "Test Layout", + "type": "qweb", + "mode": "primary", + "arch": "

", + } + ) + cls.template = cls.env["mail.template"].create( + { + "name": "Test Template", + "body_html": "

Test

", + "subject": "Test", + "model_id": cls.env.ref("base.model_res_partner").id, + "auto_delete": False, + } + ) + cls.partner = cls.env.ref("base.res_partner_10") + cls.partner.message_ids.unlink() + cls.partner.message_subscribe([cls.partner.id]) + + def test_noop_layout(self): + self.template.force_email_layout_id = self.layout_noop + self.partner.message_post_with_template( + self.template.id, + # This is ignored because the template has a force_email_layout_id + email_layout_xmlid="mail.mail_notification_light", + ) + message = self.partner.message_ids[-1] + self.assertEqual(message.mail_ids.body_html.strip(), "

Test

") + + def test_custom_layout(self): + self.template.force_email_layout_id = self.layout_test + self.partner.message_post_with_template( + self.template.id, + # This is ignored because the template has a force_email_layout_id + email_layout_xmlid="mail.mail_notification_light", + ) + message = self.partner.message_ids[-1] + self.assertEqual(message.mail_ids.body_html.strip(), "

Test

") + + def test_custom_layout_composer(self): + self.template.force_email_layout_id = self.layout_test + composer = ( + self.env["mail.compose.message"] + .with_context( + # This is ignored because the template has a force_email_layout_id + custom_layout="mail.mail_notification_light" + ) + .create( + { + "res_id": self.partner.id, + "model": self.partner._name, + "template_id": self.template.id, + } + ) + ) + composer.onchange_template_id_wrapper() + composer.send_mail() + message = self.partner.message_ids[-1] + self.assertEqual(message.mail_ids.body_html.strip(), "

Test

") diff --git a/mail_layout_force/views/mail_template.xml b/mail_layout_force/views/mail_template.xml new file mode 100644 index 000000000..b0a80ffb1 --- /dev/null +++ b/mail_layout_force/views/mail_template.xml @@ -0,0 +1,19 @@ + + + + + + mail.template + + + + + + + + + diff --git a/mail_layout_force/wizards/__init__.py b/mail_layout_force/wizards/__init__.py new file mode 100644 index 000000000..b528d997d --- /dev/null +++ b/mail_layout_force/wizards/__init__.py @@ -0,0 +1 @@ +from . import mail_compose_message diff --git a/mail_layout_force/wizards/mail_compose_message.py b/mail_layout_force/wizards/mail_compose_message.py new file mode 100644 index 000000000..36c82950b --- /dev/null +++ b/mail_layout_force/wizards/mail_compose_message.py @@ -0,0 +1,20 @@ +# Copyright 2022 Camptocamp SA (https://www.camptocamp.com). +# @author Iván Todorovich +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class MailComposer(models.TransientModel): + _inherit = "mail.compose.message" + + def send_mail(self, auto_commit=False): + # OVERRIDE to force the email_layout_xmlid defined on the mail.template + res = [] + for rec in self: + if rec.template_id.force_email_layout_id: + rec = rec.with_context( + custom_layout=self.template_id.force_email_layout_id.xml_id + ) + res.append(super(MailComposer, rec).send_mail(auto_commit=auto_commit)) + return all(res) From f8de4b029651867b200a51f98742e0f8f7af83bc Mon Sep 17 00:00:00 2001 From: oca-travis Date: Wed, 13 Jul 2022 14:29:06 +0000 Subject: [PATCH 2/6] [UPD] Update mail_layout_force.pot --- mail_layout_force/i18n/mail_layout_force.pot | 60 ++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 mail_layout_force/i18n/mail_layout_force.pot diff --git a/mail_layout_force/i18n/mail_layout_force.pot b/mail_layout_force/i18n/mail_layout_force.pot new file mode 100644 index 000000000..0a32cd6c1 --- /dev/null +++ b/mail_layout_force/i18n/mail_layout_force.pot @@ -0,0 +1,60 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_layout_force +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.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: mail_layout_force +#: model:ir.model.fields,field_description:mail_layout_force.field_mail_compose_message__display_name +#: model:ir.model.fields,field_description:mail_layout_force.field_mail_template__display_name +#: model:ir.model.fields,field_description:mail_layout_force.field_mail_thread__display_name +msgid "Display Name" +msgstr "" + +#. module: mail_layout_force +#: model:ir.model,name:mail_layout_force.model_mail_template +msgid "Email Templates" +msgstr "" + +#. module: mail_layout_force +#: model:ir.model,name:mail_layout_force.model_mail_thread +msgid "Email Thread" +msgstr "" + +#. module: mail_layout_force +#: model:ir.model,name:mail_layout_force.model_mail_compose_message +msgid "Email composition wizard" +msgstr "" + +#. module: mail_layout_force +#: model:ir.model.fields,field_description:mail_layout_force.field_mail_template__force_email_layout_id +msgid "Force Layout" +msgstr "" + +#. module: mail_layout_force +#: model:ir.model.fields,help:mail_layout_force.field_mail_template__force_email_layout_id +msgid "Force a mail layout for this template." +msgstr "" + +#. module: mail_layout_force +#: model:ir.model.fields,field_description:mail_layout_force.field_mail_compose_message__id +#: model:ir.model.fields,field_description:mail_layout_force.field_mail_template__id +#: model:ir.model.fields,field_description:mail_layout_force.field_mail_thread__id +msgid "ID" +msgstr "" + +#. module: mail_layout_force +#: model:ir.model.fields,field_description:mail_layout_force.field_mail_compose_message____last_update +#: model:ir.model.fields,field_description:mail_layout_force.field_mail_template____last_update +#: model:ir.model.fields,field_description:mail_layout_force.field_mail_thread____last_update +msgid "Last Modified on" +msgstr "" From d3005d2153adfbd73063831e4dc843e58771916c Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 13 Jul 2022 14:40:28 +0000 Subject: [PATCH 3/6] [UPD] README.rst --- mail_layout_force/README.rst | 118 +++++ .../static/description/index.html | 458 ++++++++++++++++++ 2 files changed, 576 insertions(+) create mode 100644 mail_layout_force/README.rst create mode 100644 mail_layout_force/static/description/index.html diff --git a/mail_layout_force/README.rst b/mail_layout_force/README.rst new file mode 100644 index 000000000..d594dd719 --- /dev/null +++ b/mail_layout_force/README.rst @@ -0,0 +1,118 @@ +================= +Mail Layout Force +================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fsocial-lightgray.png?logo=github + :target: https://github.com/OCA/social/tree/14.0/mail_layout_force + :alt: OCA/social +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/social-14-0/social-14-0-mail_layout_force + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/205/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Odoo will add a default email layout on most commercial communications. + +The email layout is a ``QWeb`` view that ends up wrapping the message body +when sending an email. It usually displays the related document reference, +the company logo, and a small footer saying "Powered by Odoo". + +There are notably two main layouts used in Odoo, and the user can't control when +they're used, as it's hardcoded into the different applications. + +* ``mail.mail_notification_light`` +* ``mail.mail_notification_paynow`` + +This module allows to force a specific layout for a given ``email.template``, +effectively overwritting the one hardcoded by Odoo. + +This allows you to fully customize the way Odoo emails are rendered and sent +to your customers. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +# Go to Configuration > Technical > Emails > Templates +# Open the desired ``email.template`` record. +# In Advanced Parameters tab, find the Force Layout field. + +You can leave it empty to use the default email layout (chosen by Odoo). +You can force a custom email layout of your own. +You can use the *Mail: No-Layout notification template* to prevent Odoo +from adding a layout. + +To configure a custom layout of your own, some technical knowledge is needed. +You can see how the existing layouts are defined for details or inspiration: + +* ``mail.mail_notification_light`` +* ``mail.mail_notification_paynow`` +* ``mail.mail_notification_borders`` + +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 +~~~~~~~ + +* Camptocamp + +Contributors +~~~~~~~~~~~~ + +* `Camptocamp `_ + + * Iván Todorovich + +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. + +.. |maintainer-ivantodorovich| image:: https://github.com/ivantodorovich.png?size=40px + :target: https://github.com/ivantodorovich + :alt: ivantodorovich + +Current `maintainer `__: + +|maintainer-ivantodorovich| + +This module is part of the `OCA/social `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mail_layout_force/static/description/index.html b/mail_layout_force/static/description/index.html new file mode 100644 index 000000000..fabcd530d --- /dev/null +++ b/mail_layout_force/static/description/index.html @@ -0,0 +1,458 @@ + + + + + + +Mail Layout Force + + + +
+

Mail Layout Force

+ + +

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

+

Odoo will add a default email layout on most commercial communications.

+

The email layout is a QWeb view that ends up wrapping the message body +when sending an email. It usually displays the related document reference, +the company logo, and a small footer saying “Powered by Odoo”.

+

There are notably two main layouts used in Odoo, and the user can’t control when +they’re used, as it’s hardcoded into the different applications.

+
    +
  • mail.mail_notification_light
    • +
  • mail.mail_notification_paynow
    • +
+

This module allows to force a specific layout for a given email.template, +effectively overwritting the one hardcoded by Odoo.

+

This allows you to fully customize the way Odoo emails are rendered and sent +to your customers.

+

Table of contents

+ +
+

Configuration

+

# Go to Configuration > Technical > Emails > Templates +# Open the desired email.template record. +# In Advanced Parameters tab, find the Force Layout field.

+

You can leave it empty to use the default email layout (chosen by Odoo). +You can force a custom email layout of your own. +You can use the Mail: No-Layout notification template to prevent Odoo +from adding a layout.

+

To configure a custom layout of your own, some technical knowledge is needed. +You can see how the existing layouts are defined for details or inspiration:

+
    +
  • mail.mail_notification_light
    • +
  • mail.mail_notification_paynow
    • +
  • mail.mail_notification_borders
    • +
+
+
+

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

+
    +
  • Camptocamp
    • +
+
+
+

Contributors

+ +
+
+

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.

+

Current maintainer:

+

ivantodorovich

+

This module is part of the OCA/social project on GitHub.

+

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

+
+
+
+ + From 206676ed1293f1c8179d1130565ee8258ee9eb7f Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 13 Jul 2022 14:40:29 +0000 Subject: [PATCH 4/6] [ADD] icon.png --- mail_layout_force/static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 mail_layout_force/static/description/icon.png diff --git a/mail_layout_force/static/description/icon.png b/mail_layout_force/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From d8c53c357810e79d740d5a984f162957f55d9bbd Mon Sep 17 00:00:00 2001 From: Yoshi Tashiro Date: Sun, 2 Oct 2022 03:55:42 +0000 Subject: [PATCH 5/6] [IMP] mail_layout_force: black, isort, prettier --- setup/mail_layout_force/odoo/addons/mail_layout_force | 1 + setup/mail_layout_force/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/mail_layout_force/odoo/addons/mail_layout_force create mode 100644 setup/mail_layout_force/setup.py diff --git a/setup/mail_layout_force/odoo/addons/mail_layout_force b/setup/mail_layout_force/odoo/addons/mail_layout_force new file mode 120000 index 000000000..17c5a9220 --- /dev/null +++ b/setup/mail_layout_force/odoo/addons/mail_layout_force @@ -0,0 +1 @@ +../../../../mail_layout_force \ No newline at end of file diff --git a/setup/mail_layout_force/setup.py b/setup/mail_layout_force/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/mail_layout_force/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 64d90d889cbd5f6ef4b7afb25c5c241bf194d748 Mon Sep 17 00:00:00 2001 From: Yoshi Tashiro Date: Sun, 2 Oct 2022 04:10:20 +0000 Subject: [PATCH 6/6] [MIG] mail_layout_force: Migration to 15.0 --- mail_layout_force/README.rst | 10 +++++----- mail_layout_force/__manifest__.py | 2 +- mail_layout_force/data/mail_layout.xml | 2 +- mail_layout_force/demo/mail_layout.xml | 2 +- mail_layout_force/static/description/index.html | 8 ++++---- mail_layout_force/tests/test_mail_layout_force.py | 10 +++++----- mail_layout_force/wizards/mail_compose_message.py | 6 ++++-- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/mail_layout_force/README.rst b/mail_layout_force/README.rst index d594dd719..63036992d 100644 --- a/mail_layout_force/README.rst +++ b/mail_layout_force/README.rst @@ -14,13 +14,13 @@ Mail Layout Force :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github - :target: https://github.com/OCA/social/tree/14.0/mail_layout_force + :target: https://github.com/OCA/social/tree/15.0/mail_layout_force :alt: OCA/social .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/social-14-0/social-14-0-mail_layout_force + :target: https://translation.odoo-community.org/projects/social-15-0/social-15-0-mail_layout_force :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/205/14.0 + :target: https://runbot.odoo-community.org/runbot/205/15.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -73,7 +73,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -113,6 +113,6 @@ Current `maintainer `__: |maintainer-ivantodorovich| -This module is part of the `OCA/social `_ project on GitHub. +This module is part of the `OCA/social `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mail_layout_force/__manifest__.py b/mail_layout_force/__manifest__.py index 384371d40..8d2466409 100644 --- a/mail_layout_force/__manifest__.py +++ b/mail_layout_force/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Mail Layout Force", "summary": "Force a mail layout on selected email templates", - "version": "14.0.1.0.0", + "version": "15.0.1.0.0", "author": "Camptocamp, Odoo Community Association (OCA)", "maintainers": ["ivantodorovich"], "website": "https://github.com/OCA/social", diff --git a/mail_layout_force/data/mail_layout.xml b/mail_layout_force/data/mail_layout.xml index 326b4448c..7575cbd5d 100644 --- a/mail_layout_force/data/mail_layout.xml +++ b/mail_layout_force/data/mail_layout.xml @@ -7,7 +7,7 @@ diff --git a/mail_layout_force/demo/mail_layout.xml b/mail_layout_force/demo/mail_layout.xml index 4ea8cdedd..b218fda2e 100644 --- a/mail_layout_force/demo/mail_layout.xml +++ b/mail_layout_force/demo/mail_layout.xml @@ -64,7 +64,7 @@ - + diff --git a/mail_layout_force/static/description/index.html b/mail_layout_force/static/description/index.html index fabcd530d..f5b962643 100644 --- a/mail_layout_force/static/description/index.html +++ b/mail_layout_force/static/description/index.html @@ -3,7 +3,7 @@ - + Mail Layout Force