Merge branch '2021.0.3' into '2021.1.0'

2021.0.3

See merge request xrm/basic!936

process/Email_lib/process.js

@@ -41,15 +41,19 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
     if (pToRecipients && typeof(pToRecipients) == "string")
         pToRecipients = [pToRecipients];
     
-    var email;
+    var email, retVal, isBinaryExistent;
+    isBinaryExistent = db.getBinaryCount("DOCUMENTTEMPLATE", "DOCUMENT", pTemplateId, SqlUtils.getBinariesAlias(), null);
     
-    if (pTemplateId || (pBindata.bindata != "" && pBindata.bindata != null))
+    if ((pTemplateId && isBinaryExistent > 0) || (pBindata.bindata != "" && pBindata.bindata != null))
     {
         email = Email.fromTemplate(pTemplateId, pRecipientContactId, pBindata, pAdditionalPlaceholders);
         if (!email)
             email = new Email();
     }    
-    else email = new Email();
+    else 
+    {
+        email = new Email();
+    }
     
     email.setSender(pSenderContactId);
     
@@ -72,9 +76,7 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
         email.subject = pSubject;
     }
     
-    var isBinaryExistent = db.getBinaryCount("DOCUMENTTEMPLATE", "DOCUMENT", pTemplateId, SqlUtils.getBinariesAlias(), null);
-    
-    return isBinaryExistent > 0 ? email.downloadEML(pEmailFilename) : [];
+    return email.downloadEML(pEmailFilename);
 }