From bee4a2659d77b4d81cfe95b5ffe01c91710c8f2b Mon Sep 17 00:00:00 2001 From: Pierre-Yves Dufays Date: Thu, 11 Aug 2022 14:51:57 +0000 Subject: [PATCH] [IMP] {test_}mail: merge notif email template layout to keep only one Make mail_notification_layout as the default mail template and remove message_notification_email. We now only have 2 main notification mail layout templates (outside of a light one): the default one and one that inherits from it to only change the signature to the responsible instead of the author one. In this operation the layout of message_notification_email has been integrated in mail_notification_layout to support outlook mail client for which message_notification_email has just been reworked (odoo/odoo#92847). Technical note: we have integrated the "internal communication" banner from "message_notification_email" into the new default template "mail_notification_layout" which cause one added query in the test for querying the flag internal from mail.message.subtype. Task-2801600 Part-of: odoo/odoo#88466 --- addons/mail/data/mail_templates_chatter.xml | 2 - .../data/mail_templates_email_layouts.xml | 177 ++++-------------- addons/mail/models/mail_template.py | 2 +- addons/mail/models/mail_thread.py | 2 +- addons/project/data/mail_template_data.xml | 2 - addons/test_mail/tests/test_message_post.py | 3 +- addons/test_mail/tests/test_performance.py | 6 +- 7 files changed, 46 insertions(+), 148 deletions(-) diff --git a/addons/mail/data/mail_templates_chatter.xml b/addons/mail/data/mail_templates_chatter.xml index a230a48b603..06007c72bb8 100644 --- a/addons/mail/data/mail_templates_chatter.xml +++ b/addons/mail/data/mail_templates_chatter.xml @@ -3,12 +3,10 @@