Merge branch 'master' of gitlab.adito.de:xrm/basic

entity/Address_entity/Address_entity.aod

@@ -488,6 +488,10 @@
       <name>ContactIds_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityParameter>
+      <name>ReplaceStandardAddress_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Address_entity/recordcontainers/db/onDBInsert.js

+import("system.logging");
 import("KeywordRegistry_basic");
 import("DataPrivacy_lib");
 import("system.vars");
@@ -22,6 +23,6 @@ else if (typeParam === "organisation")
     scopeType = "Organisation"
 
 new StandardObject("Address", vars.get("$local.uid"), scopeType, rowdata["ADDRESS.CONTACT_ID"])
-    .onObjectInsert()
+    .onObjectInsert(vars.exists("$param.ReplaceStandardAddress_param") ? vars.get("$param.ReplaceStandardAddress_param") : undefined)
 
-DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["ADDRESS.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
+DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["ADDRESS.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
\ No newline at end of file

entity/Analyses_entity/entityfields/new_tasks/valueProcess.js

 import("Employee_lib");
 import("system.db");
 import("system.result");
-
-var opentask = db.cell("select count(TASKID) "
-             + " from TASK "
-             + " where STATUS = 'NEW' and EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'");                             
-                                  
-result.string(opentask);
+import("Sql_lib");
+import("KeywordRegistry_basic");
+                     
+var opentask = newSelect("count(TASKID)")
+    .from("TASK")
+    .where("TASK.STATUS", $KeywordRegistry.taskStatus$new())
\ No newline at end of file
+    .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
+    .cell();
+    
+result.string(opentask || 0);
\ No newline at end of file

entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js

+import("KeywordRegistry_basic");
+import("Sql_lib");
 import("Employee_lib");
-import("system.db");
 import("system.neon");
 
-var taskIds = db.table("select TASKID  "
-             + " from TASK "
-             + " where STATUS = 'NEW' and EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'", "Data_alias");
-
+var taskIds = newSelect("TASKID")
+    .from("TASK")
+    .where("TASK.STATUS", $KeywordRegistry.taskStatus$new())
+    .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
+    .arrayColumn();
+    
 neon.openContext("Task", "TaskFilter_view", taskIds, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file

entity/Analyses_entity/entityfields/turnover_forecast/valueProcess.js

@@ -8,7 +8,7 @@ import("system.SQLTYPES")
 
 var forecast = newSelect("sum(VOLUME)")
                 .from("FORECAST")
-                .where("FORECAST.DATE_START", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
+                .where("FORECAST.DATE_START", DateUtils.getCurrentYear(), SqlBuilder.YEAR_EQUALS(), SQLTYPES.INTEGER)
                 .cell();
                                   
-result.string(forecast);
+result.string(forecast || 0);
\ No newline at end of file

entity/Attribute_entity/recordcontainers/jdito/contentProcess.js

@@ -122,11 +122,6 @@ if (fetchUsages) //this query is only necessary in Attribute, not in AttributeRe
     }
 }
 
-
-var sqlSelect = "select AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME, ATTRIBUTE_ACTIVE, DROPDOWNDEFINITION, DROPDOWNFILTER, SORTING, ATTRIBUTE_TYPE, " 
-    + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "ATTRIBUTE_TYPE") //3
-    + ", '', '', '' from AB_ATTRIBUTE"; 
-
 var attributes = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME, ATTRIBUTE_ACTIVE, DROPDOWNDEFINITION, DROPDOWNFILTER, SORTING, ATTRIBUTE_TYPE, " 
                             + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "ATTRIBUTE_TYPE") //3
                             + ", '', '', ''")
@@ -136,7 +131,7 @@ var attributes = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME,
                     .table();
 
 //TODO: attribute name caching like keywords
-var allNames = db.table("select AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME from AB_ATTRIBUTE");
+var allNames = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME").from("AB_ATTRIBUTE").table();
 var attrNameData = {};
 for (let i = 0, l = allNames.length; i < l; i++)
 {

entity/BulkMailAddRecipients_entity/entityfields/bulkmail_id/displayValueProcess.js

 import("system.vars");
 import("Sql_lib");
-import("system.db");
 import("system.result");
 
 if (vars.get("$this.value"))
     result.string(newSelect("NAME")
                     .from("BULKMAIL")
                     .where("BULKMAIL.BULKMAILID", "$this.value")
-                    .buildSql("select NAME from BULKMAIL")
                     .cell());
 else
     result.string("");
\ No newline at end of file

entity/BulkMail_entity/BulkMail_entity.aod

@@ -113,6 +113,7 @@
     </entityConsumer>
     <entityField>
       <name>bindata</name>
+      <title>Custom template</title>
       <contentType>FILE</contentType>
       <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bindata/valueProcess.js</valueProcess>
       <onValueChange>%aditoprj%/entity/BulkMail_entity/entityfields/bindata/onValueChange.js</onValueChange>

entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js

+import("Sql_lib");
 import("system.result");
 import("system.vars");
 
-var resultValue;
-if(vars.get("$param.CampaignId_param") != null && vars.get("$param.CampaignId_param") != "")
-{
-    resultValue = "CAMPAIGN_ID = '" + vars.get("$param.CampaignId_param") + "'";
-    
-    if(vars.get("$param.CampaignStepId_param") != null && vars.get("$param.CampaignStepId_param") != "")
-        resultValue += " AND CAMPAIGNSTEP_ID = '" + vars.get("$param.CampaignStepId_param") + "'";
-    
-    result.string(resultValue);
-}
-else if(vars.get("$param.CampaignStepId_param") != null && vars.get("$param.CampaignStepId_param") != "")
-    {
-        resultValue = "CAMPAIGNSTEP_ID = '" + vars.get("$param.CampaignStepId_param") + "'";
-        result.string(resultValue);
-    }
+var condition = newWhere()
+    .andIfSet("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", "$param.CampaignId_param")
+    .andIfSet("CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID", "$param.CampaignStepId_param");
+
+result.string(condition.toString());
\ No newline at end of file

entity/CampaignStep_entity/entityfields/sorting/valueProcess.js

-import("system.db");
+import("Sql_lib");
 import("system.neon");
 import("system.vars");
 import("system.util");
@@ -7,8 +7,9 @@ import("system.result");
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
     var campaignId = vars.get("$field.CAMPAIGN_ID");
-    var latestSortingQuery = "select COUNT(CAMPAIGNSTEPID) from CAMPAIGNSTEP " + 
-        "where CAMPAIGN_ID = '" + campaignId + "'";
-    var stepCount = db.cell(latestSortingQuery);
+    var stepCount = newSelect("count(CAMPAIGNSTEPID)")
+        .from("CAMPAINGSTEP")
+        .where("CAMPAIGNSTEP.CAMPAIGN_ID", campaignId)
+        .cell();
     result.string(parseInt(stepCount) + 1);
 }
\ No newline at end of file

entity/Campaign_entity/recordcontainers/db/conditionProcess.js

@@ -7,5 +7,5 @@ import("system.vars");
 if(vars.get("$param.ShowOnlyCurrentUsersCampaigns_param") == 'true')
 {
     //TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
-    result.string("CAMPAIGN.EMPLOYEE_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'");
+    result.string(newWhere("CAMPAIGN.EMPLOYEE_CONTACT_ID", EmployeeUtils.getCurrentContactId()).toString());
 }
\ No newline at end of file

entity/Contract_entity/conditionProcess.js

+import("Sql_lib");
 import("system.result");
 import("system.vars");
 
-if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != null && vars.get("$param.ContactId_param") != "")
-    result.string("CONTRACT.CONTACT_ID = ('" + vars.getString("$param.ContactId_param") + "')");  
-else
-    result.string("1 = 1");  
+var condition = newWhere();
+if (vars.exists("$param.ContactId_param"))
+    condition.andIfSet("CONTRACT.CONTACT_ID", "$param.ContactId_param");
+
\ No newline at end of file
+result.string(condition.toString("1=1"));
\ No newline at end of file

entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js

 import("system.vars");
 import("system.result");
 
-if(vars.get("$param.DuplicateScannerId_param"))
-{
-    result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'");
+if (vars.get("$param.DuplicateScannerId_param"))
+    result.string(newWhere("DUPLICATESCANNERINDEXCONFIG.DUPLICATESCANNER_ID", "$param.DuplicateScannerId_param").toString());
\ No newline at end of file
-}
\ No newline at end of file

entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js

 import("system.vars");
 import("system.result");
 
-if(vars.get("$param.DuplicateScannerId_param"))
-{
-    result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'");
+if (vars.get("$param.DuplicateScannerId_param"))
+    result.string(newWhere("DUPLICATESCANNERPREFILTERCONFIG.DUPLICATESCANNER_ID", "$param.DuplicateScannerId_param").toString());
\ No newline at end of file
-}
\ No newline at end of file

entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js

 import("system.vars");
 import("system.result");
 
-if(vars.get("$param.DuplicateScannerId_param"))
-{
-    result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'");
+if (vars.get("$param.DuplicateScannerId_param"))
+    result.string(newWhere("DUPLICATESCANNERRESULTFIELDCONFIG.DUPLICATESCANNER_ID", "$param.DuplicateScannerId_param").toString());
\ No newline at end of file
-}
\ No newline at end of file

entity/Email_entity/Email_entity.aod

@@ -65,6 +65,7 @@
     </entityParameter>
     <entityField>
       <name>bindata</name>
+      <title>Custom template</title>
       <contentType>FILE</contentType>
     </entityField>
     <entityActionField>

entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js

 import("system.result");
 import("system.vars");
 
-var type = vars.get("$field.attributeType");
-var value;
-switch (type)
+var value = vars.get("$this.value");
+if (!value)
 {
-    case "BOOL_VALUE":
-        value = vars.get("$field.BOOL_VALUE");
-        break;
-    case "NUMBER_VALUE":
-        value = vars.get("$field.NUMBER_VALUE");
-        break;
-    case "CHAR_VALUE":
-        value = vars.get("$field.CHAR_VALUE");
-        break;    
-    case "LONG_CHAR_VALUE":
-        value = vars.get("$field.LONG_CHAR_VALUE");
-        break;
-    default: 
-        value = null;
-        break;
+    var type = vars.get("$field.attributeType");
+    switch (type)
+    {
+        case "BOOL_VALUE":
+            value = vars.get("$field.BOOL_VALUE");
+            break;
+        case "NUMBER_VALUE":
+            value = vars.get("$field.NUMBER_VALUE");
+            break;
+        case "CHAR_VALUE":
+            value = vars.get("$field.CHAR_VALUE");
+            break;    
+        case "LONG_CHAR_VALUE":
+            value = vars.get("$field.LONG_CHAR_VALUE");
+            break;
+        default: 
+            value = null;
+            break;
+    }
 }
 
 result.string(value);
\ No newline at end of file

entity/Letter_entity/Letter_entity.aod

@@ -38,6 +38,7 @@
     </entityParameter>
     <entityField>
       <name>bindata</name>
+      <title>Custom template</title>
       <contentType>FILE</contentType>
     </entityField>
     <entityActionField>

entity/Order_entity/entityfields/contact_id/onValueChange.js

+import("Sql_lib");
 import("system.neon");
 import("system.vars");
-import("system.db");
 import("Util_lib");
 import("Entity_lib");
 
 var contactid = vars.get("local.value");
-if(contactid != "")
-{
-    var relData = db.array(db.ROW, "select ISOLANGUAGE from CONTACT where CONTACTID = '" + contactid + "'");
-    
-    if(relData[0] != "")   
-        vars.set("$field.ISOLANGUAGE", relData[0]);
-}
+
+var relData = newSelect("ISOLANGUAGE")
+    .from("CONTACT")
+    .whereIfSet("CONTACT.CONTACTID", contactid)
+    .cell(true);
+
+if(relData)   
+    vars.set("$field.ISOLANGUAGE", relData[0]);
+
 neon.setFieldValue("$field.OBJECT_ROWID", null)
\ No newline at end of file

entity/Organisation_entity/entityfields/countactivity/valueProcess.js

+import("Context_lib");
+import("Sql_lib");
 import("system.result");
 import("system.vars");
-import("system.db");
-var amount = db.cell("select count(ACTIVITYID) from ACTIVITY join ACTIVITYLINK on ACTIVITYLINK.ACTIVITY_ID = ACTIVITY.ACTIVITYID \n\
-                      where ACTIVITYLINK.OBJECT_ROWID = '" + vars.get("$field.CONTACTID") + "' and ACTIVITYLINK.OBJECT_TYPE = 'Organisation'");
 
+var amount = newSelect("count(ACTIVITYID)")
+    .from("ACTIVITY")
+    .join("ACTIVITYLINK", "ACTIVITYLINK.ACTIVITY_ID = ACTIVITY.ACTIVITYID")
+    .where("ACTIVITYLINK.OBJECT_ROWID", "$field.CONTACTID")
+    .and("ACTIVITYLINK.OBJECT_TYPE", ContextUtils.getCurrentContextId())
+    .cell(null, "0");
+    
 result.string(amount);
\ No newline at end of file