merged origin/master into DocumentTemplates

.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTEUSAGE.xml

@@ -422,16 +422,19 @@
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="cf947eee-dc58-40ad-92b0-f30314a8b2a7"/>
       <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="81426072-72e5-4a69-945e-754b7fd0bcf7"/>
       <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="18d77833-d551-405c-8a96-9e99cb4d722d"/>
       <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
@@ -442,7 +445,7 @@
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="1f2749b3-1402-46fb-892a-e68b9a39065d"/>
       <column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
-      <column name="MIN_COUNT" valueNumeric="0"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
@@ -453,7 +456,7 @@
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="140b87a4-4f8e-4ae5-84d5-4bc26fa51901"/>
       <column name="AB_ATTRIBUTE_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
-      <column name="MIN_COUNT" valueNumeric="0"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
@@ -474,11 +477,13 @@
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
       <column name="AB_ATTRIBUTE_ID" value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Product"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="e744c324-27ca-4d91-bf57-c487a904d8d6"/>
       <column name="AB_ATTRIBUTE_ID" value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Product"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
@@ -489,22 +494,26 @@
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="9e9829fe-880d-4b65-b729-34a99b37c5bf"/>
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Person"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="86d385a6-f97f-4868-a65a-9b60940886f0"/>
       <column name="AB_ATTRIBUTE_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Product"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="0766ff88-304d-41a7-8224-642a0aee5587"/>
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
       <column name="AB_ATTRIBUTE_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
       <column name="MIN_COUNT" valueNumeric="1"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
@@ -522,6 +531,7 @@
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
       <column name="AB_ATTRIBUTE_ID" value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Product"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
@@ -532,12 +542,14 @@
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="66cac4bb-6dd9-4ddd-b329-14d4542bfd2e"/>
       <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="05576033-1bee-4547-ab82-fdfcdd039642"/>
       <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
       <column name="MIN_COUNT" valueNumeric="1"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
@@ -581,6 +593,7 @@
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="be7d0f5c-8941-4b3d-b128-bab67e1d609b"/>
       <column name="AB_ATTRIBUTE_ID" value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Product"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
@@ -598,11 +611,6 @@
       <column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
       <column name="OBJECT_TYPE" value="Activity"/>
     </insert>
-    <insert tableName="AB_ATTRIBUTEUSAGE">
-      <column name="AB_ATTRIBUTEUSAGEID" value="118a4133-c604-4c91-b1d5-13769d2c2bfb"/>
-      <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-      <column name="OBJECT_TYPE" value="Activity"/>
-    </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="d72e9c6d-ad1d-419c-9794-b044c69f9c22"/>
       <column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
@@ -623,11 +631,6 @@
       <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
-    <insert tableName="AB_ATTRIBUTEUSAGE">
-      <column name="AB_ATTRIBUTEUSAGEID" value="3ab3fec6-229e-430e-b92c-d4f06be3829d"/>
-      <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-      <column name="OBJECT_TYPE" value="Organisation"/>
-    </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="5c357e7d-68f7-4408-8b60-36f8a029db28"/>
       <column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
@@ -656,6 +659,7 @@
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="b0f42fce-45e4-47e7-9534-534d3c762c81"/>
       <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Person"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
@@ -676,26 +680,31 @@
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="4de9d31f-82a4-4598-85ae-de0b8ce5590d"/>
       <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="2c1af7b9-f015-4e9e-911a-b975f077f471"/>
       <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Person"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="7d936ff2-41d9-47c6-9145-d165c8b70fe7"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Organisation"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="5f0274a2-6425-4258-9f1f-a510ca6b5861"/>
       <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Person"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="1f269307-9900-44e7-b575-0412f0ac2908"/>
       <column name="AB_ATTRIBUTE_ID" value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Employee"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
@@ -713,11 +722,6 @@
       <column name="AB_ATTRIBUTE_ID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
       <column name="OBJECT_TYPE" value="Employee"/>
     </insert>
-    <insert tableName="AB_ATTRIBUTEUSAGE">
-      <column name="AB_ATTRIBUTEUSAGEID" value="926c93ac-7b5e-49dd-bde8-5afe05256584"/>
-      <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-      <column name="OBJECT_TYPE" value="Employee"/>
-    </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="6ee459e7-d251-4434-bd26-aff75f3153ea"/>
       <column name="AB_ATTRIBUTE_ID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
@@ -736,6 +740,7 @@
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="931958f6-efaf-4da2-89b1-92f844787094"/>
       <column name="AB_ATTRIBUTE_ID" value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
+      <column name="MAX_COUNT" valueNumeric="1"/>
       <column name="OBJECT_TYPE" value="Employee"/>
     </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
@@ -768,16 +773,6 @@
       <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
       <column name="OBJECT_TYPE" value="DocumentTemplate"/>
     </insert>
-    <insert tableName="AB_ATTRIBUTEUSAGE">
-      <column name="AB_ATTRIBUTEUSAGEID" value="cae53196-4987-4f53-a45c-babca1997a48"/>
-      <column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
-      <column name="OBJECT_TYPE" value="DocumentTemplate"/>
-    </insert>
-    <insert tableName="AB_ATTRIBUTEUSAGE">
-      <column name="AB_ATTRIBUTEUSAGEID" value="59d93c4b-e338-497c-9da2-47b4c45444c9"/>
-      <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
-      <column name="OBJECT_TYPE" value="DocumentTemplate"/>
-    </insert>
     <insert tableName="AB_ATTRIBUTEUSAGE">
       <column name="AB_ATTRIBUTEUSAGEID" value="0498ae18-bae6-44e4-8944-1e756e9d4a8e"/>
       <column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
@@ -793,5 +788,10 @@
       <column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
       <column name="OBJECT_TYPE" value="DocumentTemplate"/>
     </insert>
+    <insert tableName="AB_ATTRIBUTEUSAGE">
+      <column name="AB_ATTRIBUTEUSAGEID" value="f71c56b5-7d5a-45ec-87f0-e9f79620092e"/>
+      <column name="AB_ATTRIBUTE_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
+      <column name="OBJECT_TYPE" value="Person"/>
+    </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/_demoData/changelog.xml

 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-  <include file="generatedData/AB_ATTRIBUTE.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/AB_ATTRIBUTERELATION.xml" relativeToChangelogFile="true"/>
-  <include file="generatedData/AB_ATTRIBUTEUSAGE.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/AB_LOGHISTORY.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/AB_OBJECTRELATION.xml" relativeToChangelogFile="true"/>
   <include file="generatedData/AB_OBJECTRELATIONTYPE.xml" relativeToChangelogFile="true"/>

entity/Activity_entity/recordcontainers/db/conditionProcess.js

@@ -23,7 +23,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
                                                .andPrepareVars("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectId_param");
 
                                                             // TODO: more performant way than IN. Maybe a join??
-    cond.and(db.translateStatement(activityLinkCond.buildSql("ACTIVITY.ACTIVITYID in (select ACTIVITYLINK.ACTIVITY_ID from ACTIVITYLINK", "1=2", ")")))
+    cond.and(SqlUtils.translateStatementWithQuotes(activityLinkCond.buildSql("ACTIVITY.ACTIVITYID in (select ACTIVITYLINK.ACTIVITY_ID from ACTIVITYLINK", "1=2", ")")))
 }
     
 if(vars.getString("$param.OnlyInnate_param") == "true") 

entity/AddressType_entity/recordcontainers/db/conditionProcess.js

@@ -21,5 +21,5 @@ if (usageFilter)
                                                     from AB_KEYWORD_ATTRIBUTERELATION ", null, ")"));
 }
 
-cond = db.translateStatement(cond.build("1 = 2"));
+cond = SqlUtils.translateStatementWithQuotes(cond.build("1 = 2"));
 result.string(cond);
\ No newline at end of file

entity/Address_entity/recordcontainers/childgroup/query.js

@@ -8,7 +8,7 @@ if (vars.exists("$local.idvalue")) {
     affectedIds = vars.get("$local.idvalue");
 }
 
-result.string(db.translateStatement(SqlCondition.begin()
+result.string(SqlUtils.translateStatementWithQuotes(SqlCondition.begin()
             .andIn("ADDRESS.ADDRESSID", affectedIds)
             .buildSql("select \n\
                         ADDRESS.ADDRESSID as \"_uid_\", \n\

entity/Analyses_entity/Analyses_entity.aod

@@ -40,6 +40,15 @@
       <name>openOverdueTasks</name>
       <onActionProcess>%aditoprj%/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js</onActionProcess>
     </entityActionField>
+    <entityField>
+      <name>TURNOVER_FORECAST</name>
+      <title>My Forecast</title>
+      <valueProcess>%aditoprj%/entity/Analyses_entity/entityfields/turnover_forecast/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>MYTURNOVER</name>
+      <title>My Turnover</title>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>

entity/Analyses_entity/documentation.adoc

 = Analyses_entity
 
-Logic and information for the ScoreCard displays openTasks, apointments, ... for the user
+Logic and information for the ScoreCard displays openTasks, apointments, ... for the logged in user
\ No newline at end of file

entity/Analyses_entity/entityfields/new_tasks/valueProcess.js

-import("system.datetime");
+import("Employee_lib");
 import("system.db");
 import("system.result");
-import("system.vars");
-import("Date_lib");
-import("Sql_lib");
-import("system.SQLTYPES")
 
-var opentask = db.cell("select count(STATUS) from TASK join AB_KEYWORD_ENTRY on KEYID = STATUS and CONTAINER  = 'TaskStatus' and TITLE = 'new' group by KEYID, AB_KEYWORD_ENTRY.TITLE");                             
+var opentask = db.cell("select count(TASKID) "
+             + " from TASK "
+             + " where STATUS = 'NEW' and EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'");                             
                                   
-result.string(opentask);
+result.string(opentask);
\ No newline at end of file

entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js

+import("Employee_lib");
 import("system.db");
 import("system.neon");
 
-var taskIds = db.table("select TASKID from TASK join AB_KEYWORD_ENTRY on KEYID = STATUS and CONTAINER  = 'TaskStatus' and TITLE = 'new'", "Data_alias")
+var taskIds = db.table("select TASKID  "
+             + " from TASK "
+             + " where STATUS = 'NEW' and EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'", "Data_alias");
 
 neon.openContext("Task", "TaskFilter_view", taskIds, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file

entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js

+import("Employee_lib");
 import("system.vars");
 import("system.datetime");
 import("system.db");
@@ -6,7 +7,9 @@ import("Date_lib");
 import("Sql_lib");
 
 var overduetask = db.table(SqlCondition.begin()
-                                   .andPrepare("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
-                                   .buildSql("select TASKID from TASK", "1=2"), "Data_alias");
+                    .andPrepare("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
+                    .and("TASK.EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'")
+                    .and("TASK.STATUS NOT IN ('ENDED', 'ENDED-DONE', 'ENDED-ABANDONED')")
+                    .buildSql("select TASKID from TASK", "1=2"));
 
 neon.openContext("Task", "TaskFilter_view", overduetask, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file

entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js

+import("Employee_lib");
 import("system.db");
 import("system.datetime");
 import("system.result");
@@ -5,9 +6,10 @@ import("system.vars");
 import("Date_lib");
 import("Sql_lib");
 
-
 var overduetask = db.cell(SqlCondition.begin()
                                    .andPrepare("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
+                                   .and("TASK.EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'")
+                                   .and("TASK.STATUS NOT IN ('ENDED', 'ENDED-DONE', 'ENDED-ABANDONED')")
                                    .buildSql("select count(TASKID) from TASK", "1=2"));
                                                                   
 result.string(overduetask);

entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/hascommrestriction.value/expression.js

+import("Sql_lib");
 import("KeywordRegistry_basic");
 import("Contact_lib");
 import("system.db");
 import("system.result");
 
 var commRestrictionCond = ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$mail()).build();
-var sql = "case when (" + db.translateStatement(commRestrictionCond) + ") then 'true' else 'false' end";
+var sql = "case when (" + SqlUtils.translateStatementWithQuotes(commRestrictionCond) + ") then 'true' else 'false' end";
 result.string(sql);

entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js

+import("Sql_lib");
 import("Contact_lib");
 import("system.translate");
 import("system.db");
@@ -8,7 +9,7 @@ import("KeywordRegistry_basic");
 
 var commRestrictionCond = ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$mail()).build();
 var keywordSql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.bulkMailRecipientStatus(), "BULKMAILRECIPIENT.STATUS");
-var sql = "case when (" + db.translateStatement(commRestrictionCond)
+var sql = "case when (" + SqlUtils.translateStatementWithQuotes(commRestrictionCond)
     + ") then '" + translate.text("Advertising ban")
     + "' else (" + keywordSql + ") end";
 result.string(sql);

entity/BulkMail_entity/BulkMail_entity.aod

@@ -98,6 +98,7 @@
     <entityField>
       <name>ICON</name>
       <contentType>IMAGE</contentType>
+      <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/icon/valueProcess.js</valueProcess>
     </entityField>
     <entityConsumer>

entity/CampaignCost_entity/entityfields/keywordcampaignmanagementcostcategory/children/excludedkeyidssubquery_param/valueProcess.js

@@ -15,4 +15,4 @@ else
 if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
     cond.andPrepareVars("CAMPAIGNCOST.CAMPAIGNCOSTID", "$field.CAMPAIGNCOSTID", "# <> ?");
 
-result.string(db.translateStatement(cond.buildSql("select CATEGORY from CAMPAIGNCOST", "1=2", "group by CATEGORY")));
+result.string(SqlUtils.translateStatementWithQuotes(cond.buildSql("select CATEGORY from CAMPAIGNCOST", "1=2", "group by CATEGORY")));
\ No newline at end of file

entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js

@@ -11,7 +11,7 @@ if (1 < db.cell(SqlCondition.begin()
                         .andPrepare("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", vars.get("$field.CLASSIFICATIONTYPE"))
                         .buildSql("select count(*) from CLASSIFICATIONTYPE", "1=2")))
 {
-    db.deleteData("CLASSIFICATION", "CLASSIFICATION.CLASSIFICATIONTYPE_ID in (" + db.translateStatement(
+    db.deleteData("CLASSIFICATION", "CLASSIFICATION.CLASSIFICATIONTYPE_ID in (" + SqlUtils.translateStatementWithQuotes(
                        SqlCondition.begin()
                                    .andPrepare("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId)
                                    .buildSql("select CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID from CLASSIFICATIONTYPE", "1=2")) + ")");

entity/Contract_entity/Contract_entity.aod

@@ -124,6 +124,7 @@
     <entityField>
       <name>IMAGE</name>
       <contentType>IMAGE</contentType>
+      <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/image/valueProcess.js</valueProcess>
     </entityField>
     <entityFieldGroup>