Merge branch '2021.2.0' into '2021.2'

2021.2.0 > 2021.2

See merge request xrm/basic!1380

entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod

@@ -305,6 +305,8 @@
         <dbRecordFieldMapping>
           <name>IS_TEST_RECIPIENT.value</name>
           <recordfield>BULKMAILRECIPIENT.IS_TEST_RECIPIENT</recordfield>
+          <isFilterable v="true" />
+          <isLookupFilter v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>HASCOMMUNICATIONREJECTION.value</name>

entity/DocumentTemplate_entity/DocumentTemplate_entity.aod

@@ -82,8 +82,7 @@
     </entityField>
     <entityConsumer>
       <name>Documents</name>
-      <state>INVISIBLE</state>
-      <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/stateProcess.js</stateProcess>
+      <state>EDITABLE</state>
       <dependency>
         <name>dependency</name>
         <entityName>Document_entity</entityName>

entity/DocumentTemplate_entity/entityfields/documents/stateProcess.js

-import("system.vars");
-import("system.neon");
-import("system.result");
-import("KeywordRegistry_basic")
-
-if( (vars.get("$field.KIND") != $KeywordRegistry.documentTemplateType$mail()) && (vars.get("$field.KIND") != $KeywordRegistry.documentTemplateType$signature()) )
-{
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-}
\ No newline at end of file

entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod

@@ -58,6 +58,7 @@
       <consumer>KeywordMosaicoBaseTemplate</consumer>
       <mandatory v="true" />
       <stateProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/basetemplate/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/basetemplate/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityConsumer>
       <name>KeywordMosaicoBaseTemplate</name>
@@ -157,6 +158,7 @@
       <consumer>KeywordMosaicoTemplateCategory</consumer>
       <groupable v="true" />
       <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/category/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityActionField>
       <name>openAdminView</name>

entity/MosaicoTemplate_entity/entityfields/basetemplate/displayValueProcess.js

+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.mosaicoBaseTemplate(), vars.get("$field.BASETEMPLATE")));
\ No newline at end of file

entity/MosaicoTemplate_entity/entityfields/category/displayValueProcess.js

+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.mosaicoTemplateCategory(), vars.get("$field.CATEGORY")));
\ No newline at end of file

entity/MosaicoTemplate_entity/entityfields/copytemplate/onActionProcess.js

@@ -2,6 +2,6 @@ import("system.vars");
 import("system.neon");
 
 var params = {
-    "copyMosaicoTemplateIdParam" : vars.get("$field.MOSAICOTEMPLATEID")
+    "CopyMosaicoTemplateIdParam" : vars.get("$field.MOSAICOTEMPLATEID")
 };
 neon.openContext("MosaicoTemplate", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file

process/Bulkmail_lib/process.js

@@ -91,7 +91,7 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun, pUser)
 
     useTemplateAttachments = Utils.toBoolean(useTemplateAttachments);
         
-    var template = BulkMailUtils.getBulkMailTemplate(pBulkMailId, templateId, true, useTemplateAttachments, mosaicoTemplateId);
+    var template = BulkMailUtils.getBulkMailTemplate(pBulkMailId, templateId, true, false, useTemplateAttachments, mosaicoTemplateId);
     var recipientData;
     var testRecipientData;
     
@@ -473,7 +473,8 @@ BulkMailUtils.addRecipients = function (pBulkMailId, pContactIds)
             return sqlBuilder.buildInsertStatement({
                 "BULKMAIL_ID": pBulkMailId,
                 "CONTACT_ID": contactId,
-                "STATUS": $KeywordRegistry.bulkMailRecipientStatus$pending(),
+                "STATUS": $KeywordRegistry.bulkMailRecipientStatus$added(),
+                "IS_TEST_RECIPIENT" : 0,
                 "EMAIL_ADDRESS": standardMail
             }, "BULKMAILRECIPIENT", "BULKMAILRECIPIENTID");
         });