diff --git a/mail_template_multi_attachment/README.rst b/mail_template_multi_attachment/README.rst
new file mode 100644
index 000000000..144215a50
--- /dev/null
+++ b/mail_template_multi_attachment/README.rst
@@ -0,0 +1,88 @@
+==============================
+Mail template multi attachment
+==============================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github
+    :target: https://github.com/OCA/social/tree/13.0/mail_template_multi_attachment
+    :alt: OCA/social
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/social-13-0/social-13-0-mail_template_multi_attachment
+    :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/13.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module add possibility to generate more than one attachment into your email template.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+Just go on an email template and set attachments into "Attachments" tab.
+
+You can fill the "Simple attachment" if you need only 1 document (like Odoo standard).
+You can also fill "Multi attachments" section if you need to add more document generation.
+
+You can fill only "Multi attachments" section and let empty "Simple attachment" if you want.
+
+Usage
+=====
+
+You just have to use your email template like usual. New attachments will be generated automatically with the email content.
+
+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_template_multi_attachment%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* ACSONE SA/NV
+
+Contributors
+~~~~~~~~~~~~
+
+* François Honoré <francois.honore@acsone.eu>
+
+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.
+
+This module is part of the `OCA/social <https://github.com/OCA/social/tree/13.0/mail_template_multi_attachment>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/mail_template_multi_attachment/__init__.py b/mail_template_multi_attachment/__init__.py
new file mode 100644
index 000000000..0650744f6
--- /dev/null
+++ b/mail_template_multi_attachment/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/mail_template_multi_attachment/__manifest__.py b/mail_template_multi_attachment/__manifest__.py
new file mode 100644
index 000000000..c17a8816d
--- /dev/null
+++ b/mail_template_multi_attachment/__manifest__.py
@@ -0,0 +1,17 @@
+# Copyright 2021 ACSONE SA/NV (<http://acsone.eu>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+{
+    "name": "Mail template multi attachment",
+    "summary": """Module who allows to generate multi attachments on
+    an email template.""",
+    "version": "13.0.1.0.0",
+    "license": "AGPL-3",
+    "author": "ACSONE SA/NV, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/social",
+    "depends": ["mail"],
+    "data": [
+        "security/mail_template_report.xml",
+        "views/mail_template_report.xml",
+        "views/mail_template.xml",
+    ],
+}
diff --git a/mail_template_multi_attachment/models/__init__.py b/mail_template_multi_attachment/models/__init__.py
new file mode 100644
index 000000000..ad0aed850
--- /dev/null
+++ b/mail_template_multi_attachment/models/__init__.py
@@ -0,0 +1,4 @@
+# Copyright 2021 ACSONE SA/NV (<http://acsone.eu>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import mail_template
+from . import mail_template_report
diff --git a/mail_template_multi_attachment/models/mail_template.py b/mail_template_multi_attachment/models/mail_template.py
new file mode 100644
index 000000000..eeac56597
--- /dev/null
+++ b/mail_template_multi_attachment/models/mail_template.py
@@ -0,0 +1,59 @@
+# Copyright 2021 ACSONE SA/NV (<http://acsone.eu>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+import base64
+
+from odoo import _, exceptions, fields, models
+
+
+class MailTemplate(models.Model):
+    _inherit = "mail.template"
+
+    template_report_ids = fields.One2many(
+        comodel_name="mail.template.report", inverse_name="mail_template_id",
+    )
+
+    # pylint: disable=redefined-outer-name
+    def generate_email(self, res_ids, fields=None):
+        """
+        Inherit to generate attachments.
+        Inspired from original mail.template,generate_email(...) from Odoo.
+        :param res_ids: int or list of int
+        :param fields:
+        :return: dict
+        """
+        self.ensure_one()
+        multi_mode = True
+        results = super(MailTemplate, self).generate_email(res_ids, fields=fields)
+        if not self.template_report_ids:
+            return results
+        if isinstance(res_ids, int):
+            multi_mode = False
+            results = {res_ids: results}
+        # Generate attachments (inspired from Odoo); Just add new attachments
+        # into 'attachments' key
+        for res_id, values in results.items():
+            attachments = values.setdefault("attachments", [])
+            for template_report in self.template_report_ids:
+                report_name = self._render_template(
+                    template_report.report_name, template_report.model, res_id
+                )
+                report = template_report.report_template_id
+                report_service = report.report_name
+
+                if report.report_type in ["qweb-html", "qweb-pdf"]:
+                    result, report_format = report.render_qweb_pdf([res_id])
+                else:
+                    res = report.render([res_id])
+                    if not res:
+                        raise exceptions.UserError(
+                            _("Unsupported report type %s found.") % report.report_type
+                        )
+                    result, report_format = res
+                result = base64.b64encode(result)
+                if not report_name:
+                    report_name = "report." + report_service
+                ext = "." + report_format
+                if not report_name.endswith(ext):
+                    report_name += ext
+                attachments.append((report_name, result))
+        return multi_mode and results or results[res_ids]
diff --git a/mail_template_multi_attachment/models/mail_template_report.py b/mail_template_multi_attachment/models/mail_template_report.py
new file mode 100644
index 000000000..19efd451c
--- /dev/null
+++ b/mail_template_multi_attachment/models/mail_template_report.py
@@ -0,0 +1,27 @@
+# Copyright 2021 ACSONE SA/NV (<http://acsone.eu>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from odoo import fields, models
+
+
+class MailTemplateReport(models.Model):
+    """
+    Model used to define dynamic report generation on email template
+    """
+
+    _name = "mail.template.report"
+    _description = "Mail template report"
+
+    mail_template_id = fields.Many2one(
+        comodel_name="mail.template",
+        string="Mail template",
+        required=True,
+        ondelete="cascade",
+    )
+    model = fields.Char(related="mail_template_id.model", store=True)
+    report_template_id = fields.Many2one(
+        comodel_name="ir.actions.report",
+        string="Report",
+        required=True,
+        ondelete="cascade",
+    )
+    report_name = fields.Char(translate=True)
diff --git a/mail_template_multi_attachment/readme/CONFIGURE.rst b/mail_template_multi_attachment/readme/CONFIGURE.rst
new file mode 100644
index 000000000..976acf6f7
--- /dev/null
+++ b/mail_template_multi_attachment/readme/CONFIGURE.rst
@@ -0,0 +1,6 @@
+Just go on an email template and set attachments into "Attachments" tab.
+
+You can fill the "Simple attachment" if you need only 1 document (like Odoo standard).
+You can also fill "Multi attachments" section if you need to add more document generation.
+
+You can fill only "Multi attachments" section and let empty "Simple attachment" if you want.
diff --git a/mail_template_multi_attachment/readme/CONTRIBUTORS.rst b/mail_template_multi_attachment/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000..ab1764c1c
--- /dev/null
+++ b/mail_template_multi_attachment/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* François Honoré <francois.honore@acsone.eu>
diff --git a/mail_template_multi_attachment/readme/DESCRIPTION.rst b/mail_template_multi_attachment/readme/DESCRIPTION.rst
new file mode 100644
index 000000000..8cfce7ef2
--- /dev/null
+++ b/mail_template_multi_attachment/readme/DESCRIPTION.rst
@@ -0,0 +1 @@
+This module add possibility to generate more than one attachment into your email template.
diff --git a/mail_template_multi_attachment/readme/USAGE.rst b/mail_template_multi_attachment/readme/USAGE.rst
new file mode 100644
index 000000000..da0954826
--- /dev/null
+++ b/mail_template_multi_attachment/readme/USAGE.rst
@@ -0,0 +1 @@
+You just have to use your email template like usual. New attachments will be generated automatically with the email content.
diff --git a/mail_template_multi_attachment/security/mail_template_report.xml b/mail_template_multi_attachment/security/mail_template_report.xml
new file mode 100644
index 000000000..686112970
--- /dev/null
+++ b/mail_template_multi_attachment/security/mail_template_report.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2021 ACSONE SA/NV
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+  <record model="ir.model.access" id="mail_template_report_system">
+    <field name="name">mail.template.report.system</field>
+    <field name="model_id" ref="model_mail_template_report" />
+    <field name="group_id" ref="base.group_system" />
+    <field name="perm_read" eval="1" />
+    <field name="perm_create" eval="1" />
+    <field name="perm_write" eval="1" />
+    <field name="perm_unlink" eval="1" />
+  </record>
+  <record model="ir.model.access" id="mail_template_report_user">
+    <field name="name">mail.template.report.user</field>
+    <field name="model_id" ref="model_mail_template_report" />
+    <field name="group_id" ref="base.group_user" />
+    <field name="perm_read" eval="1" />
+    <field name="perm_create" eval="1" />
+    <field name="perm_write" eval="1" />
+    <field name="perm_unlink" eval="0" />
+  </record>
+</odoo>
diff --git a/mail_template_multi_attachment/static/description/index.html b/mail_template_multi_attachment/static/description/index.html
new file mode 100644
index 000000000..3f4ccb8ab
--- /dev/null
+++ b/mail_template_multi_attachment/static/description/index.html
@@ -0,0 +1,432 @@
+<?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.14: http://docutils.sourceforge.net/" />
+<title>Mail template multi attachment</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-template-multi-attachment">
+<h1 class="title">Mail template multi attachment</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="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.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_template_multi_attachment"><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_template_multi_attachment"><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 add possibility to generate more than one attachment into your email template.</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>
+<p>Just go on an email template and set attachments into “Attachments” tab.</p>
+<p>You can fill the “Simple attachment” if you need only 1 document (like Odoo standard).
+You can also fill “Multi attachments” section if you need to add more document generation.</p>
+<p>You can fill only “Multi attachments” section and let empty “Simple attachment” if you want.</p>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<p>You just have to use your email template like usual. New attachments will be generated automatically with the email content.</p>
+</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_template_multi_attachment%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">
+<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>ACSONE SA/NV</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<ul class="simple">
+<li>François Honoré &lt;<a class="reference external" href="mailto:francois.honore&#64;acsone.eu">francois.honore&#64;acsone.eu</a>&gt;</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>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/13.0/mail_template_multi_attachment">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_template_multi_attachment/tests/__init__.py b/mail_template_multi_attachment/tests/__init__.py
new file mode 100644
index 000000000..6302d7cd9
--- /dev/null
+++ b/mail_template_multi_attachment/tests/__init__.py
@@ -0,0 +1,3 @@
+# Copyright 2021 ACSONE SA/NV (<http://acsone.eu>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import test_mail_template
diff --git a/mail_template_multi_attachment/tests/test_mail_template.py b/mail_template_multi_attachment/tests/test_mail_template.py
new file mode 100644
index 000000000..f31c1203a
--- /dev/null
+++ b/mail_template_multi_attachment/tests/test_mail_template.py
@@ -0,0 +1,67 @@
+# Copyright 2021 ACSONE SA/NV (<http://acsone.eu>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from odoo.tests.common import SavepointCase
+
+
+class TestMailTemplate(SavepointCase):
+    """
+    Tests for mail.template
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
+        cls.MailTemplate = cls.env["mail.template"]
+        cls.partner = cls.env.ref("base.res_partner_12")
+        cls.report1 = cls.env.ref("base.report_ir_model_overview")
+        cls.report2 = cls.env.ref("base.report_ir_model_overview").copy(
+            {"name": cls.report1.name + " Test copy"}
+        )
+        mail_tmpl_values = {
+            "name": "TestTemplate",
+            "subject": "About ${object.name}",
+            "body_html": "<p>Hello ${object.name}</p>",
+            "model_id": cls.env["ir.model"]._get(cls.report1.model).id,
+            "user_signature": False,
+            "report_template": cls.report1.id,
+            "report_name": "Report 1",
+            "template_report_ids": [
+                (
+                    0,
+                    False,
+                    {"report_template_id": cls.report2.id, "report_name": "Report 2"},
+                ),
+            ],
+        }
+        cls.mail_template = cls.MailTemplate.create(mail_tmpl_values)
+
+    def test_multi_generation1(self):
+        """
+        Ensure number of attachment match with what's setup on mail template.
+        Don't check the content of the attachment, it's not the purpose
+        of this module.
+        :return:
+        """
+        results = self.mail_template.generate_email(self.partner.id)
+        self.assertEqual(2, len(results.get("attachments")))
+
+    def test_multi_generation2(self):
+        """
+        Ensure the mail generation (standard) still working even without
+        template_report_ids
+        :return:
+        """
+        self.mail_template.write({"template_report_ids": [(6, False, [])]})
+        results = self.mail_template.generate_email(self.partner.id)
+        self.assertEqual(1, len(results.get("attachments")))
+
+    def test_multi_generation3(self):
+        """
+        Ensure the mail generation with only template_report_ids filled
+        works
+        :return:
+        """
+        self.mail_template.write({"report_template": False, "report_name": False})
+        results = self.mail_template.generate_email(self.partner.id)
+        self.assertEqual(1, len(results.get("attachments")))
diff --git a/mail_template_multi_attachment/views/mail_template.xml b/mail_template_multi_attachment/views/mail_template.xml
new file mode 100644
index 000000000..ad57070dc
--- /dev/null
+++ b/mail_template_multi_attachment/views/mail_template.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2021 ACSONE SA/NV
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+  <record model="ir.ui.view" id="mail_template_form_view">
+    <field name="name">mail.template.form (in mail_template_multi_attachment)</field>
+    <field name="model">mail.template</field>
+    <field name="inherit_id" ref="mail.email_template_form" />
+    <field name="priority" eval="250" />
+    <field name="arch" type="xml">
+      <field name="report_template" position="replace" />
+      <field name="report_name" position="replace" />
+      <notebook position="inside">
+        <page string="Attachments">
+          <group name="simple_attachment" string="Simple attachment">
+            <group>
+              <field name="report_template" domain="[('model','=',model)]" />
+              <field
+                                name="report_name"
+                                attrs="{'invisible':[('report_template','=',False)]}"
+                            />
+            </group>
+            <group />
+          </group>
+          <group name="multi_attachments" string="Multi attachments">
+            <field
+                            name="template_report_ids"
+                            context="{'tree_view_ref': 'mail_template_multi_attachment.mail_template_report_tree_o2m_view', 'default_model': model}"
+                            nolabel="1"
+                            colspan="2"
+                        />
+          </group>
+        </page>
+      </notebook>
+    </field>
+  </record>
+</odoo>
diff --git a/mail_template_multi_attachment/views/mail_template_report.xml b/mail_template_multi_attachment/views/mail_template_report.xml
new file mode 100644
index 000000000..0409dabb8
--- /dev/null
+++ b/mail_template_multi_attachment/views/mail_template_report.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2021 ACSONE SA/NV
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+  <record model="ir.ui.view" id="mail_template_report_form_view">
+    <field name="name">
+      mail.template.report.form (in mail_template_multi_attachment)
+    </field>
+    <field name="model">mail.template.report</field>
+    <field name="arch" type="xml">
+      <form>
+        <sheet>
+          <group>
+            <group>
+              <field name="mail_template_id" />
+              <field name="model" invisible="True" />
+              <field name="report_template_id" domain="[('model','=',model)]" />
+              <field
+                                name="report_name"
+                                attrs="{'invisible':[('report_template_id','=',False)]}"
+                            />
+            </group>
+            <group />
+          </group>
+        </sheet>
+      </form>
+    </field>
+  </record>
+  <record model="ir.ui.view" id="mail_template_report_tree_view">
+    <field name="name">
+      mail.template.report.tree (in mail_template_multi_attachment)
+    </field>
+    <field name="model">mail.template.report</field>
+    <field name="arch" type="xml">
+      <tree>
+        <field name="mail_template_id" />
+        <field name="model" invisible="True" />
+        <field name="report_template_id" domain="[('model','=',model)]" />
+        <field
+                    name="report_name"
+                    attrs="{'invisible':[('report_template_id','=',False)]}"
+                />
+      </tree>
+    </field>
+  </record>
+  <record model="ir.ui.view" id="mail_template_report_tree_o2m_view">
+    <field name="name">
+      mail.template.report.tree (in mail_template_multi_attachment)
+    </field>
+    <field name="model">mail.template.report</field>
+    <field name="arch" type="xml">
+      <tree editable="bottom">
+        <field name="model" invisible="True" />
+        <field name="report_template_id" domain="[('model','=',model)]" />
+        <field
+                    name="report_name"
+                    attrs="{'invisible':[('report_template_id','=',False)]}"
+                />
+      </tree>
+    </field>
+  </record>
+</odoo>