do not store aggregated documents in Email document to avoid duplicate data.

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml

@@ -83,6 +83,17 @@ mail_message = context.Base_createMailMessageAsString(from_url,\n
 event.sendMailHostMessage(mail_message)\n
 \n
 if not event.hasData():\n
+  if len(embedded_file_list):\n
+    # do not store aggregated documents in Email document\n
+    # to avoid duplicate data\n
+    tmp_mail_message = context.Base_createMailMessageAsString(from_url,\n
+      to_url,\n
+      subject,\n
+      body,\n
+      content_type,\n
+      attachment_list=attachment_list)\n
+    event.setData(tmp_mail_message)\n
+  else:\n
     event.setData(mail_message)\n
 </string> </value>
         </item>

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_send.xml

@@ -110,7 +110,18 @@ if download or not use_activity:\n
       attachment_list=attachment_list,\n
       embedded_file_list=embedded_file_list)\n
 \n
-    context.edit(data=mail_message)\n
+    if len(embedded_file_list):\n
+      # do not store aggregated documents in Email document\n
+      # to avoid duplicate data\n
+      tmp_mail_message = context.Base_createMailMessageAsString(from_url,\n
+        to_url,\n
+        subject,\n
+        body,\n
+        content_type,\n
+        attachment_list=attachment_list)\n
+      context.setData(tmp_mail_message)\n
+    else:\n
+      context.setData(mail_message)\n
     if not use_activity:\n
       context.activate(activity=\'SQLQueue\').sendMailHostMessage(mail_message)\n
 \n

bt5/erp5_base/bt/revision

-1041
+1042
\ No newline at end of file

product/ERP5/Document/EmailDocument.py

@@ -665,6 +665,7 @@ class EmailDocument(TextDocument):
     if attachment_list is None:
       attachment_list = []
     document_type_list = self.getPortalDocumentTypeList()
+    embedded_attachment_list = []
     for attachment in self.getAggregateValueList():
       mime_type = None
       content = None
@@ -704,7 +705,7 @@ class EmailDocument(TextDocument):
       if not isinstance(content, str):
         content = str(content)
 
-      attachment_list.append({'mime_type':mime_type,
+      embedded_attachment_list.append({'mime_type':mime_type,
                               'content':content,
                               'name':attachment.getReference()}
                              )
@@ -713,13 +714,23 @@ class EmailDocument(TextDocument):
     for to_url in to_url_list:
       mime_message = buildEmailMessage(from_url=from_url, to_url=to_url,
                                        msg=body, subject=subject,
-                                       attachment_list=attachment_list,
+                                       attachment_list=(attachment_list + embedded_attachment_list),
                                        additional_headers=additional_headers)
       mail_message = mime_message.as_string()
       self.activate(activity='SQLQueue').sendMailHostMessage(mail_message)
 
     # Save one of mail messages.
     if mail_message is not None:
+      if len(embedded_attachment_list):
+        # do not store aggregated documents in Email document
+        # to avoid duplicate data
+        tmp_mime_message = buildEmailMessage(from_url=from_url, to_url=to_url,
+                                             msg=body, subject=subject,
+                                             attachment_list=attachment_list,
+                                             additional_headers=additional_headers)
+        tmp_mail_message = mime_message.as_string()
+        self.setData(tmp_mail_message)
+      else:
         self.setData(mail_message)
 
     # Only for debugging purpose