From ad8ce470bf341d8a53baf316798bbe96c7e48a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Marques?= <joao.marques@tecnativa.com>
Date: Tue, 5 Jan 2021 09:18:36 +0000
Subject: [PATCH 1/3] [ADD] mail_notification_custom_subject: Apply a custom
 subject to mail notifications

This module allows you to specify templates to override the subject on the notification
emails sent by Odoo.

TT27191

Co-authored-by: Pedro M. Baeza <pedro.baeza@tecnativa.com>
---
 mail_notification_custom_subject/README.rst   | 106 ++++
 mail_notification_custom_subject/__init__.py  |   1 +
 .../__manifest__.py                           |  23 +
 .../i18n/es_ES.po                             |  69 +++
 .../i18n/mail_notification_custom_subject.pot | 134 +++++
 .../models/__init__.py                        |   2 +
 .../models/mail_message_custom_subject.py     |  38 ++
 .../models/mail_thread.py                     |  75 +++
 .../readme/CONFIGURE.rst                      |   8 +
 .../readme/CONTRIBUTORS.rst                   |   4 +
 .../readme/DESCRIPTION.rst                    |   2 +
 .../readme/USAGE.rst                          |   5 +
 .../security/ir.model.access.csv              |   3 +
 .../static/description/icon.png               | Bin 0 -> 9455 bytes
 .../static/description/index.html             | 458 ++++++++++++++++++
 .../tests/__init__.py                         |   1 +
 .../test_mail_notification_custom_subject.py  | 245 ++++++++++
 ...mail_notification_custom_subject_views.xml |  50 ++
 18 files changed, 1224 insertions(+)
 create mode 100644 mail_notification_custom_subject/README.rst
 create mode 100644 mail_notification_custom_subject/__init__.py
 create mode 100644 mail_notification_custom_subject/__manifest__.py
 create mode 100644 mail_notification_custom_subject/i18n/es_ES.po
 create mode 100644 mail_notification_custom_subject/i18n/mail_notification_custom_subject.pot
 create mode 100644 mail_notification_custom_subject/models/__init__.py
 create mode 100644 mail_notification_custom_subject/models/mail_message_custom_subject.py
 create mode 100644 mail_notification_custom_subject/models/mail_thread.py
 create mode 100644 mail_notification_custom_subject/readme/CONFIGURE.rst
 create mode 100644 mail_notification_custom_subject/readme/CONTRIBUTORS.rst
 create mode 100644 mail_notification_custom_subject/readme/DESCRIPTION.rst
 create mode 100644 mail_notification_custom_subject/readme/USAGE.rst
 create mode 100644 mail_notification_custom_subject/security/ir.model.access.csv
 create mode 100644 mail_notification_custom_subject/static/description/icon.png
 create mode 100644 mail_notification_custom_subject/static/description/index.html
 create mode 100644 mail_notification_custom_subject/tests/__init__.py
 create mode 100644 mail_notification_custom_subject/tests/test_mail_notification_custom_subject.py
 create mode 100644 mail_notification_custom_subject/views/mail_notification_custom_subject_views.xml

diff --git a/mail_notification_custom_subject/README.rst b/mail_notification_custom_subject/README.rst
new file mode 100644
index 000000000..4aa642643
--- /dev/null
+++ b/mail_notification_custom_subject/README.rst
@@ -0,0 +1,106 @@
+================================
+Mail Notification Custom Subject
+================================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Production/Stable
+.. |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/12.0/mail_notification_custom_subject
+    :alt: OCA/social
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/social-12-0/social-12-0-mail_notification_custom_subject
+    :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/12.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module allows you to specify templates to override the subject on the notification
+emails sent by Odoo
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+
+* Activate access to **Technical Features** (debug mode).
+* Go to **Settings > Technical > Email > Subject Replacement Templates**
+* Create a new template.
+
+    * The field **Model** specifies the model to which the subject template should apply in the notification emails sent by Odoo.
+    * The field **Subject Template** accepts `Jinjah<ttps://jinja.palletsprojects.com/en/2.11.x/>` expressions.
+    * The field **Replace** specifies if the template should replace existing content or append to it.
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Open the chatter in Odoo (e.g. Open an Invoice).
+* Send a message.
+* Observe the rendered Subject template.
+
+Bug Tracker
+===========
+
+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 smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/social/issues/new?body=module:%20mail_notification_custom_subject%0Aversion:%2012.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Tecnativa
+
+Contributors
+~~~~~~~~~~~~
+
+* Tecnativa <https://www.tecnativa.com>
+
+    * Pedro M. Baeza
+    * João Marques
+
+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-joao-p-marques| image:: https://github.com/joao-p-marques.png?size=40px
+    :target: https://github.com/joao-p-marques
+    :alt: joao-p-marques
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-joao-p-marques| 
+
+This module is part of the `OCA/social <https://github.com/OCA/social/tree/12.0/mail_notification_custom_subject>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/mail_notification_custom_subject/__init__.py b/mail_notification_custom_subject/__init__.py
new file mode 100644
index 000000000..0650744f6
--- /dev/null
+++ b/mail_notification_custom_subject/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/mail_notification_custom_subject/__manifest__.py b/mail_notification_custom_subject/__manifest__.py
new file mode 100644
index 000000000..1c970d302
--- /dev/null
+++ b/mail_notification_custom_subject/__manifest__.py
@@ -0,0 +1,23 @@
+# Copyright 2020-2021 Tecnativa - João Marques
+# Copyright 2021 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Mail Notification Custom Subject",
+    "summary": "Apply a custom subject to mail notifications",
+    "version": "12.0.1.0.0",
+    "category": "Social Network",
+    "website": "https://github.com/OCA/social/",
+    "author": "Tecnativa, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "installable": True,
+    "depends": [
+        "mail",
+    ],
+    "data": [
+        "security/ir.model.access.csv",
+        "views/mail_notification_custom_subject_views.xml",
+    ],
+    "development_status": "Production/Stable",
+    "maintainers": ["joao-p-marques"],
+}
diff --git a/mail_notification_custom_subject/i18n/es_ES.po b/mail_notification_custom_subject/i18n/es_ES.po
new file mode 100644
index 000000000..a1147e83c
--- /dev/null
+++ b/mail_notification_custom_subject/i18n/es_ES.po
@@ -0,0 +1,69 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* mail_notification_custom_subject
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-01-05 09:11+0000\n"
+"PO-Revision-Date: 2021-01-05 09:17+0000\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.4.2\n"
+"Last-Translator: \n"
+"Language: es_ES\n"
+
+#. module: mail_notification_custom_subject
+#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:150
+#, python-format
+msgid "Append After"
+msgstr "Añadir después"
+
+#. module: mail_notification_custom_subject
+#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:149
+#, python-format
+msgid "Append Before"
+msgstr "Añadir antes"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model,name:mail_notification_custom_subject.model_mail_thread
+msgid "Email Thread"
+msgstr "Hilo de correo electrónico"
+
+#. module: mail_notification_custom_subject
+#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:238
+#, python-format
+msgid "Failed to render template %r using values %r"
+msgstr "Error al procesar la plantilla %r usando los valores %r"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model,name:mail_notification_custom_subject.model_mail_message_custom_subject
+msgid "Mail Message Custom Subject"
+msgstr "Asunto Personalizado en Mensaje de Correo"
+
+#. module: mail_notification_custom_subject
+#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:151
+#, python-format
+msgid "Replace"
+msgstr "Sustituir"
+
+#. module: mail_notification_custom_subject
+#: model_terms:ir.ui.view,arch_db:mail_notification_custom_subject.mail_notification_custom_subject_form
+msgid "Subject (placeholders may be used here)"
+msgstr "Asunto (se pueden utilizar aquí expresiones de campos)"
+
+#. module: mail_notification_custom_subject
+#: model:ir.actions.act_window,name:mail_notification_custom_subject.action_mail_notification_custom_subject_tree_all
+#: model:ir.ui.menu,name:mail_notification_custom_subject.menu_mail_notification_custom_subject
+#: model_terms:ir.ui.view,arch_db:mail_notification_custom_subject.mail_notification_custom_subject_form
+msgid "Subject Replacement Templates"
+msgstr "Plantillas de Sustitución de Asuntos"
+
+#. module: mail_notification_custom_subject
+#: model_terms:ir.ui.view,arch_db:mail_notification_custom_subject.mail_notification_custom_subject_tree
+msgid "Templates"
+msgstr "Plantillas"
diff --git a/mail_notification_custom_subject/i18n/mail_notification_custom_subject.pot b/mail_notification_custom_subject/i18n/mail_notification_custom_subject.pot
new file mode 100644
index 000000000..5b48b0882
--- /dev/null
+++ b/mail_notification_custom_subject/i18n/mail_notification_custom_subject.pot
@@ -0,0 +1,134 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* mail_notification_custom_subject
+#
+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: mail_notification_custom_subject
+#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:31
+#: selection:mail.message.custom.subject,position:0
+#, python-format
+msgid "Append After"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:30
+#: selection:mail.message.custom.subject,position:0
+#, python-format
+msgid "Append Before"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__subtype_ids
+msgid "Applied Subtypes"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model,name:mail_notification_custom_subject.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__id
+msgid "ID"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model,name:mail_notification_custom_subject.model_mail_message_custom_subject
+msgid "Mail Message Custom Subject"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__model_id
+msgid "Model"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,help:mail_notification_custom_subject.field_mail_message_custom_subject__model_id
+msgid "Model where this template applies"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__position
+msgid "Position"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:32
+#: selection:mail.message.custom.subject,position:0
+#, python-format
+msgid "Replace"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,help:mail_notification_custom_subject.field_mail_message_custom_subject__subject_template
+#: model_terms:ir.ui.view,arch_db:mail_notification_custom_subject.mail_notification_custom_subject_form
+msgid "Subject (placeholders may be used here)"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.actions.act_window,name:mail_notification_custom_subject.action_mail_notification_custom_subject_tree_all
+#: model:ir.ui.menu,name:mail_notification_custom_subject.menu_mail_notification_custom_subject
+#: model_terms:ir.ui.view,arch_db:mail_notification_custom_subject.mail_notification_custom_subject_form
+msgid "Subject Replacement Templates"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__subject_template
+msgid "Subject Template"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__name
+msgid "Template Name"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model_terms:ir.ui.view,arch_db:mail_notification_custom_subject.mail_notification_custom_subject_tree
+msgid "Templates"
+msgstr ""
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,help:mail_notification_custom_subject.field_mail_message_custom_subject__position
+msgid "Whether to replace, append at beggining or append at end to other templates that apply to a given context"
+msgstr ""
+
diff --git a/mail_notification_custom_subject/models/__init__.py b/mail_notification_custom_subject/models/__init__.py
new file mode 100644
index 000000000..3e5486eab
--- /dev/null
+++ b/mail_notification_custom_subject/models/__init__.py
@@ -0,0 +1,2 @@
+from . import mail_thread
+from . import mail_message_custom_subject
diff --git a/mail_notification_custom_subject/models/mail_message_custom_subject.py b/mail_notification_custom_subject/models/mail_message_custom_subject.py
new file mode 100644
index 000000000..0fb5bbd0c
--- /dev/null
+++ b/mail_notification_custom_subject/models/mail_message_custom_subject.py
@@ -0,0 +1,38 @@
+# Copyright 2020 Tecnativa - João Marques
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, fields, models
+
+
+class MailMessageCustomSubject(models.Model):
+    _name = "mail.message.custom.subject"
+    _description = "Mail Message Custom Subject"
+
+    name = fields.Char(string="Template Name")
+    model_id = fields.Many2one(
+        comodel_name="ir.model",
+        string="Model",
+        required=True,
+        help="Model where this template applies",
+    )
+    subtype_ids = fields.Many2many(
+        comodel_name="mail.message.subtype",
+        string="Applied Subtypes",
+        required=True,
+    )
+    subject_template = fields.Char(
+        string="Subject Template",
+        required=True,
+        help="Subject (placeholders may be used here)",
+    )
+    position = fields.Selection(
+        selection=[
+            ("append_before", _("Append Before")),
+            ("append_after", _("Append After")),
+            ("replace", _("Replace")),
+        ],
+        string="Position",
+        default="replace",
+        help="Whether to replace, append at beggining or append at end to other"
+        " templates that apply to a given context",
+    )
diff --git a/mail_notification_custom_subject/models/mail_thread.py b/mail_notification_custom_subject/models/mail_thread.py
new file mode 100644
index 000000000..c26742ed4
--- /dev/null
+++ b/mail_notification_custom_subject/models/mail_thread.py
@@ -0,0 +1,75 @@
+# Copyright 2020-2021 Tecnativa - João Marques
+# Copyright 2021 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import api, models
+
+
+class MailThread(models.AbstractModel):
+    _inherit = "mail.thread"
+
+    @api.returns("mail.message", lambda value: value.id)
+    def message_post(
+        self,
+        body="",
+        subject=None,
+        message_type="notification",
+        subtype=None,
+        parent_id=False,
+        attachments=None,
+        notif_layout=False,
+        add_sign=True,
+        model_description=False,
+        mail_auto_delete=True,
+        **kwargs
+    ):
+        subtype_id = kwargs.get('subtype_id', False)
+        if not subtype_id:
+            subtype = subtype or 'mt_note'
+            if '.' not in subtype:
+                subtype = 'mail.%s' % subtype
+            subtype_id = self.env['ir.model.data'].xmlid_to_res_id(
+                subtype, raise_if_not_found=False,
+            )
+        if subtype_id:
+            custom_subjects = self.env["mail.message.custom.subject"].search(
+                [
+                    ("model_id.model", "=", self._name),
+                    ("subtype_ids", "=", subtype_id),
+                ]
+            )
+            if not subject:
+                subject = 'Re: %s' % self.env["mail.message"].with_context(
+                    default_model=self._name,
+                    default_res_id=self.id,
+                )._get_record_name({})
+            for template in custom_subjects:
+                try:
+                    rendered_subject_template = self.env[
+                        "mail.template"
+                    ]._render_template(
+                        template_txt=template.subject_template,
+                        model=self._name,
+                        res_ids=self.id,
+                    )
+                    if template.position == "replace":
+                        subject = rendered_subject_template
+                    elif template.position == "append_before":
+                        subject = rendered_subject_template + subject
+                    elif template.position == "append_after":
+                        subject += rendered_subject_template
+                except Exception:
+                    rendered_subject_template = False
+        return super().message_post(
+            body=body,
+            subject=subject,
+            message_type=message_type,
+            subtype=subtype,
+            parent_id=parent_id,
+            attachments=attachments,
+            notif_layout=notif_layout,
+            add_sign=add_sign,
+            model_description=model_description,
+            mail_auto_delete=mail_auto_delete,
+            **kwargs
+        )
diff --git a/mail_notification_custom_subject/readme/CONFIGURE.rst b/mail_notification_custom_subject/readme/CONFIGURE.rst
new file mode 100644
index 000000000..86bed07b4
--- /dev/null
+++ b/mail_notification_custom_subject/readme/CONFIGURE.rst
@@ -0,0 +1,8 @@
+
+* Activate access to **Technical Features** (debug mode).
+* Go to **Settings > Technical > Email > Subject Replacement Templates**
+* Create a new template.
+
+    * The field **Model** specifies the model to which the subject template should apply in the notification emails sent by Odoo.
+    * The field **Subject Template** accepts `Jinjah<ttps://jinja.palletsprojects.com/en/2.11.x/>` expressions.
+    * The field **Replace** specifies if the template should replace existing content or append to it.
diff --git a/mail_notification_custom_subject/readme/CONTRIBUTORS.rst b/mail_notification_custom_subject/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000..b0f16877f
--- /dev/null
+++ b/mail_notification_custom_subject/readme/CONTRIBUTORS.rst
@@ -0,0 +1,4 @@
+* Tecnativa <https://www.tecnativa.com>
+
+    * Pedro M. Baeza
+    * João Marques
diff --git a/mail_notification_custom_subject/readme/DESCRIPTION.rst b/mail_notification_custom_subject/readme/DESCRIPTION.rst
new file mode 100644
index 000000000..2b0727f1a
--- /dev/null
+++ b/mail_notification_custom_subject/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module allows you to specify templates to override the subject on the notification
+emails sent by Odoo
diff --git a/mail_notification_custom_subject/readme/USAGE.rst b/mail_notification_custom_subject/readme/USAGE.rst
new file mode 100644
index 000000000..49bed60a7
--- /dev/null
+++ b/mail_notification_custom_subject/readme/USAGE.rst
@@ -0,0 +1,5 @@
+To use this module, you need to:
+
+* Open the chatter in Odoo (e.g. Open an Invoice).
+* Send a message.
+* Observe the rendered Subject template.
diff --git a/mail_notification_custom_subject/security/ir.model.access.csv b/mail_notification_custom_subject/security/ir.model.access.csv
new file mode 100644
index 000000000..bc15034ae
--- /dev/null
+++ b/mail_notification_custom_subject/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_mail_notification_custom_subject_user,mail_notification_custom_object,model_mail_message_custom_subject,base.group_user,1,0,0,0
+access_mail_notification_custom_subject_admin,mail_notification_custom_object,model_mail_message_custom_subject,base.group_system,1,1,1,1
diff --git a/mail_notification_custom_subject/static/description/icon.png b/mail_notification_custom_subject/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
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
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

literal 0
HcmV?d00001

diff --git a/mail_notification_custom_subject/static/description/index.html b/mail_notification_custom_subject/static/description/index.html
new file mode 100644
index 000000000..21bf700d9
--- /dev/null
+++ b/mail_notification_custom_subject/static/description/index.html
@@ -0,0 +1,458 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<title>Mail Notification Custom Subject</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="mail-notification-custom-subject">
+<h1 class="title">Mail Notification Custom Subject</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/social/tree/12.0/mail_notification_custom_subject"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/social-12-0/social-12-0-mail_notification_custom_subject"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/205/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module allows you to specify templates to override the subject on the notification
+emails sent by Odoo</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<ul>
+<li><p class="first">Activate access to <strong>Technical Features</strong> (debug mode).</p>
+</li>
+<li><p class="first">Go to <strong>Settings &gt; Technical &gt; Email &gt; Subject Replacement Templates</strong></p>
+</li>
+<li><p class="first">Create a new template.</p>
+<blockquote>
+<ul class="simple">
+<li>The field <strong>Model</strong> specifies the model to which the subject template should apply in the notification emails sent by Odoo.</li>
+<li>The field <strong>Subject Template</strong> accepts <cite>Jinjah&lt;ttps://jinja.palletsprojects.com/en/2.11.x/&gt;</cite> expressions.</li>
+<li>The field <strong>Replace</strong> specifies if the template should replace existing content or append to it.</li>
+</ul>
+</blockquote>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<p>To use this module, you need to:</p>
+<ul class="simple">
+<li>Open the chatter in Odoo (e.g. Open an Invoice).</li>
+<li>Send a message.</li>
+<li>Observe the rendered Subject template.</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/social/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 smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mail_notification_custom_subject%0Aversion:%2012.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="#id4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<ul class="simple">
+<li>Tecnativa</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<ul>
+<li><p class="first">Tecnativa &lt;<a class="reference external" href="https://www.tecnativa.com">https://www.tecnativa.com</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li>Pedro M. Baeza</li>
+<li>João Marques</li>
+</ul>
+</blockquote>
+</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
+<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" /></a>
+<p>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.</p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
+<p><a class="reference external" href="https://github.com/joao-p-marques"><img alt="joao-p-marques" src="https://github.com/joao-p-marques.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/12.0/mail_notification_custom_subject">OCA/social</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/mail_notification_custom_subject/tests/__init__.py b/mail_notification_custom_subject/tests/__init__.py
new file mode 100644
index 000000000..b0f2b2eff
--- /dev/null
+++ b/mail_notification_custom_subject/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_mail_notification_custom_subject
diff --git a/mail_notification_custom_subject/tests/test_mail_notification_custom_subject.py b/mail_notification_custom_subject/tests/test_mail_notification_custom_subject.py
new file mode 100644
index 000000000..7ecde6e0c
--- /dev/null
+++ b/mail_notification_custom_subject/tests/test_mail_notification_custom_subject.py
@@ -0,0 +1,245 @@
+# Copyright 2020 Tecnativa - João Marques
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo.tests import common
+
+
+class TestMailNotificationCustomSubject(common.TransactionCase):
+    def setUp(self):
+        super(TestMailNotificationCustomSubject, self).setUp()
+        self.partner_1 = self.env["res.partner"].create(
+            {
+                "name": "Test partner 1",
+                "supplier": True,
+                "email": "partner1@example.com",
+            }
+        )
+        self.partner_2 = self.env["res.partner"].create(
+            {
+                "name": "Test partner 2",
+                "supplier": True,
+                "email": "partner2@example.com",
+            }
+        )
+
+    def test_email_subject_template_overrides(self):
+        self.env["mail.message.custom.subject"].create(
+            {
+                "name": "Test template 1",
+                "model_id": self.env.ref("base.model_res_partner").id,
+                "subtype_ids": [
+                    (
+                        6,
+                        0,
+                        [
+                            self.env.ref("mail.mt_comment").id,
+                        ],
+                    )
+                ],
+                "subject_template": "${object.name or 'n/a'} and something more",
+            }
+        )
+        # Send message in partner
+        mail_message_1 = self.partner_1.message_post(
+            body="Test", subtype="mail.mt_comment"
+        )
+        # Get message and check subject
+        self.assertEquals(mail_message_1.subject, "Test partner 1 and something more")
+
+        # Send message in partner 2
+        mail_message_2 = self.partner_2.message_post(
+            body="Test", subtype="mail.mt_comment"
+        )
+        # Get message and check subject
+        self.assertEquals(mail_message_2.subject, "Test partner 2 and something more")
+
+        # Explicit subject should also be overwritten
+        mail_message_3 = self.partner_2.message_post(
+            body="Test", subtype="mail.mt_comment", subject="Test"
+        )
+        # Get message and check subject
+        self.assertEquals(mail_message_3.subject, "Test partner 2 and something more")
+
+    def test_email_subject_template_normal(self):
+        self.env["mail.message.custom.subject"].create(
+            {
+                "name": "Test template 1",
+                "model_id": self.env.ref("base.model_res_partner").id,
+                "subtype_ids": [
+                    (
+                        6,
+                        0,
+                        [
+                            self.env.ref("mail.mt_comment").id,
+                        ],
+                    )
+                ],
+                "subject_template": "${object.name or 'n/a'} and something more",
+            }
+        )
+        # Send note in partner
+        mail_message_1 = self.partner_1.message_post(
+            body="Test", subtype="mail.mt_note", subject="Test"
+        )
+        # Get message and check subject. Subject Template should not apply
+        self.assertEquals(mail_message_1.subject, "Test")
+
+    def test_email_subject_template_multi(self):
+        self.env["mail.message.custom.subject"].create(
+            {
+                "name": "Test template 1",
+                "model_id": self.env.ref("base.model_res_partner").id,
+                "subtype_ids": [
+                    (
+                        6,
+                        0,
+                        [
+                            self.env.ref("mail.mt_comment").id,
+                        ],
+                    )
+                ],
+                "subject_template": "${object.name or 'n/a'} and something more",
+            }
+        )
+        self.env["mail.message.custom.subject"].create(
+            {
+                "name": "Test template 2",
+                "model_id": self.env.ref("base.model_res_partner").id,
+                "subtype_ids": [
+                    (
+                        6,
+                        0,
+                        [
+                            self.env.ref("mail.mt_comment").id,
+                        ],
+                    )
+                ],
+                "subject_template": "${object.name or 'n/a'} and something different",
+            }
+        )
+        # Send message in partner
+        mail_message_1 = self.partner_1.message_post(
+            body="Test", subtype="mail.mt_comment"
+        )
+        # Get message and check subject
+        self.assertEquals(
+            mail_message_1.subject, "Test partner 1 and something different"
+        )
+        self.env["mail.message.custom.subject"].create(
+            {
+                "name": "Test template 3",
+                "model_id": self.env.ref("base.model_res_partner").id,
+                "subtype_ids": [
+                    (
+                        6,
+                        0,
+                        [
+                            self.env.ref("mail.mt_comment").id,
+                        ],
+                    )
+                ],
+                "subject_template": "${' and yet something else'}",
+                "position": "append_after",
+            }
+        )
+        # Send message in partner
+        mail_message_2 = self.partner_1.message_post(
+            body="Test", subtype="mail.mt_comment"
+        )
+        # Get message and check subject
+        self.assertEquals(
+            mail_message_2.subject,
+            "Test partner 1 and something different and yet something else",
+        )
+        self.env["mail.message.custom.subject"].create(
+            {
+                "name": "Test template 4",
+                "model_id": self.env.ref("base.model_res_partner").id,
+                "subtype_ids": [
+                    (
+                        6,
+                        0,
+                        [
+                            self.env.ref("mail.mt_comment").id,
+                        ],
+                    )
+                ],
+                "subject_template": "${'Re: '}",
+                "position": "append_before",
+            }
+        )
+        # Send message in partner
+        mail_message_3 = self.partner_1.message_post(
+            body="Test", subtype="mail.mt_comment"
+        )
+        # Get message and check subject
+        self.assertEquals(
+            mail_message_3.subject,
+            "Re: Test partner 1 and something different and yet something else",
+        )
+
+    def test_email_subject_template_w_original(self):
+        self.env["mail.message.custom.subject"].create(
+            {
+                "name": "Test template 1",
+                "model_id": self.env.ref("base.model_res_partner").id,
+                "subtype_ids": [
+                    (
+                        6,
+                        0,
+                        [
+                            self.env.ref("mail.mt_comment").id,
+                        ],
+                    )
+                ],
+                "subject_template": "${' and something more'}",
+                "position": "append_after",
+            }
+        )
+        # Send message in partner
+        mail_message_1 = self.partner_1.message_post(
+            body="Test", subtype="mail.mt_comment", subject="Test",
+        )
+        # Get message and check subject
+        self.assertEquals(
+            mail_message_1.subject, "Test and something more"
+        )
+
+    def test_bad_template_does_not_break(self):
+        self.env["mail.message.custom.subject"].create(
+            {
+                "name": "Test bad template 1",
+                "model_id": self.env.ref("base.model_res_partner").id,
+                "subtype_ids": [
+                    (
+                        6,
+                        0,
+                        [
+                            self.env.ref("mail.mt_comment").id,
+                        ],
+                    )
+                ],
+                "subject_template": "${obaject.number_a} and something",
+                "position": "append_after",
+            }
+        )
+        # Send message in partner
+        mail_message_1 = self.partner_1.message_post(
+            body="Test", subtype="mail.mt_comment", subject="Test",
+        )
+        # Get message and check subject
+        # No exception should be raised but subject should remain as original.
+        self.assertEquals(
+            mail_message_1.subject, "Test"
+        )
+
+    def test_no_template_default_result(self):
+        # Send message in partner
+        mail_message_1 = self.partner_1.message_post(
+            body="Test", subtype="mail.mt_comment", subject="Test partner 1"
+        )
+        # Get message and check subject
+        # No exception should be raised but subject should remain as original.
+        self.assertEquals(
+            mail_message_1.subject, "Test partner 1"
+        )
diff --git a/mail_notification_custom_subject/views/mail_notification_custom_subject_views.xml b/mail_notification_custom_subject/views/mail_notification_custom_subject_views.xml
new file mode 100644
index 000000000..7dd4e5a94
--- /dev/null
+++ b/mail_notification_custom_subject/views/mail_notification_custom_subject_views.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <record model="ir.ui.view" id="mail_notification_custom_subject_form">
+            <field name="name">mail.message.custom.subject.form</field>
+            <field name="model">mail.message.custom.subject</field>
+            <field name="arch" type="xml">
+                <form string="Subject Replacement Templates">
+                    <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1 name="name"><field name="name"/></h1>
+                        </div>
+                        <group>
+                            <field name="subject_template" placeholder="Subject (placeholders may be used here)"/>
+                            <field name="model_id"/>
+                            <field name="subtype_ids" widget="many2many_tags" />
+                            <field name="position"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="mail_notification_custom_subject_tree">
+            <field name="name">mail.message.custom.subject.tree</field>
+            <field name="model">mail.message.custom.subject</field>
+            <field name="arch" type="xml">
+                <tree string="Templates">
+                    <field name="name"/>
+                    <field name="model_id"/>
+                    <field name="subtype_ids"/>
+                    <field name="subject_template"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_mail_notification_custom_subject_tree_all">
+            <field name="name">Subject Replacement Templates</field>
+            <field name="res_model">mail.message.custom.subject</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+            <field name="view_id" ref="mail_notification_custom_subject_tree" />
+        </record>
+
+        <menuitem id="menu_mail_notification_custom_subject" parent="base.menu_email" action="action_mail_notification_custom_subject_tree_all"
+                  sequence="21"/>
+
+    </data>
+</odoo>

From b9d0b7855027cba03bedaa471c43454e71b88e4e Mon Sep 17 00:00:00 2001
From: Carlos Roca <carlos.roca@tecnativa.com>
Date: Mon, 15 Feb 2021 14:28:18 +0100
Subject: [PATCH 2/3] [IMP] mail_notification_custom_subject: black, isort,
 prettier

---
 .../__manifest__.py                           |  6 +-
 .../models/mail_message_custom_subject.py     |  4 +-
 .../models/mail_thread.py                     | 20 ++--
 .../test_mail_notification_custom_subject.py  | 94 +++----------------
 ...mail_notification_custom_subject_views.xml | 36 ++++---
 .../addons/mail_notification_custom_subject   |  1 +
 .../mail_notification_custom_subject/setup.py |  6 ++
 7 files changed, 53 insertions(+), 114 deletions(-)
 create mode 120000 setup/mail_notification_custom_subject/odoo/addons/mail_notification_custom_subject
 create mode 100644 setup/mail_notification_custom_subject/setup.py

diff --git a/mail_notification_custom_subject/__manifest__.py b/mail_notification_custom_subject/__manifest__.py
index 1c970d302..7302252f4 100644
--- a/mail_notification_custom_subject/__manifest__.py
+++ b/mail_notification_custom_subject/__manifest__.py
@@ -7,13 +7,11 @@
     "summary": "Apply a custom subject to mail notifications",
     "version": "12.0.1.0.0",
     "category": "Social Network",
-    "website": "https://github.com/OCA/social/",
+    "website": "https://github.com/OCA/social",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "installable": True,
-    "depends": [
-        "mail",
-    ],
+    "depends": ["mail"],
     "data": [
         "security/ir.model.access.csv",
         "views/mail_notification_custom_subject_views.xml",
diff --git a/mail_notification_custom_subject/models/mail_message_custom_subject.py b/mail_notification_custom_subject/models/mail_message_custom_subject.py
index 0fb5bbd0c..60a713a54 100644
--- a/mail_notification_custom_subject/models/mail_message_custom_subject.py
+++ b/mail_notification_custom_subject/models/mail_message_custom_subject.py
@@ -16,9 +16,7 @@ class MailMessageCustomSubject(models.Model):
         help="Model where this template applies",
     )
     subtype_ids = fields.Many2many(
-        comodel_name="mail.message.subtype",
-        string="Applied Subtypes",
-        required=True,
+        comodel_name="mail.message.subtype", string="Applied Subtypes", required=True,
     )
     subject_template = fields.Char(
         string="Subject Template",
diff --git a/mail_notification_custom_subject/models/mail_thread.py b/mail_notification_custom_subject/models/mail_thread.py
index c26742ed4..8743fcb80 100644
--- a/mail_notification_custom_subject/models/mail_thread.py
+++ b/mail_notification_custom_subject/models/mail_thread.py
@@ -23,25 +23,21 @@ class MailThread(models.AbstractModel):
         mail_auto_delete=True,
         **kwargs
     ):
-        subtype_id = kwargs.get('subtype_id', False)
+        subtype_id = kwargs.get("subtype_id", False)
         if not subtype_id:
-            subtype = subtype or 'mt_note'
-            if '.' not in subtype:
-                subtype = 'mail.%s' % subtype
-            subtype_id = self.env['ir.model.data'].xmlid_to_res_id(
+            subtype = subtype or "mt_note"
+            if "." not in subtype:
+                subtype = "mail.%s" % subtype
+            subtype_id = self.env["ir.model.data"].xmlid_to_res_id(
                 subtype, raise_if_not_found=False,
             )
         if subtype_id:
             custom_subjects = self.env["mail.message.custom.subject"].search(
-                [
-                    ("model_id.model", "=", self._name),
-                    ("subtype_ids", "=", subtype_id),
-                ]
+                [("model_id.model", "=", self._name), ("subtype_ids", "=", subtype_id)]
             )
             if not subject:
-                subject = 'Re: %s' % self.env["mail.message"].with_context(
-                    default_model=self._name,
-                    default_res_id=self.id,
+                subject = "Re: %s" % self.env["mail.message"].with_context(
+                    default_model=self._name, default_res_id=self.id,
                 )._get_record_name({})
             for template in custom_subjects:
                 try:
diff --git a/mail_notification_custom_subject/tests/test_mail_notification_custom_subject.py b/mail_notification_custom_subject/tests/test_mail_notification_custom_subject.py
index 7ecde6e0c..dfd672e31 100644
--- a/mail_notification_custom_subject/tests/test_mail_notification_custom_subject.py
+++ b/mail_notification_custom_subject/tests/test_mail_notification_custom_subject.py
@@ -1,6 +1,6 @@
 # Copyright 2020 Tecnativa - João Marques
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
+# pylint: disable=C8107
 from odoo.tests import common
 
 
@@ -27,15 +27,7 @@ class TestMailNotificationCustomSubject(common.TransactionCase):
             {
                 "name": "Test template 1",
                 "model_id": self.env.ref("base.model_res_partner").id,
-                "subtype_ids": [
-                    (
-                        6,
-                        0,
-                        [
-                            self.env.ref("mail.mt_comment").id,
-                        ],
-                    )
-                ],
+                "subtype_ids": [(6, 0, [self.env.ref("mail.mt_comment").id])],
                 "subject_template": "${object.name or 'n/a'} and something more",
             }
         )
@@ -65,15 +57,7 @@ class TestMailNotificationCustomSubject(common.TransactionCase):
             {
                 "name": "Test template 1",
                 "model_id": self.env.ref("base.model_res_partner").id,
-                "subtype_ids": [
-                    (
-                        6,
-                        0,
-                        [
-                            self.env.ref("mail.mt_comment").id,
-                        ],
-                    )
-                ],
+                "subtype_ids": [(6, 0, [self.env.ref("mail.mt_comment").id])],
                 "subject_template": "${object.name or 'n/a'} and something more",
             }
         )
@@ -89,15 +73,7 @@ class TestMailNotificationCustomSubject(common.TransactionCase):
             {
                 "name": "Test template 1",
                 "model_id": self.env.ref("base.model_res_partner").id,
-                "subtype_ids": [
-                    (
-                        6,
-                        0,
-                        [
-                            self.env.ref("mail.mt_comment").id,
-                        ],
-                    )
-                ],
+                "subtype_ids": [(6, 0, [self.env.ref("mail.mt_comment").id])],
                 "subject_template": "${object.name or 'n/a'} and something more",
             }
         )
@@ -105,15 +81,7 @@ class TestMailNotificationCustomSubject(common.TransactionCase):
             {
                 "name": "Test template 2",
                 "model_id": self.env.ref("base.model_res_partner").id,
-                "subtype_ids": [
-                    (
-                        6,
-                        0,
-                        [
-                            self.env.ref("mail.mt_comment").id,
-                        ],
-                    )
-                ],
+                "subtype_ids": [(6, 0, [self.env.ref("mail.mt_comment").id])],
                 "subject_template": "${object.name or 'n/a'} and something different",
             }
         )
@@ -129,15 +97,7 @@ class TestMailNotificationCustomSubject(common.TransactionCase):
             {
                 "name": "Test template 3",
                 "model_id": self.env.ref("base.model_res_partner").id,
-                "subtype_ids": [
-                    (
-                        6,
-                        0,
-                        [
-                            self.env.ref("mail.mt_comment").id,
-                        ],
-                    )
-                ],
+                "subtype_ids": [(6, 0, [self.env.ref("mail.mt_comment").id])],
                 "subject_template": "${' and yet something else'}",
                 "position": "append_after",
             }
@@ -155,15 +115,7 @@ class TestMailNotificationCustomSubject(common.TransactionCase):
             {
                 "name": "Test template 4",
                 "model_id": self.env.ref("base.model_res_partner").id,
-                "subtype_ids": [
-                    (
-                        6,
-                        0,
-                        [
-                            self.env.ref("mail.mt_comment").id,
-                        ],
-                    )
-                ],
+                "subtype_ids": [(6, 0, [self.env.ref("mail.mt_comment").id])],
                 "subject_template": "${'Re: '}",
                 "position": "append_before",
             }
@@ -183,15 +135,7 @@ class TestMailNotificationCustomSubject(common.TransactionCase):
             {
                 "name": "Test template 1",
                 "model_id": self.env.ref("base.model_res_partner").id,
-                "subtype_ids": [
-                    (
-                        6,
-                        0,
-                        [
-                            self.env.ref("mail.mt_comment").id,
-                        ],
-                    )
-                ],
+                "subtype_ids": [(6, 0, [self.env.ref("mail.mt_comment").id])],
                 "subject_template": "${' and something more'}",
                 "position": "append_after",
             }
@@ -201,24 +145,14 @@ class TestMailNotificationCustomSubject(common.TransactionCase):
             body="Test", subtype="mail.mt_comment", subject="Test",
         )
         # Get message and check subject
-        self.assertEquals(
-            mail_message_1.subject, "Test and something more"
-        )
+        self.assertEquals(mail_message_1.subject, "Test and something more")
 
     def test_bad_template_does_not_break(self):
         self.env["mail.message.custom.subject"].create(
             {
                 "name": "Test bad template 1",
                 "model_id": self.env.ref("base.model_res_partner").id,
-                "subtype_ids": [
-                    (
-                        6,
-                        0,
-                        [
-                            self.env.ref("mail.mt_comment").id,
-                        ],
-                    )
-                ],
+                "subtype_ids": [(6, 0, [self.env.ref("mail.mt_comment").id])],
                 "subject_template": "${obaject.number_a} and something",
                 "position": "append_after",
             }
@@ -229,9 +163,7 @@ class TestMailNotificationCustomSubject(common.TransactionCase):
         )
         # Get message and check subject
         # No exception should be raised but subject should remain as original.
-        self.assertEquals(
-            mail_message_1.subject, "Test"
-        )
+        self.assertEquals(mail_message_1.subject, "Test")
 
     def test_no_template_default_result(self):
         # Send message in partner
@@ -240,6 +172,4 @@ class TestMailNotificationCustomSubject(common.TransactionCase):
         )
         # Get message and check subject
         # No exception should be raised but subject should remain as original.
-        self.assertEquals(
-            mail_message_1.subject, "Test partner 1"
-        )
+        self.assertEquals(mail_message_1.subject, "Test partner 1")
diff --git a/mail_notification_custom_subject/views/mail_notification_custom_subject_views.xml b/mail_notification_custom_subject/views/mail_notification_custom_subject_views.xml
index 7dd4e5a94..e2b333002 100644
--- a/mail_notification_custom_subject/views/mail_notification_custom_subject_views.xml
+++ b/mail_notification_custom_subject/views/mail_notification_custom_subject_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
         <record model="ir.ui.view" id="mail_notification_custom_subject_form">
@@ -8,14 +8,17 @@
                 <form string="Subject Replacement Templates">
                     <sheet>
                         <div class="oe_title">
-                            <label for="name" class="oe_edit_only"/>
-                            <h1 name="name"><field name="name"/></h1>
+                            <label for="name" class="oe_edit_only" />
+                            <h1 name="name"><field name="name" /></h1>
                         </div>
                         <group>
-                            <field name="subject_template" placeholder="Subject (placeholders may be used here)"/>
-                            <field name="model_id"/>
+                            <field
+                                name="subject_template"
+                                placeholder="Subject (placeholders may be used here)"
+                            />
+                            <field name="model_id" />
                             <field name="subtype_ids" widget="many2many_tags" />
-                            <field name="position"/>
+                            <field name="position" />
                         </group>
                     </sheet>
                 </form>
@@ -27,15 +30,18 @@
             <field name="model">mail.message.custom.subject</field>
             <field name="arch" type="xml">
                 <tree string="Templates">
-                    <field name="name"/>
-                    <field name="model_id"/>
-                    <field name="subtype_ids"/>
-                    <field name="subject_template"/>
+                    <field name="name" />
+                    <field name="model_id" />
+                    <field name="subtype_ids" />
+                    <field name="subject_template" />
                 </tree>
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_mail_notification_custom_subject_tree_all">
+        <record
+            model="ir.actions.act_window"
+            id="action_mail_notification_custom_subject_tree_all"
+        >
             <field name="name">Subject Replacement Templates</field>
             <field name="res_model">mail.message.custom.subject</field>
             <field name="view_type">form</field>
@@ -43,8 +49,12 @@
             <field name="view_id" ref="mail_notification_custom_subject_tree" />
         </record>
 
-        <menuitem id="menu_mail_notification_custom_subject" parent="base.menu_email" action="action_mail_notification_custom_subject_tree_all"
-                  sequence="21"/>
+        <menuitem
+            id="menu_mail_notification_custom_subject"
+            parent="base.menu_email"
+            action="action_mail_notification_custom_subject_tree_all"
+            sequence="21"
+        />
 
     </data>
 </odoo>
diff --git a/setup/mail_notification_custom_subject/odoo/addons/mail_notification_custom_subject b/setup/mail_notification_custom_subject/odoo/addons/mail_notification_custom_subject
new file mode 120000
index 000000000..5212ccad7
--- /dev/null
+++ b/setup/mail_notification_custom_subject/odoo/addons/mail_notification_custom_subject
@@ -0,0 +1 @@
+../../../../mail_notification_custom_subject
\ No newline at end of file
diff --git a/setup/mail_notification_custom_subject/setup.py b/setup/mail_notification_custom_subject/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/mail_notification_custom_subject/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 4ee88141b598ea3704e05b31378ee62592bfb63c Mon Sep 17 00:00:00 2001
From: Carlos Roca <carlos.roca@tecnativa.com>
Date: Tue, 16 Feb 2021 08:54:52 +0100
Subject: [PATCH 3/3] [MIG] mail_notification_custom_subject: Migration to
 v13.0

---
 mail_notification_custom_subject/README.rst   |  13 +--
 .../__manifest__.py                           |   2 +-
 .../i18n/es_ES.po                             | 100 +++++++++++++++---
 .../i18n/mail_notification_custom_subject.pot |  25 ++---
 .../models/mail_message_custom_subject.py     |   8 +-
 .../readme/CONFIGURE.rst                      |   2 +-
 .../readme/CONTRIBUTORS.rst                   |   1 +
 .../static/description/index.html             |  11 +-
 .../test_mail_notification_custom_subject.py  |  14 +--
 ...mail_notification_custom_subject_views.xml |   1 -
 10 files changed, 119 insertions(+), 58 deletions(-)

diff --git a/mail_notification_custom_subject/README.rst b/mail_notification_custom_subject/README.rst
index 4aa642643..b6a9ecbe7 100644
--- a/mail_notification_custom_subject/README.rst
+++ b/mail_notification_custom_subject/README.rst
@@ -14,13 +14,13 @@ Mail Notification Custom Subject
     :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/12.0/mail_notification_custom_subject
+    :target: https://github.com/OCA/social/tree/13.0/mail_notification_custom_subject
     :alt: OCA/social
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/social-12-0/social-12-0-mail_notification_custom_subject
+    :target: https://translation.odoo-community.org/projects/social-13-0/social-13-0-mail_notification_custom_subject
     :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/12.0
+    :target: https://runbot.odoo-community.org/runbot/205/13.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -42,7 +42,7 @@ Configuration
 * Create a new template.
 
     * The field **Model** specifies the model to which the subject template should apply in the notification emails sent by Odoo.
-    * The field **Subject Template** accepts `Jinjah<ttps://jinja.palletsprojects.com/en/2.11.x/>` expressions.
+    * The field **Subject Template** accepts `Jinja <https://jinja.palletsprojects.com/en/2.11.x/>`__ expressions.
     * The field **Replace** specifies if the template should replace existing content or append to it.
 
 Usage
@@ -60,7 +60,7 @@ Bug Tracker
 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 smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/social/issues/new?body=module:%20mail_notification_custom_subject%0Aversion:%2012.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_notification_custom_subject%0Aversion:%2013.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.
 
@@ -79,6 +79,7 @@ Contributors
 
     * Pedro M. Baeza
     * João Marques
+    * Carlos Roca
 
 Maintainers
 ~~~~~~~~~~~
@@ -101,6 +102,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-joao-p-marques| 
 
-This module is part of the `OCA/social <https://github.com/OCA/social/tree/12.0/mail_notification_custom_subject>`_ project on GitHub.
+This module is part of the `OCA/social <https://github.com/OCA/social/tree/13.0/mail_notification_custom_subject>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/mail_notification_custom_subject/__manifest__.py b/mail_notification_custom_subject/__manifest__.py
index 7302252f4..10429becc 100644
--- a/mail_notification_custom_subject/__manifest__.py
+++ b/mail_notification_custom_subject/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Mail Notification Custom Subject",
     "summary": "Apply a custom subject to mail notifications",
-    "version": "12.0.1.0.0",
+    "version": "13.0.1.0.0",
     "category": "Social Network",
     "website": "https://github.com/OCA/social",
     "author": "Tecnativa, Odoo Community Association (OCA)",
diff --git a/mail_notification_custom_subject/i18n/es_ES.po b/mail_notification_custom_subject/i18n/es_ES.po
index a1147e83c..2fc3d8452 100644
--- a/mail_notification_custom_subject/i18n/es_ES.po
+++ b/mail_notification_custom_subject/i18n/es_ES.po
@@ -6,39 +6,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-05 09:11+0000\n"
-"PO-Revision-Date: 2021-01-05 09:17+0000\n"
+"POT-Creation-Date: 2021-02-16 10:56+0000\n"
+"PO-Revision-Date: 2021-02-16 11:56+0100\n"
+"Last-Translator: Carlos <carlos.roca@tecnativa.com>\n"
 "Language-Team: \n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.2\n"
-"Last-Translator: \n"
-"Language: es_ES\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #. module: mail_notification_custom_subject
-#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:150
-#, python-format
+#: model:ir.model.fields.selection,name:mail_notification_custom_subject.selection__mail_message_custom_subject__position__append_after
 msgid "Append After"
 msgstr "Añadir después"
 
 #. module: mail_notification_custom_subject
-#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:149
-#, python-format
+#: model:ir.model.fields.selection,name:mail_notification_custom_subject.selection__mail_message_custom_subject__position__append_before
 msgid "Append Before"
 msgstr "Añadir antes"
 
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__subtype_ids
+msgid "Applied Subtypes"
+msgstr "Subtipos aplicados"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__create_date
+msgid "Created on"
+msgstr "Creado el"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__display_name
+msgid "Display Name"
+msgstr "Nombre mostrado"
+
 #. module: mail_notification_custom_subject
 #: model:ir.model,name:mail_notification_custom_subject.model_mail_thread
 msgid "Email Thread"
 msgstr "Hilo de correo electrónico"
 
 #. module: mail_notification_custom_subject
-#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:238
-#, python-format
-msgid "Failed to render template %r using values %r"
-msgstr "Error al procesar la plantilla %r usando los valores %r"
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__id
+msgid "ID"
+msgstr "ID"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject____last_update
+msgid "Last Modified on"
+msgstr "Última modificación el"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__write_uid
+msgid "Last Updated by"
+msgstr "Última modificación por"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__write_date
+msgid "Last Updated on"
+msgstr "Última actualización el"
 
 #. module: mail_notification_custom_subject
 #: model:ir.model,name:mail_notification_custom_subject.model_mail_message_custom_subject
@@ -46,12 +78,27 @@ msgid "Mail Message Custom Subject"
 msgstr "Asunto Personalizado en Mensaje de Correo"
 
 #. module: mail_notification_custom_subject
-#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:151
-#, python-format
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__model_id
+msgid "Model"
+msgstr "Modelo"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,help:mail_notification_custom_subject.field_mail_message_custom_subject__model_id
+msgid "Model where this template applies"
+msgstr "Modelo en el que se aplica la plantilla"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__position
+msgid "Position"
+msgstr "Posición"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields.selection,name:mail_notification_custom_subject.selection__mail_message_custom_subject__position__replace
 msgid "Replace"
 msgstr "Sustituir"
 
 #. module: mail_notification_custom_subject
+#: model:ir.model.fields,help:mail_notification_custom_subject.field_mail_message_custom_subject__subject_template
 #: model_terms:ir.ui.view,arch_db:mail_notification_custom_subject.mail_notification_custom_subject_form
 msgid "Subject (placeholders may be used here)"
 msgstr "Asunto (se pueden utilizar aquí expresiones de campos)"
@@ -63,7 +110,30 @@ msgstr "Asunto (se pueden utilizar aquí expresiones de campos)"
 msgid "Subject Replacement Templates"
 msgstr "Plantillas de Sustitución de Asuntos"
 
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__subject_template
+#, fuzzy
+#| msgid "Subject Replacement Templates"
+msgid "Subject Template"
+msgstr "Plantillas de Sustitución de Asuntos"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,field_description:mail_notification_custom_subject.field_mail_message_custom_subject__name
+#, fuzzy
+#| msgid "Templates"
+msgid "Template Name"
+msgstr "Plantillas"
+
 #. module: mail_notification_custom_subject
 #: model_terms:ir.ui.view,arch_db:mail_notification_custom_subject.mail_notification_custom_subject_tree
 msgid "Templates"
 msgstr "Plantillas"
+
+#. module: mail_notification_custom_subject
+#: model:ir.model.fields,help:mail_notification_custom_subject.field_mail_message_custom_subject__position
+msgid ""
+"Whether to replace, append at beggining or append at end to other templates "
+"that apply to a given context"
+msgstr ""
+"Ya sea para reemplazar, agregar al principio o agregar al final a otras "
+"plantillas que se aplican a un contexto determinado"
diff --git a/mail_notification_custom_subject/i18n/mail_notification_custom_subject.pot b/mail_notification_custom_subject/i18n/mail_notification_custom_subject.pot
index 5b48b0882..727880906 100644
--- a/mail_notification_custom_subject/i18n/mail_notification_custom_subject.pot
+++ b/mail_notification_custom_subject/i18n/mail_notification_custom_subject.pot
@@ -1,12 +1,14 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* mail_notification_custom_subject
+# 	* mail_notification_custom_subject
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2021-02-16 10:56+0000\n"
+"PO-Revision-Date: 2021-02-16 10:56+0000\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14,16 +16,12 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: mail_notification_custom_subject
-#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:31
-#: selection:mail.message.custom.subject,position:0
-#, python-format
+#: model:ir.model.fields.selection,name:mail_notification_custom_subject.selection__mail_message_custom_subject__position__append_after
 msgid "Append After"
 msgstr ""
 
 #. module: mail_notification_custom_subject
-#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:30
-#: selection:mail.message.custom.subject,position:0
-#, python-format
+#: model:ir.model.fields.selection,name:mail_notification_custom_subject.selection__mail_message_custom_subject__position__append_before
 msgid "Append Before"
 msgstr ""
 
@@ -93,9 +91,7 @@ msgid "Position"
 msgstr ""
 
 #. module: mail_notification_custom_subject
-#: code:addons/mail_notification_custom_subject/models/mail_message_custom_subject.py:32
-#: selection:mail.message.custom.subject,position:0
-#, python-format
+#: model:ir.model.fields.selection,name:mail_notification_custom_subject.selection__mail_message_custom_subject__position__replace
 msgid "Replace"
 msgstr ""
 
@@ -129,6 +125,7 @@ msgstr ""
 
 #. module: mail_notification_custom_subject
 #: model:ir.model.fields,help:mail_notification_custom_subject.field_mail_message_custom_subject__position
-msgid "Whether to replace, append at beggining or append at end to other templates that apply to a given context"
+msgid ""
+"Whether to replace, append at beggining or append at end to other templates "
+"that apply to a given context"
 msgstr ""
-
diff --git a/mail_notification_custom_subject/models/mail_message_custom_subject.py b/mail_notification_custom_subject/models/mail_message_custom_subject.py
index 60a713a54..5aaeeccc1 100644
--- a/mail_notification_custom_subject/models/mail_message_custom_subject.py
+++ b/mail_notification_custom_subject/models/mail_message_custom_subject.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Tecnativa - João Marques
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import _, fields, models
+from odoo import fields, models
 
 
 class MailMessageCustomSubject(models.Model):
@@ -25,9 +25,9 @@ class MailMessageCustomSubject(models.Model):
     )
     position = fields.Selection(
         selection=[
-            ("append_before", _("Append Before")),
-            ("append_after", _("Append After")),
-            ("replace", _("Replace")),
+            ("append_before", "Append Before"),
+            ("append_after", "Append After"),
+            ("replace", "Replace"),
         ],
         string="Position",
         default="replace",
diff --git a/mail_notification_custom_subject/readme/CONFIGURE.rst b/mail_notification_custom_subject/readme/CONFIGURE.rst
index 86bed07b4..c777ed3ae 100644
--- a/mail_notification_custom_subject/readme/CONFIGURE.rst
+++ b/mail_notification_custom_subject/readme/CONFIGURE.rst
@@ -4,5 +4,5 @@
 * Create a new template.
 
     * The field **Model** specifies the model to which the subject template should apply in the notification emails sent by Odoo.
-    * The field **Subject Template** accepts `Jinjah<ttps://jinja.palletsprojects.com/en/2.11.x/>` expressions.
+    * The field **Subject Template** accepts `Jinja <https://jinja.palletsprojects.com/en/2.11.x/>`__ expressions.
     * The field **Replace** specifies if the template should replace existing content or append to it.
diff --git a/mail_notification_custom_subject/readme/CONTRIBUTORS.rst b/mail_notification_custom_subject/readme/CONTRIBUTORS.rst
index b0f16877f..e7d295ba9 100644
--- a/mail_notification_custom_subject/readme/CONTRIBUTORS.rst
+++ b/mail_notification_custom_subject/readme/CONTRIBUTORS.rst
@@ -2,3 +2,4 @@
 
     * Pedro M. Baeza
     * João Marques
+    * Carlos Roca
diff --git a/mail_notification_custom_subject/static/description/index.html b/mail_notification_custom_subject/static/description/index.html
index 21bf700d9..2b7021dbd 100644
--- a/mail_notification_custom_subject/static/description/index.html
+++ b/mail_notification_custom_subject/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Mail Notification Custom Subject</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/social/tree/12.0/mail_notification_custom_subject"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/social-12-0/social-12-0-mail_notification_custom_subject"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/205/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/social/tree/13.0/mail_notification_custom_subject"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/social-13-0/social-13-0-mail_notification_custom_subject"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/205/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to specify templates to override the subject on the notification
 emails sent by Odoo</p>
 <p><strong>Table of contents</strong></p>
@@ -395,7 +395,7 @@ emails sent by Odoo</p>
 <blockquote>
 <ul class="simple">
 <li>The field <strong>Model</strong> specifies the model to which the subject template should apply in the notification emails sent by Odoo.</li>
-<li>The field <strong>Subject Template</strong> accepts <cite>Jinjah&lt;ttps://jinja.palletsprojects.com/en/2.11.x/&gt;</cite> expressions.</li>
+<li>The field <strong>Subject Template</strong> accepts <a class="reference external" href="https://jinja.palletsprojects.com/en/2.11.x/">Jinja</a> expressions.</li>
 <li>The field <strong>Replace</strong> specifies if the template should replace existing content or append to it.</li>
 </ul>
 </blockquote>
@@ -416,7 +416,7 @@ emails sent by Odoo</p>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/social/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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mail_notification_custom_subject%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mail_notification_custom_subject%0Aversion:%2013.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">
@@ -435,6 +435,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <ul class="simple">
 <li>Pedro M. Baeza</li>
 <li>João Marques</li>
+<li>Carlos Roca</li>
 </ul>
 </blockquote>
 </li>
@@ -449,7 +450,7 @@ mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" href="https://github.com/joao-p-marques"><img alt="joao-p-marques" src="https://github.com/joao-p-marques.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/12.0/mail_notification_custom_subject">OCA/social</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/13.0/mail_notification_custom_subject">OCA/social</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/mail_notification_custom_subject/tests/test_mail_notification_custom_subject.py b/mail_notification_custom_subject/tests/test_mail_notification_custom_subject.py
index dfd672e31..e9a89967d 100644
--- a/mail_notification_custom_subject/tests/test_mail_notification_custom_subject.py
+++ b/mail_notification_custom_subject/tests/test_mail_notification_custom_subject.py
@@ -6,20 +6,12 @@ from odoo.tests import common
 
 class TestMailNotificationCustomSubject(common.TransactionCase):
     def setUp(self):
-        super(TestMailNotificationCustomSubject, self).setUp()
+        super().setUp()
         self.partner_1 = self.env["res.partner"].create(
-            {
-                "name": "Test partner 1",
-                "supplier": True,
-                "email": "partner1@example.com",
-            }
+            {"name": "Test partner 1", "email": "partner1@example.com"}
         )
         self.partner_2 = self.env["res.partner"].create(
-            {
-                "name": "Test partner 2",
-                "supplier": True,
-                "email": "partner2@example.com",
-            }
+            {"name": "Test partner 2", "email": "partner2@example.com"}
         )
 
     def test_email_subject_template_overrides(self):
diff --git a/mail_notification_custom_subject/views/mail_notification_custom_subject_views.xml b/mail_notification_custom_subject/views/mail_notification_custom_subject_views.xml
index e2b333002..14ecd80d6 100644
--- a/mail_notification_custom_subject/views/mail_notification_custom_subject_views.xml
+++ b/mail_notification_custom_subject/views/mail_notification_custom_subject_views.xml
@@ -44,7 +44,6 @@
         >
             <field name="name">Subject Replacement Templates</field>
             <field name="res_model">mail.message.custom.subject</field>
-            <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
             <field name="view_id" ref="mail_notification_custom_subject_tree" />
         </record>