merged origin/2021.2.1 into 2021.2

entity/ExportTemplate_entity/entityfields/sentenceseparator/dropDownProcess.js

 import("system.translate");
 import("system.result");
 
-result.object([["carriage return and line feed", translate.text("carriage return and line feed")]])
\ No newline at end of file
+result.object([["carriage return and line feed", translate.text("CRLF")]]);
\ No newline at end of file

entity/ExportTemplate_entity/entityfields/sentenceseparator/valueProcess.js

+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string("carriage return and line feed");
+}
\ No newline at end of file

entity/ExportTemplate_entity/entityfields/user_edit/valueProcess.js

+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file

entity/ExportTemplate_entity/entityfields/user_new/valueProcess.js

+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+    result.string(vars.get("$sys.user"));
+}
\ No newline at end of file

entity/ExportTemplate_entity/recordcontainers/db/conditionProcess.js

-import("system.logging");
-import("system.vars");
 import("system.vars");
 import("system.result");
 import("Sql_lib");

entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js

+import("system.result");
+import("Sql_lib");
+var sqlMask = new SqlMaskingUtils();
+
+var sql = sqlMask.concatenate(["'TEXT:'", "EXPORTTEMPLATE.TITLE"]);
+
+result.string(sql.toString());
\ No newline at end of file

entity/Forecast_entity/Forecast_entity.aod

@@ -123,6 +123,10 @@
       <name>KIND</name>
       <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/kind/valueProcess.js</valueProcess>
     </entityField>
+    <entityField>
+      <name>PICTURE</name>
+      <contentType>IMAGE</contentType>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -177,6 +181,10 @@
           <name>KIND.value</name>
           <recordfield>FORECAST.KIND</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PICTURE.value</name>
+          <expression>%aditoprj%/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <linkInformation>
         <linkInformation>

entity/Forecast_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js

+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.result");
+import("Sql_lib");
+
+var sqlMask = new SqlMaskingUtils();
+
+var sql = sqlMask.concatenate(["'TEXT:'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "FORECAST.GROUPCODE")]);
+
+result.string(sql.toString());
\ No newline at end of file

entity/InterestLink_entity/InterestLink_entity.aod

@@ -100,6 +100,10 @@
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
       <stateProcess>%aditoprj%/entity/InterestLink_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityField>
+      <name>PICTURE</name>
+      <contentType>IMAGE</contentType>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -154,6 +158,10 @@
           <name>DATE_NEW.value</name>
           <recordfield>INTERESTLINK.DATE_NEW</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PICTURE.value</name>
+          <expression>%aditoprj%/entity/InterestLink_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <linkInformation>
         <linkInformation>

entity/InterestLink_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js

+import("Product_lib");
+import("Person_lib");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.result");
+import("Sql_lib");
+
+var sqlMask = new SqlMaskingUtils();
+
+var sql = sqlMask.concatenate(["'TEXT:'", "INTEREST.TITLE"]);
+
+result.string(sql.toString());
\ No newline at end of file

entity/KnowledgeDiscussion_entity/entityfields/edit_actiongroup/children/addanswer_action/onActionProcess.js

+import("system.neonFilter");
 import("system.vars");
 import("system.neon");
 
 var params = {
-    "KnowledgeId_param":vars.get("$param.KnowledgeId_param")
-    ,"ParentId_param":vars.get("$field.UID")
-}
+    "KnowledgeId_param": vars.get("$param.KnowledgeId_param"),
+    "ParentId_param": vars.get("$field.UID")
+};
 
-neon.openContext("KnowledgeDiscussion", "KnowledgeDiscussionEdit_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
+neon.openContextWithRecipe("KnowledgeDiscussion", "KnowledgeDiscussionEdit_view", recipe, neon.OPERATINGSTATE_NEW);

entity/LeadLog_entity/grantDeleteProcess.js

 import("system.vars");
 import("system.result");
+import("Entity_lib");
 
 var leadLogId = vars.get("$field.LEADLOGID");
 

entity/Leadimport_entity/entityfields/uploadnewfile/onActionProcess.js

+import("system.neonFilter");
 import("system.neon");
 import("system.vars");
 
-neon.openContext("Leadimport", "LeadimportDocEdit_view", [vars.getString("$field.LEADIMPORTID")], neon.OPERATINGSTATE_EDIT, []);
\ No newline at end of file
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist([vars.getString("$field.LEADIMPORTID")]);
+neon.openContextWithRecipe("Leadimport", "LeadimportDocEdit_view", recipe.toString(), neon.OPERATINGSTATE_EDIT);

entity/Letter_entity/entityfields/downloadletterandcreateactivity/onActionProcess.js

+import("Sql_lib");
 import("system.translate");
 import("Contact_lib");
 import("ActivityTask_lib");
@@ -21,7 +22,10 @@ if (template)
             return Object.assign(new Placeholder(), placeholder);
         });
     }
-    var content = template.setOptions({base64 : true}).getReplacedContentByContactId(contactId, additionalPlaceholders);
+    
+    var locale = newSelect("ISOLANGUAGE").from("CONTACT").where("CONTACT.CONTACTID", contactId).cell();
+
+    var content = template.setOptions({base64 : true}).getReplacedContentByContactId(contactId, additionalPlaceholders, locale);
     if (template.type)
         neon.download(content, template.filename);
 

entity/Letter_entity/onValidation.js

 import("system.vars");
 import("system.translate");
 import("system.result");
+import("DocumentTemplate_lib");
 
-if (!vars.get("$field.bindata") && !vars.get("$field.DOCUMENT_TEMPLATE"))
+var templateId = vars.get("$field.DOCUMENT_TEMPLATE");
+var bindata = vars.get("$field.bindata");
+var upload = new FileUpload(bindata);
+
+var template;
+if (upload.isFilled())
+{
+    template = DocumentTemplate.fromUpload(upload);
+}
+else if (templateId)
+{
+    template = DocumentTemplateUtils.getTemplate(templateId);
+}
+
+if (!bindata && !templateId)
 {
     result.string(translate.text("Please select a documenttemplate or upload a new file."))
+}
+else if (![DocumentTemplate.types.ODT, DocumentTemplate.types.DOCM, DocumentTemplate.types.DOCX].includes(template.type))
+{
+    result.string(translate.text("Only .odt, .docx and .docm files are supported for letters."))
 }
\ No newline at end of file

entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js

@@ -22,7 +22,7 @@ if (vars.exists("$local.idvalues"))
     {
         var groupingInfo = JSON.parse(semiId[0]);
         logSelect.and("AB_LOGHISTORY.USER_NEW", groupingInfo.u);
-        var dateFilterValue = datetime.toLong(groupingInfo.d, "yyyy-MM-dd HH:mm", "UTC"); // #1076044 set tz to prevent time gaps.
+        var dateFilterValue = datetime.toLong(groupingInfo.d, "yyyy-MM-dd HH:mm"); // #1076044 set tz to prevent time gaps. //UTC removed to get the dataset
         logSelect.and("AB_LOGHISTORY.DATE_NEW", dateFilterValue, SqlBuilder.GREATER_OR_EQUAL());
         logSelect.and("AB_LOGHISTORY.DATE_NEW", eMath.addInt(dateFilterValue, datetime.ONE_MINUTE), SqlBuilder.LESS());
     }

entity/MSTeamsMessage_entity/entityfields/importmessages/onActionProcess.js

+import("system.neonFilter");
 import("system.text");
 import("system.translate");
 import("Sql_lib");
@@ -25,10 +26,11 @@ var links = newSelect(["OBJECT_TYPE", "OBJECT_ROWID"])
 var teamName = ContextUtils.loadContentTitle("MSTTeam_entity", vars.get("$param.TeamId_param"));
 var channelName = ContextUtils.loadContentTitle("MSTeamsChannel_entity", vars.get("$param.Channel_param"),
     undefined, undefined, {TeamId_param: vars.get("$param.TeamId_param")});
-neon.openContext("Activity", "ActivityEdit_view", null, neon.OPERATINGSTATE_NEW, {
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
     Info_param: description,
     PresetLinks_param: JSON.stringify(links),
     Direction_param: $KeywordRegistry.activityDirection$internal(),
     Subject_param: translate.text("MS-Teams Message") + " - " + teamName + " - " + channelName,
     Category_param: $KeywordRegistry.activityCategory$mstMessage()
-});
+}).toString();
+neon.openContextWithRecipe("Activity", "ActivityEdit_view", recipe, neon.OPERATINGSTATE_NEW);

entity/MailSignatureDefaultSignature_entity/entityfields/save/onActionProcess.js

+import("system.neonFilter");
 import("system.neon");
 import("Sql_lib");
 import("system.vars");
@@ -19,4 +20,5 @@ newWhere("MAILSIGNATURE.MAILSIGNATUREID", newDefaultSignature)
     });
 vars.set("$global.default_mailsignature", 1);
 
-neon.openContext("Inbox", "InboxMain_view", [vars.get("$param.InboxId_param")], neon.OPERATINGSTATE_VIEW, null);
\ No newline at end of file
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist([vars.get("$param.InboxId_param")]);
+neon.openContextWithRecipe("Inbox", "InboxMain_view", recipe.toString(), neon.OPERATINGSTATE_VIEW);

entity/MailSignature_entity/entityfields/setdefaultsignature/children/setasdefaultsignature/onActionProcess.js

+import("system.neonFilter");
 import("system.vars");
 import("system.neon");
 
 var params = {
-    "InboxId_param" : vars.get("$param.InboxId_param")
-}
+    "InboxId_param": vars.get("$param.InboxId_param")
+};
 
-neon.openContext("MailSignatureDefaultSignature", "MailSignatureDefaultSignatureEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
\ No newline at end of file
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
+neon.openContextWithRecipe("MailSignatureDefaultSignature", "MailSignatureDefaultSignatureEdit_view", recipe, neon.OPERATINGSTATE_VIEW);

entity/Member_entity/entityfields/msteamsactiongroup/children/chooseteam/onActionProcess.js

+import("system.neonFilter");
 import("system.neon");
 import("system.vars");
 import("AttributeRegistry_basic");
 
-neon.openContext("AttributeRelation", null, null, neon.OPERATINGSTATE_NEW, {
+var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
     AttributeId_param: $AttributeRegistry.mstTeam(),
     ObjectType_param: vars.get("$param.ObjectType_param"),
     ObjectRowId_param: vars.get("$param.ObjectRowId_param")
-});
+}).toString();
+neon.openContextWithRecipe("AttributeRelation", null, recipe, neon.OPERATINGSTATE_NEW);