[4979][IMP] mail_layout_force: reflect oca changes (#14)

* [4979][IMP] mail_layout_force: reflect oca changes

Author: AungKoKoLin1997

mail_layout_force/README.rst

@@ -7,7 +7,7 @@ Mail Layout Force
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:c0697d9e6eb2247affb97748c2d6c1c811c3749953856ceda5393a0b406e1f6e
+   !! source digest: sha256:bd6e51284d03e0193675b8c1b52c89371a10d014b6f9ea57a29bfd661ac9be33
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -16,11 +16,17 @@ Mail Layout Force
 .. |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-qrtl%2Fstx--oca-lightgray.png?logo=github
-    :target: https://github.com/qrtl/stx-oca/tree/15.0/mail_layout_force
-    :alt: qrtl/stx-oca
-
-|badge1| |badge2| |badge3|
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github
+    :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-15-0/social-15-0-mail_layout_force
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/social&target_branch=15.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 Odoo will add a default email layout on most commercial communications.
 
@@ -31,11 +37,14 @@ 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.message_notification_email``
 * ``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.
+effectively overwritting the one hardcoded by Odoo. Additionally, it enables
+forcing a custom layout for emails that do not use an existing ``email.template``
+record (e.g., when sending an email from the chatter).
 
 This allows you to fully customize the way Odoo emails are rendered and sent
 to your customers.
@@ -48,9 +57,9 @@ to your customers.
 Configuration
 =============
 
-# Go to Configuration > Technical > Emails > Templates
-# Open the desired ``email.template`` record.
-# In Advanced Parameters tab, find the Force Layout field.
+#. Go to Settings > 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.
@@ -64,13 +73,23 @@ You can see how the existing layouts are defined for details or inspiration:
 * ``mail.mail_notification_paynow``
 * ``mail.mail_notification_borders``
 
+To force a new custom layout for emails that do not use an existing ``email.template``
+record (e.g., emails sent from the chatter):
+
+#. Go to Settings > Technical > User Interface > Views.
+#. Copy the current layout (e.g., mail.message_notification_email) to create a new one, and remove any parts you don’t need.
+#. Open the layout that you want to swap with a substitute. Then, under the Layout Mapping tab:
+    * Set ``Substitute Layout`` to the new custom layout you created.
+    * Set ``Models`` if you want to apply the replacement only to specific models. If left empty,
+      the email layout will be replaced for all models.
+
 Bug Tracker
 ===========
 
-Bugs are tracked on `GitHub Issues <https://github.com/qrtl/stx-oca/issues>`_.
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/social/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/qrtl/stx-oca/issues/new?body=module:%20mail_layout_force%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/social/issues/new?body=module:%20mail_layout_force%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -88,18 +107,32 @@ Contributors
 * `Camptocamp <https://www.camptocamp.com>`_
 
     * Iván Todorovich <[email protected]>
+* `Quartile <https://www.quartile.co>`_
+
+  * Aung Ko Ko Lin
+  * Yoshi Tashiro
 
 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:
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-ivantodorovich| 
 
-This module is part of the `qrtl/stx-oca <https://github.com/qrtl/stx-oca/tree/15.0/mail_layout_force>`_ project on GitHub.
+This module is part of the `OCA/social <https://github.com/OCA/social/tree/15.0/mail_layout_force>`_ project on GitHub.
 
-You are welcome to contribute.
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

mail_layout_force/__manifest__.py

@@ -5,13 +5,18 @@
 {
     "name": "Mail Layout Force",
     "summary": "Force a mail layout on selected email templates",
-    "version": "15.0.1.0.0",
+    "version": "15.0.1.0.1",
     "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"],
+    "data": [
+        "security/ir.model.access.csv",
+        "data/mail_layout.xml",
+        "views/ir_ui_views.xml",
+        "views/mail_template.xml",
+    ],
 }

mail_layout_force/i18n/mail_layout_force.pot

@@ -0,0 +1,39 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* mail_layout_force
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 15.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,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 ""

mail_layout_force/models/__init__.py

@@ -1,2 +1,4 @@
+from . import email_layout_mapping
+from . import ir_ui_view
 from . import mail_template
 from . import mail_thread

mail_layout_force/models/email_layout_mapping.py

@@ -0,0 +1,20 @@
+# Copyright 2025 Quartile (https://www.quartile.co)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class EmailLayoutMapping(models.Model):
+    _name = "email.layout.mapping"
+    _description = "Email Layout Mapping"
+
+    layout_id = fields.Many2one("ir.ui.view", ondelete="cascade")
+    substitute_layout_id = fields.Many2one(
+        "ir.ui.view",
+        domain=[("type", "=", "qweb")],
+        required=True,
+        help="Select a target layout.",
+    )
+    model_ids = fields.Many2many(
+        "ir.model", string="Models", help="Select models that the swapping applies to."
+    )

mail_layout_force/models/ir_ui_view.py

@@ -0,0 +1,10 @@
+# Copyright 2025 Quartile (https://www.quartile.co)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class IrUiView(models.Model):
+    _inherit = "ir.ui.view"
+
+    layout_mapping_line_ids = fields.One2many("email.layout.mapping", "layout_id")

mail_layout_force/models/mail_thread.py

@@ -18,3 +18,50 @@ def message_post_with_template(
         return super().message_post_with_template(
             template_id, email_layout_xmlid=email_layout_xmlid, **kwargs
         )
+
+    def _notify_record_by_email(
+        self,
+        message,
+        recipients_data,
+        msg_vals=False,
+        model_description=False,
+        mail_auto_delete=True,
+        check_existing=False,
+        force_send=True,
+        send_after_commit=True,
+        **kwargs
+    ):
+        msg_vals = msg_vals or {}
+        layout_xmlid = (
+            msg_vals.get("email_layout_xmlid")
+            or message.email_layout_xmlid
+            or "mail.message_notification_email"
+        )
+        layout = self.env.ref(layout_xmlid, raise_if_not_found=True)
+        res_model = (
+            self.env["ir.model"].sudo().search([("model", "=", self._name)], limit=1)
+        )
+        mapping = self.env["email.layout.mapping"].search(
+            [("layout_id", "=", layout.id), ("model_ids", "in", res_model.ids)],
+            limit=1,
+        )
+        if not mapping:
+            mapping = self.env["email.layout.mapping"].search(
+                [("layout_id", "=", layout.id), ("model_ids", "=", False)], limit=1
+            )
+        if mapping:
+            substitute_layout = mapping.substitute_layout_id
+            if not substitute_layout.xml_id:
+                substitute_layout._export_rows([["id"]])
+            msg_vals["email_layout_xmlid"] = mapping.substitute_layout_id.xml_id
+        return super()._notify_record_by_email(
+            message,
+            recipients_data,
+            msg_vals=msg_vals,
+            model_description=model_description,
+            mail_auto_delete=mail_auto_delete,
+            check_existing=check_existing,
+            force_send=force_send,
+            send_after_commit=send_after_commit,
+            **kwargs
+        )

mail_layout_force/readme/CONFIGURE.rst

@@ -1,6 +1,6 @@
-# Go to Configuration > Technical > Emails > Templates
-# Open the desired ``email.template`` record.
-# In Advanced Parameters tab, find the Force Layout field.
+#. Go to Settings > 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.
@@ -13,3 +13,13 @@ 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``
+
+To force a new custom layout for emails that do not use an existing ``email.template``
+record (e.g., emails sent from the chatter):
+
+#. Go to Settings > Technical > User Interface > Views.
+#. Copy the current layout (e.g., mail.message_notification_email) to create a new one, and remove any parts you don’t need.
+#. Open the layout that you want to swap with a substitute. Then, under the Layout Mapping tab:
+    * Set ``Substitute Layout`` to the new custom layout you created.
+    * Set ``Models`` if you want to apply the replacement only to specific models. If left empty,
+      the email layout will be replaced for all models.

mail_layout_force/readme/CONTRIBUTORS.rst

@@ -1,3 +1,7 @@
 * `Camptocamp <https://www.camptocamp.com>`_
 
     * Iván Todorovich <[email protected]>
+* `Quartile <https://www.quartile.co>`_
+
+  * Aung Ko Ko Lin
+  * Yoshi Tashiro

mail_layout_force/readme/DESCRIPTION.rst

@@ -7,11 +7,14 @@ 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.message_notification_email``
 * ``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.
+effectively overwritting the one hardcoded by Odoo. Additionally, it enables
+forcing a custom layout for emails that do not use an existing ``email.template``
+record (e.g., when sending an email from the chatter).
 
 This allows you to fully customize the way Odoo emails are rendered and sent
 to your customers.