[BOT] post-merge updates

Author: OCA-git-bot

README.md

@@ -38,6 +38,7 @@ addon | version | maintainers | summary
 [mail_force_email_notification](mail_force_email_notification/) | 18.0.1.0.0 |  | Context key to define notifications to be sent by emaildefined by force_notification_by_email context key
 [mail_forward](mail_forward/) | 18.0.1.0.0 | <a href='https://github.com/carlos-lopez-tecnativa'><img src='https://github.com/carlos-lopez-tecnativa.png' width='32' height='32' style='border-radius:50%;' alt='carlos-lopez-tecnativa'/></a> | Forward messages from the chatter of any document to other users.
 [mail_inline_css](mail_inline_css/) | 18.0.1.0.0 |  | Convert style tags in inline style in your mails
+[mail_layout_force](mail_layout_force/) | 18.0.1.0.0 | <a href='https://github.com/ivantodorovich'><img src='https://github.com/ivantodorovich.png' width='32' height='32' style='border-radius:50%;' alt='ivantodorovich'/></a> | Force a mail layout on selected email templates
 [mail_layout_preview](mail_layout_preview/) | 18.0.1.0.0 |  | Preview email templates in the browser
 [mail_message_search](mail_message_search/) | 18.0.1.0.2 | <a href='https://github.com/yostashiro'><img src='https://github.com/yostashiro.png' width='32' height='32' style='border-radius:50%;' alt='yostashiro'/></a> <a href='https://github.com/aungkokolin1997'><img src='https://github.com/aungkokolin1997.png' width='32' height='32' style='border-radius:50%;' alt='aungkokolin1997'/></a> | Mail Message Search
 [mail_no_user_assign_notification](mail_no_user_assign_notification/) | 18.0.1.0.0 | <a href='https://github.com/victoralmau'><img src='https://github.com/victoralmau.png' width='32' height='32' style='border-radius:50%;' alt='victoralmau'/></a> | Mail No user Assign Notification

mail_layout_force/README.rst

@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 =================
 Mail Layout Force
 =================
@@ -7,13 +11,13 @@ Mail Layout Force
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:988dd474248a3c1d5cf299ddbbe938b3706c0ebaca05219cede46dc6a2eed89a
+   !! source digest: sha256:baadb7cfc76ac450e9fdd0b52f04a5ea57a275da88e050ae8ad80ffdbb90bb6e
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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
+.. |badge2| image:: https://img.shields.io/badge/license-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%2Fmail-lightgray.png?logo=github
@@ -39,9 +43,9 @@ There are notably three 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_layout``
--  ``mail.mail_notification_layout_with_responsible_signature``
--  ``mail.mail_notification_light``
+- ``mail.mail_notification_layout``
+- ``mail.mail_notification_layout_with_responsible_signature``
+- ``mail.mail_notification_light``
 
 This module allows to force a specific layout for a given
 ``email.template``, effectively overwriting the one hardcoded by Odoo.
@@ -74,9 +78,9 @@ 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_layout``
--  ``mail.mail_notification_layout_with_responsible_signature``
--  ``mail.mail_notification_light``
+- ``mail.mail_notification_layout``
+- ``mail.mail_notification_layout_with_responsible_signature``
+- ``mail.mail_notification_light``
 
 To force a custom layout for emails that do not use an existing
 ``email.template`` record (e.g., emails sent from the chatter) or for
@@ -91,11 +95,11 @@ opening the mail composer (e.g., invoice send actions like
 3. Open the original layout view that you want to replace. Under the
    *Layout Mapping* tab:
 
-   -  Click *Add a line*
-   -  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
+   - Click *Add a line*
+   - 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
 ===========
@@ -118,16 +122,16 @@ Authors
 Contributors
 ------------
 
--  ``Camptocamp <https://www.camptocamp.com>``\ \_
+- ``Camptocamp <https://www.camptocamp.com>``\ \_
 
-   -  Iván Todorovich ivan.todorovich@camptocamp.com
+  - Iván Todorovich ivan.todorovich@camptocamp.com
 
--  Abraham Anes abrahamanes@gmail.com
+- Abraham Anes abrahamanes@gmail.com
 
--  ``Quartile <https://www.quartile.co>``\ \_
+- ``Quartile <https://www.quartile.co>``\ \_
 
-   -  Aung Ko Ko Lin
-   -  Yoshi Tashiro
+  - Aung Ko Ko Lin
+  - Yoshi Tashiro
 
 Maintainers
 -----------

mail_layout_force/static/description/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Mail Layout Force</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="mail-layout-force">
-<h1 class="title">Mail Layout Force</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="mail-layout-force">
+<h1>Mail Layout Force</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:988dd474248a3c1d5cf299ddbbe938b3706c0ebaca05219cede46dc6a2eed89a
+!! source digest: sha256:baadb7cfc76ac450e9fdd0b52f04a5ea57a275da88e050ae8ad80ffdbb90bb6e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/mail/tree/18.0/mail_layout_force"><img alt="OCA/mail" src="https://img.shields.io/badge/github-OCA%2Fmail-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/mail-18-0/mail-18-0-mail_layout_force"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/mail&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/mail/tree/18.0/mail_layout_force"><img alt="OCA/mail" src="https://img.shields.io/badge/github-OCA%2Fmail-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/mail-18-0/mail-18-0-mail_layout_force"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/mail&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Odoo will add a default email layout on most commercial communications.</p>
 <p>The email layout is a <tt class="docutils literal">QWeb</tt> view that ends up wrapping the message
 body when sending an email. It usually displays the related document
@@ -404,7 +409,7 @@ <h1 class="title">Mail Layout Force</h1>
 </ul>
 </div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
 <p>To configure a forced layout for email templates:</p>
 <ol class="arabic simple">
 <li>Go to <em>Settings &gt; Technical &gt; Email &gt; Email Templates</em></li>
@@ -444,23 +449,23 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 </ol>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/mail/issues">GitHub Issues</a>.
 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
 <a class="reference external" href="https://github.com/OCA/mail/issues/new?body=module:%20mail_layout_force%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-3">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">Authors</a></h3>
 <ul class="simple">
 <li>Camptocamp</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 <ul class="simple">
 <li><tt class="docutils literal">Camptocamp <span class="pre">&lt;https://www.camptocamp.com&gt;</span></tt>_<ul>
 <li>Iván Todorovich <a class="reference external" href="mailto:ivan.todorovich&#64;camptocamp.com">ivan.todorovich&#64;camptocamp.com</a></li>
@@ -475,7 +480,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -490,5 +495,6 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>

setup/_metapackage/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "odoo-addons-oca-mail"
-version = "18.0.20260309.0"
+version = "18.0.20260401.0"
 dependencies = [
     "odoo-addon-base_search_mail_content==18.0.*",
     "odoo-addon-mail_activity_board==18.0.*",
@@ -19,6 +19,7 @@ dependencies = [
     "odoo-addon-mail_force_email_notification==18.0.*",
     "odoo-addon-mail_forward==18.0.*",
     "odoo-addon-mail_inline_css==18.0.*",
+    "odoo-addon-mail_layout_force==18.0.*",
     "odoo-addon-mail_layout_preview==18.0.*",
     "odoo-addon-mail_message_search==18.0.*",
     "odoo-addon-mail_no_user_assign_notification==18.0.*",