diff --git a/addons/account_edi/models/account_payment.py b/addons/account_edi/models/account_payment.py
index ce746c91705..851f44b365d 100644
--- a/addons/account_edi/models/account_payment.py
+++ b/addons/account_edi/models/account_payment.py
@@ -13,3 +13,18 @@ class AccountPayment(models.Model):
     def action_retry_edi_documents_error(self):
         self.ensure_one()
         return self.move_id.action_retry_edi_documents_error()
+
+    ####################################################
+    # Mailing
+    ####################################################
+
+    def _process_attachments_for_template_post(self, mail_template):
+        """ Add Edi attachments to templates. """
+        result = super()._process_attachments_for_template_post(mail_template)
+        for payment in self.filtered('edi_document_ids'):
+            payment_result = result.setdefault(payment.id, {})
+            for edi_doc in payment.edi_document_ids:
+                edi_attachments = edi_doc._filter_edi_attachments_for_mailing()
+                payment_result.setdefault('attachment_ids', []).extend(edi_attachments.get('attachment_ids', []))
+                payment_result.setdefault('attachments', []).extend(edi_attachments.get('attachments', []))
+        return result