Merge branch '1051275_FixSerialLetter' into '2020.0'

1051275 fix serial letter

See merge request xrm/basic!122

(cherry picked from commit 8c2c0333)

48dc008c [Projekt: Entwicklung - Neon][TicketNr.: 1051275][Serienbrief kann nicht erzeugt werden]
b72eedc6 [Projekt: Entwicklung - Neon][TicketNr.: 1051275][Serienbrief kann nicht erzeugt werden]
1f9e3c17 COmmit, jetzt noch testen

entity/SerialLetter_entity/recordcontainers/db/onDBInsert.js

@@ -14,5 +14,5 @@ var template = DocumentTemplate.fromUpload(bindata);
 
 if (template.content)
 {
-    SingleBinaryUtils.insert("SERIALLETTER", "DOCUMENT", letterId, template.content, template.filename, "");
+    SingleBinaryUtils.insert("SERIALLETTER", "SERIALLETTERFILE", letterId, template.content, template.filename, "");
 }
\ No newline at end of file

process/Bulkmail_lib/process.js

@@ -431,12 +431,18 @@ SerialLetterUtils.buildSerialLetter = function (pSerialLetterId, pRecipientIds)
         contactIdsSelect.and("LETTERRECIPIENT.LETTERRECIPIENTID", pRecipientIds, SqlBuilder.IN());
 
     var contactIds = contactIdsSelect.table();
-    
+    if(template != null){
     return {
-        content : template.getSerialLetterByContactIds(contactIds),
+        content : template.content,
         filename : template.filename,
         title : title
-    };
+    };}
+    else{
+        return{
+            title : title
+}
+
+    }
 }
 
 /**

process/DocumentTemplate_lib/process.js

@@ -256,7 +256,13 @@ DocumentTemplate.loadTemplate = function (pAssignmentRowId, pAssignmentTable, pR
         var template = DocumentTemplateUtils.getTemplate(templateId, pResolveSubtemplates);
         if (template == null)
         {
-            question.showMessage(translate.text("File from this template could not be found anymore. Please go to the template and upload a new file."), question.ERROR, translate.text("Error"));
+            if(vars.getString("$sys.isserver") == "true")
+                throw new Error("loadTemplate: File from this template could not be found anymore. "
+                                + "Please go to the template and upload a new file. TemplateID: '" + templateId + "'")
+            else
+                question.showMessage(translate.text("File from this template could not be found anymore. "
+                                + "Please go to the template and upload a new file."), question.ERROR, translate.text("Error"));
+            
             return null;
         }
     }
@@ -269,7 +275,8 @@ DocumentTemplate.loadTemplate = function (pAssignmentRowId, pAssignmentTable, pR
     var mimeType = templateDocument[0][db.BINARY_MIMETYPE];
     var type = DocumentTemplate.types.fromBinaryMetadata(templateDocument[0]);
     
-    if (pResolveSubtemplates == undefined) pResolveSubtemplates = true;
+    if (pResolveSubtemplates == undefined)
+        pResolveSubtemplates = true;
     
     return new DocumentTemplate(db.getBinaryContent(binaryId, alias), type, filename, pResolveSubtemplates, templateId, mimeType);
 }