diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index b4940e7b136a1e7dc45d5afe6100e622a0deb61d..94b3c6aab89bbcc9e3c5433f62e4fa30fa7bee5b 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
#This file is generated by ADITO designer. Do NOT delete or modify!
-#Tue Sep 08 15:42:02 CEST 2020
-version=6.2.0
+#Thu Dec 17 10:59:19 CET 2020
+version=6.2.1
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 35b812776eb853d81a336e2610b2af0c88c64da3..730a2527675aa0dbfc3346850a81cb7961110d5a 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -43,14 +43,6 @@
<targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>TARGET_ID</targetIdField>
<documentation>%aditoprj%/entity/360Degree_entity/entityfields/organisationobjects/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>15488007-165c-4630-828a-447cf2c27899</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>360DegreeObjects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -62,6 +54,14 @@
<valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/organisationobjects/children/basecontextid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>15488007-165c-4630-828a-447cf2c27899</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>360DegreeObjects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>TARGET_CONTEXT</name>
@@ -85,14 +85,6 @@
<targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>TARGET_ID</targetIdField>
<documentation>%aditoprj%/entity/360Degree_entity/entityfields/personobjects/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>1d931ae6-137a-4db3-b02c-eb8872d349c6</name>
- <entityName>Person_entity</entityName>
- <fieldName>360DegreeObjects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -104,6 +96,14 @@
<valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/personobjects/children/basecontextid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>1d931ae6-137a-4db3-b02c-eb8872d349c6</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>360DegreeObjects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityActionGroup>
<name>newModule</name>
diff --git a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
index 0764eff7f7bb307932d6c09366ff99f6431a1114..3d9c6d75f1d5026e6e31e985752e51b6a88a9262 100644
--- a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
@@ -4,11 +4,22 @@ import("system.result");
var res = {
"Offer": {},
"Order": {
- "setGroupBy":"ORDERTYPE"
+ "setGroupBy":"ORDERTYPE",
+ "groupByKeyword":"OrderType"
},
"Contract": {},
- "SupportTicket": {},
- "Campaign": {}
-}
+ "SupportTicket": {
+ "subContext":"TaskLink",
+ "childField":"TASK_ID",
+ "parentField":"TASK_TASKID",
+ "contactIdField":"OBJECT_ROWID"
+ },
+ "Campaign": {
+ "subContext":"CampaignParticipant",
+ "childField":"CAMPAIGN_ID",
+ "parentField":"CAMPAIGNID",
+ "contactIdField":"CONTACT_ID"
+ }
+};
-result.string(JSON.stringify(res))
\ No newline at end of file
+result.string(JSON.stringify(res));
\ No newline at end of file
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index e5518fff2fac73d9b45fcd177cd580a8edf2a289..7603602585dc40819b65359733ab6f6a5773002a 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -40,6 +40,12 @@
<targetIdField>OBJECT_ROWID</targetIdField>
<documentation>%aditoprj%/entity/ActivityLink_entity/entityfields/links/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
+ <children>
+ <entityParameter>
+ <name>ActivityId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>148c98ea-a24b-453a-afe9-975555486b2c</name>
@@ -48,26 +54,20 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ActivityId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityConsumer>
<name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Context</name>
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index 44fe6f291552d9072dd56043974aaaf7e422024e..843afd1e218beaffea518bc0979c888cc59da93e 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -22,6 +22,13 @@
<name>ByCategory</name>
<lookupIdfield>KEYID</lookupIdfield>
<documentation>%aditoprj%/entity/AddressType_entity/entityfields/bycategory/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>UsageFilter_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>0956b1f3-8b67-4f82-b04a-70be88aff19f</name>
@@ -30,13 +37,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>UsageFilter_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>UsageFilter_param</name>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index a60f3736b97b1a8f533330412d5d8414e5c1d742..1d6a1b12b3496a05194b7c52de49af7fb6d9b974 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -51,6 +51,12 @@
<targetIdField>OBJECTID</targetIdField>
<documentation>%aditoprj%/entity/AppointmentLink_entity/entityfields/links/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
+ <children>
+ <entityParameter>
+ <name>AppointmentId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>3dde1745-18a1-4499-83d0-61e414086997</name>
@@ -59,12 +65,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>AppointmentId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityConsumer>
<name>Context</name>
@@ -76,17 +76,17 @@
</entityConsumer>
<entityConsumer>
<name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>opencontext</name>
diff --git a/entity/AroundLocation_entity/AroundLocation_entity.aod b/entity/AroundLocation_entity/AroundLocation_entity.aod
index c91531dc4c43f5cb38c9324e78b6c69f15d6251f..227c9fc268c1ccecd8d7dfe22781522a0f6a2c2b 100644
--- a/entity/AroundLocation_entity/AroundLocation_entity.aod
+++ b/entity/AroundLocation_entity/AroundLocation_entity.aod
@@ -21,17 +21,17 @@
<entityConsumer>
<name>Organisations</name>
<state>READONLY</state>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>OrganisationsViaIndex</fieldName>
- </dependency>
<children>
<entityParameter>
<name>OnlyShowContactIds_param</name>
<valueProcess>%aditoprj%/entity/AroundLocation_entity/entityfields/organisations/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>OrganisationsViaIndex</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>Open</name>
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 24f5a40c60896ee48346ad767a0ef4424930d7f1..166b6b8423d16017ff4fa657a9a86be652cb5c0e 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -72,11 +72,6 @@
</entityField>
<entityConsumer>
<name>Context</name>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Exclusive</fieldName>
- </dependency>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -87,6 +82,11 @@
<valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Exclusive</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>SingleSelection_param</name>
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index 60d85496e220808f40709d4fd7fc80bbba176c0a..0e5fdd626ed467febf43099ab2bbe1d578ced05e 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -67,17 +67,17 @@
</entityConsumer>
<entityConsumer>
<name>StatusKeyword</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>EMAIL_ADDRESS</name>
@@ -136,17 +136,17 @@
</entityField>
<entityConsumer>
<name>EmailAdresses</name>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>EmailCommunications</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>EmailCommunications</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 339e6914d5ffe2bea367524f8f684d43cb442d7a..5a45ceab9f71040142b2967e02238e309981aa4e 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -60,11 +60,6 @@
</entityConsumer>
<entityConsumer>
<name>CampaignStepConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- </dependency>
<children>
<entityParameter>
<name>campaignId_param</name>
@@ -72,6 +67,11 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignSteps</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>UID</name>
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index ff9e8a25ad8f036f8667aeb149349e1d8ed75766..8aae1d74b98c7a1429ff8a47a0246962919fc058 100644
--- a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
+++ b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
@@ -15,14 +15,6 @@
<entityProvider>
<name>CampaignAnalysisProvider</name>
<documentation>%aditoprj%/entity/CampaignAnalysis_entity/entityfields/campaignanalysisprovider/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>bd130613-f0e4-4591-8035-2c2491b08c50</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignAnalysisConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>DateEnd_param</name>
@@ -40,6 +32,14 @@
<mandatory v="true" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>bd130613-f0e4-4591-8035-2c2491b08c50</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>CampaignAnalysisConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityParameter>
<name>CampaignId_param</name>
diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index 096e8a8d95bd5caf65e5490d901dec5f44b583df..7652bce2911c9999a838ab39eefdafe3bdbdc17c 100644
--- a/entity/CampaignCost_entity/CampaignCost_entity.aod
+++ b/entity/CampaignCost_entity/CampaignCost_entity.aod
@@ -80,14 +80,6 @@
<entityProvider>
<name>CampaignCosts</name>
<documentation>%aditoprj%/entity/CampaignCost_entity/entityfields/campaigncosts/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>7131288b-af5c-4914-96f5-c5d70217fc23</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignCosts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>CampaignStepId_param</name>
@@ -107,24 +99,18 @@
<expose v="false" />
</entityParameter>
</children>
- </entityProvider>
- <entityProvider>
- <name>StepCosts</name>
- <documentation>%aditoprj%/entity/CampaignCost_entity/entityfields/stepcosts/documentation.adoc</documentation>
<dependencies>
<entityDependency>
- <name>af147f3e-a1bd-4eb0-9ac8-325dbdaba17d</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignStepCosts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2a92b738-c0bb-4c14-9915-aff9e18effaf</name>
+ <name>7131288b-af5c-4914-96f5-c5d70217fc23</name>
<entityName>Campaign_entity</entityName>
- <fieldName>CampaignStepCosts</fieldName>
+ <fieldName>CampaignCosts</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ </entityProvider>
+ <entityProvider>
+ <name>StepCosts</name>
+ <documentation>%aditoprj%/entity/CampaignCost_entity/entityfields/stepcosts/documentation.adoc</documentation>
<children>
<entityParameter>
<name>CampaignStepId_param</name>
@@ -144,6 +130,20 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>af147f3e-a1bd-4eb0-9ac8-325dbdaba17d</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignStepCosts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>2a92b738-c0bb-4c14-9915-aff9e18effaf</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>CampaignStepCosts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityConsumer>
<name>Campaigns</name>
@@ -155,35 +155,35 @@
</entityConsumer>
<entityConsumer>
<name>CampaignSteps</name>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- </dependency>
<children>
<entityParameter>
<name>campaignId_param</name>
<valueProcess>%aditoprj%/entity/CampaignCost_entity/entityfields/campaignsteps/children/campaignid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordCampaignManagementCostCategory</name>
<dependency>
<name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignSteps</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordCampaignManagementCostCategory</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/CampaignCost_entity/entityfields/keywordcampaignmanagementcostcategory/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
- <name>ExcludedKeyIdsSubquery_param</name>
- <valueProcess>%aditoprj%/entity/CampaignCost_entity/entityfields/keywordcampaignmanagementcostcategory/children/excludedkeyidssubquery_param/valueProcess.js</valueProcess>
+ <name>BlacklistIds_param</name>
+ <valueProcess>%aditoprj%/entity/CampaignCost_entity/entityfields/keywordcampaignmanagementcostcategory/children/blacklistids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>CampaignId_param</name>
diff --git a/entity/CampaignCost_entity/entityfields/keywordcampaignmanagementcostcategory/children/excludedkeyidssubquery_param/valueProcess.js b/entity/CampaignCost_entity/entityfields/keywordcampaignmanagementcostcategory/children/blacklistids_param/valueProcess.js
similarity index 84%
rename from entity/CampaignCost_entity/entityfields/keywordcampaignmanagementcostcategory/children/excludedkeyidssubquery_param/valueProcess.js
rename to entity/CampaignCost_entity/entityfields/keywordcampaignmanagementcostcategory/children/blacklistids_param/valueProcess.js
index d918b95bfcb392e62eeee2bc4e77dacf8b9efd29..64277edeb0afa5bd2ed0c3a9bf86700a54343e6e 100644
--- a/entity/CampaignCost_entity/entityfields/keywordcampaignmanagementcostcategory/children/excludedkeyidssubquery_param/valueProcess.js
+++ b/entity/CampaignCost_entity/entityfields/keywordcampaignmanagementcostcategory/children/blacklistids_param/valueProcess.js
@@ -12,9 +12,9 @@ var cond = newSelect("CATEGORY")
if (vars.get("$field.CAMPAIGNSTEP_ID"))
cond.andIfSet("CAMPAIGNCOST.CAMPAIGNSTEP_ID", "$field.CAMPAIGNSTEP_ID");
else
- cond.and("CAMPAIGNCOST.CAMPAIGNSTEP_ID is null")
+ cond.and("CAMPAIGNCOST.CAMPAIGNSTEP_ID is null");
if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
cond.andIfSet("CAMPAIGNCOST.CAMPAIGNCOSTID", "$field.CAMPAIGNCOSTID", SqlBuilder.NOT_EQUAL());
-result.string(cond.toString());
\ No newline at end of file
+result.string(JSON.stringify(cond.arrayColumn()));
\ No newline at end of file
diff --git a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
index f274ff6890107a465ec82b673a40316a9b542e39..62ae8a76e9ae487f97b651173b78bc4c8acbf3ff 100644
--- a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
+++ b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
@@ -81,17 +81,17 @@
</entityField>
<entityConsumer>
<name>CampaignStatusKeyword</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/CampaignPlanning_entity/entityfields/campaignstatuskeyword/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -99,58 +99,6 @@
</entityProvider>
</entityFields>
<recordContainers>
- <dbRecordContainer>
- <name>recordContainer</name>
- <alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/CampaignPlanning_entity/recordcontainers/recordcontainer/fromClauseProcess.js</fromClauseProcess>
- <orderClauseProcess>%aditoprj%/entity/CampaignPlanning_entity/recordcontainers/recordcontainer/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>091a323d-d1e8-4eec-8f33-0c91bc7f62af</name>
- <tableName>CAMPAIGN</tableName>
- <primaryKey>CAMPAIGNID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>2df8e267-6c25-4bae-bd0f-2b7b4399cc2b</name>
- <tableName>CAMPAIGNSTEP</tableName>
- <primaryKey>CAMPAIGNSTEPID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>CAMPAIGN_ID.value</name>
- <recordfield>CAMPAIGN.CAMPAIGNID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_END.value</name>
- <recordfield>CAMPAIGNSTEP.DATE_END</recordfield>
- <isFilterable v="true" />
- <isLookupFilter v="true" />
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_START.value</name>
- <recordfield>CAMPAIGNSTEP.DATE_START</recordfield>
- <isFilterable v="true" />
- <isLookupFilter v="true" />
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PREDECESSOR_STEP_ID.value</name>
- <recordfield>CAMPAIGNSTEP.PREDECESSORSTEP_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STEP_DESCRIPTION.value</name>
- <recordfield>CAMPAIGNSTEP.DESCRIPTION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STEP_ID.value</name>
- <recordfield>CAMPAIGNSTEP.CAMPAIGNSTEPID</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
<jDitoRecordContainer>
<name>jditoRecordContainer</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
diff --git a/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js
index 9f1541d2f9b4b072bcdb0a64bdf3c8c84baf1d7a..53985b5cc50a47402b9df28330a3f2623c768f39 100644
--- a/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js
+++ b/entity/CampaignPlanning_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("JditoFilter_lib");
import("system.util");
import("system.db");
@@ -26,34 +27,47 @@ if (isMariaDB)
columnName = "\`NAME\`";
}
-var stepsRows = stepCondition.select("CAMPAIGNSTEPID, CAMPAIGNSTEP."+ columnName + ", CAMPAIGNSTEP.PREDECESSORSTEP_ID,"
+stepCondition.select("CAMPAIGNSTEPID, CAMPAIGNSTEP."+ columnName + ", CAMPAIGNSTEP.PREDECESSORSTEP_ID,"
+ " CAMPAIGNSTEP.DESCRIPTION, CAMPAIGNSTEP.DATE_START, CAMPAIGNSTEP.DATE_END, CAMPAIGNID, CAMPAIGN."+ columnName +", CAMPAIGN.STATUS")
.from("CAMPAIGN")
- .join("CAMPAIGNSTEP", "CAMPAIGN.CAMPAIGNID = CAMPAIGNSTEP.CAMPAIGN_ID")
- .orderBy("SORTING")
- .table();
+ .join("CAMPAIGNSTEP", "CAMPAIGN.CAMPAIGNID = CAMPAIGNSTEP.CAMPAIGN_ID");
+
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+ stepCondition.and("CAMPAIGNSTEP.CAMPAIGNSTEPID", vars.get("$local.idvalues"), SqlBuilder.IN());
-stepsRows = stepsRows.map(function ([stepId, stepName, predecessorId, desc, stepStartDate, stepEndDate, campaignId, campaignName, campaignStatus])
+var stepsRows = stepCondition.orderBy("SORTING").table();
+
+//this can happen when not a CampaignStep, but a Campaign node was selected
+if(stepsRows.length == 0 && vars.get("$local.idvalues") && newSelect("count(*)").from("CAMPAIGN").where("CAMPAIGN.CAMPAIGNID", vars.get("$local.idvalues")).cell() > 0)
{
- if (!campaignRows[campaignId])
- {
- let startDate = CampaignUtils.getCampaignStartDate(campaignId);
- let endDate = CampaignUtils.getCampaignEndDate(campaignId);
- campaignRows[campaignId] = [campaignId, campaignName, null, null, startDate, endDate, campaignId, TARGET_CONTEXT_ROOT_ELEMENT, campaignStatus];
- }
- stepIds[stepId] = true;
-
- return [stepId, stepName, predecessorId || campaignId, desc, stepStartDate, stepEndDate, campaignId, TARGET_CONTEXT_ELEMENT, campaignStatus];
-});
+ stepsRows = [[vars.get("$local.idvalues"), "", "", "", "", "", vars.get("$local.idvalues"), "", ""]]
+}
-//replace all predecessor ids that are not in the tree with the campaign id
-stepsRows.forEach(function (row)
+if(!vars.get("$local.idvalues"))
{
- if (!(stepIds[row[2]]))
- row[2] = row[6];
-});
+ stepsRows = stepsRows.map(function ([stepId, stepName, predecessorId, desc, stepStartDate, stepEndDate, campaignId, campaignName, campaignStatus])
+ {
+ if (!campaignRows[campaignId])
+ {
+ let startDate = CampaignUtils.getCampaignStartDate(campaignId);
+ let endDate = CampaignUtils.getCampaignEndDate(campaignId);
+ campaignRows[campaignId] = [campaignId, campaignName, null, null, startDate, endDate, campaignId, TARGET_CONTEXT_ROOT_ELEMENT, campaignStatus];
+ }
+ stepIds[stepId] = true;
+
+ return [stepId, stepName, predecessorId || campaignId, desc, stepStartDate, stepEndDate, campaignId, TARGET_CONTEXT_ELEMENT, campaignStatus];
+ });
-//convert the object to an array
-campaignRows = Object.keys(campaignRows).map(function (id) {return campaignRows[id];});
+ //replace all predecessor ids that are not in the tree with the campaign id
+ stepsRows.forEach(function (row)
+ {
+ if (!(stepIds[row[2]]))
+ row[2] = row[6];
+ });
-result.object(campaignRows.concat(stepsRows))
+ //convert the object to an array
+ campaignRows = Object.keys(campaignRows).map(function (id) {return campaignRows[id];});
+
+ stepsRows = campaignRows.concat(stepsRows);
+}
+result.object(stepsRows);
diff --git a/entity/CampaignPlanning_entity/recordcontainers/recordcontainer/fromClauseProcess.js b/entity/CampaignPlanning_entity/recordcontainers/recordcontainer/fromClauseProcess.js
deleted file mode 100644
index b007b4d58a7376e99c1fb0b20cfe88459dc89a4f..0000000000000000000000000000000000000000
--- a/entity/CampaignPlanning_entity/recordcontainers/recordcontainer/fromClauseProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("CAMPAIGN join CAMPAIGNSTEP on CAMPAIGN.CAMPAIGNID = CAMPAIGNSTEP.CAMPAIGN_ID")
\ No newline at end of file
diff --git a/entity/CampaignPlanning_entity/recordcontainers/recordcontainer/orderClauseProcess.js b/entity/CampaignPlanning_entity/recordcontainers/recordcontainer/orderClauseProcess.js
deleted file mode 100644
index 8538a702d13027d9d9739d9b6652105b87725638..0000000000000000000000000000000000000000
--- a/entity/CampaignPlanning_entity/recordcontainers/recordcontainer/orderClauseProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.db");
-
-result.object({"CAMPAIGNSTEP.SORTING": db.ASCENDING});
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index ae04d014704d51efa439bccfadc959d52dd1ec70..3632eda854eb4d4dd2b5f0a6773b3aa0fc34b0fb 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -131,6 +131,13 @@
<name>CampaignSteps</name>
<documentation>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignsteps/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
+ <children>
+ <entityParameter>
+ <name>campaignId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>421e6cc2-f874-4834-b022-fe1b253d50af</name>
@@ -169,13 +176,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>campaignId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>campaignId_param</name>
@@ -184,17 +184,17 @@
</entityParameter>
<entityConsumer>
<name>KeywordStates</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/keywordstates/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>MAXPARTICIPANTS</name>
@@ -206,11 +206,6 @@
<entityConsumer>
<name>CampaignParticipantsConsumer</name>
<selectionMode>MULTI</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignParticipant_entity</entityName>
- <fieldName>CampaignParticipantsProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>CampaignId_param</name>
@@ -221,6 +216,11 @@
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignparticipantsconsumer/children/campaignstepid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignParticipant_entity</entityName>
+ <fieldName>CampaignParticipantsProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>CurrentMaxParticipantsInfo</name>
@@ -241,25 +241,20 @@
</entityField>
<entityConsumer>
<name>Employees</name>
- <dependency>
- <name>dependency</name>
- <entityName>Employee_entity</entityName>
- <fieldName>Employees</fieldName>
- </dependency>
<children>
<entityParameter>
<name>OnlyActives_param</name>
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>CampaignStepCosts</name>
<dependency>
<name>dependency</name>
- <entityName>CampaignCost_entity</entityName>
- <fieldName>StepCosts</fieldName>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Employees</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>CampaignStepCosts</name>
<children>
<entityParameter>
<name>CampaignId_param</name>
@@ -270,6 +265,11 @@
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstepcosts/children/campaignstepid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignCost_entity</entityName>
+ <fieldName>StepCosts</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>COST</name>
@@ -289,11 +289,6 @@
<entityConsumer>
<name>Activities</name>
<title>Activities</title>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -304,16 +299,16 @@
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
<title>Tasks</title>
<stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -324,6 +319,11 @@
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
@@ -357,11 +357,6 @@
</entityField>
<entityConsumer>
<name>CampaignStepsConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- </dependency>
<children>
<entityParameter>
<name>campaignId_param</name>
@@ -373,6 +368,11 @@
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignstepsconsumer/children/maxsort_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>CampaignSteps</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>CampaignName</name>
@@ -419,17 +419,17 @@
</entityField>
<entityConsumer>
<name>KeywordStepMedium</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/keywordstepmedium/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
</entityFields>
<recordContainers>
diff --git a/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod b/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
index 546a64d948001e538ed6a971478016d6ae568b0f..c37f1f7de65d9557283ce8e53f1e721e11d4a6c1 100644
--- a/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
+++ b/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
@@ -30,17 +30,17 @@
</entityConsumer>
<entityConsumer>
<name>ClassificationGradings</name>
- <dependency>
- <name>dependency</name>
- <entityName>ClassificationGrading_entity</entityName>
- <fieldName>ClassificationGradings</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ClassificationTypeId_param</name>
<valueProcess>%aditoprj%/entity/ClassificationGroup_entity/entityfields/classificationgradings/children/classificationtypeid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ClassificationGrading_entity</entityName>
+ <fieldName>ClassificationGradings</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>SORTING</name>
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index faf8305ab8185d249fd38216f9954fd7d857dcb9..2434fa0a53dd70bbd17eb270b3ce3fa7bc92f247 100644
--- a/entity/ClassificationType_entity/ClassificationType_entity.aod
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -40,11 +40,6 @@
<entityConsumer>
<name>ClassificationScores</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>ClassificationScore_entity</entityName>
- <fieldName>ClassificationScores</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ClassificationTypeId_param</name>
@@ -55,6 +50,11 @@
<valueProcess>%aditoprj%/entity/ClassificationType_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ClassificationScore_entity</entityName>
+ <fieldName>ClassificationScores</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>infoField</name>
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index 0ffc7c029876ca37340aa50f5a4503ca4e0c8d1e..61c825296a1680b522cae9a883f7a6a38c5fb226 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -88,11 +88,6 @@
</entityField>
<entityConsumer>
<name>ClassificationScores</name>
- <dependency>
- <name>dependency</name>
- <entityName>ClassificationScore_entity</entityName>
- <fieldName>ClassificationScores</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ClassificationGroup_param</name>
@@ -107,6 +102,11 @@
<valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ClassificationScore_entity</entityName>
+ <fieldName>ClassificationScores</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>CLASSIFICATIONTYPE</name>
@@ -130,17 +130,17 @@
</entityField>
<entityConsumer>
<name>KeywordClassificationTypes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Classification_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>SCORETYPE</name>
diff --git a/entity/CommRestriction_Entity/CommRestriction_Entity.aod b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
index 102c450de9e00d97a4f3e8329bc4d5b528787b1f..407e45312848c4daf741f99d7df616f30754ca5b 100644
--- a/entity/CommRestriction_Entity/CommRestriction_Entity.aod
+++ b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
@@ -55,11 +55,6 @@
</entityConsumer>
<entityConsumer>
<name>CommRestrictionMedium</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -67,10 +62,15 @@
<expose v="false" />
</entityParameter>
<entityParameter>
- <name>ExcludedKeyIdsSubquery_param</name>
- <valueProcess>%aditoprj%/entity/CommRestriction_Entity/entityfields/commrestrictionmedium/children/excludedkeyidssubquery_param/valueProcess.js</valueProcess>
+ <name>BlacklistIds_param</name>
+ <valueProcess>%aditoprj%/entity/CommRestriction_Entity/entityfields/commrestrictionmedium/children/blacklistids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>CommRestrictions</name>
@@ -103,17 +103,17 @@
</entityField>
<entityConsumer>
<name>MediumKeywordAttribute</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordAttribute_entity</entityName>
- <fieldName>SpecificContainerKeyword</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/CommRestriction_Entity/entityfields/mediumkeywordattribute/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordAttribute_entity</entityName>
+ <fieldName>SpecificContainerKeyword</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/CommRestriction_Entity/entityfields/commrestrictionmedium/children/blacklistids_param/valueProcess.js b/entity/CommRestriction_Entity/entityfields/commrestrictionmedium/children/blacklistids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c1f39ed63d29e2c0be655f3a075b7cd45cc6010b
--- /dev/null
+++ b/entity/CommRestriction_Entity/entityfields/commrestrictionmedium/children/blacklistids_param/valueProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("Sql_lib");
+import("system.result");
+
+var alreadyUsedMediums = new SqlBuilder()
+ .select("MEDIUM")
+ .from("COMMRESTRICTION")
+ .where("COMMRESTRICTION.CONTACT_ID", vars.get("$field.CONTACT_ID"))
+ .arrayColumn();
+
+result.string(JSON.stringify(alreadyUsedMediums));
\ No newline at end of file
diff --git a/entity/CommRestriction_Entity/entityfields/commrestrictionmedium/children/excludedkeyidssubquery_param/valueProcess.js b/entity/CommRestriction_Entity/entityfields/commrestrictionmedium/children/excludedkeyidssubquery_param/valueProcess.js
deleted file mode 100644
index 50167db735b55a82144eadc0e440f38b57ce6de7..0000000000000000000000000000000000000000
--- a/entity/CommRestriction_Entity/entityfields/commrestrictionmedium/children/excludedkeyidssubquery_param/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.question");
-import("system.vars");
-import("Sql_lib");
-import("system.result");
-
-var contactId = vars.get("$field.CONTACT_ID");
-var alreadyUsedMediums = new SqlBuilder().select("MEDIUM").from("COMMRESTRICTION").where("COMMRESTRICTION.CONTACT_ID", contactId);
-
-result.string(alreadyUsedMediums);
\ No newline at end of file
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index 7e7298fd9a765e1d86d25f31a58607192495dc05..50d4bcf30967f630f2a0bd4242e46559beeae68f 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -79,11 +79,6 @@
</entityConsumer>
<entityConsumer>
<name>Organisations</name>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>WithAttribute</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AttributeId_param</name>
@@ -102,15 +97,15 @@
<title></title>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>WithAttribute</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordWonLost</name>
<selectionMode>MULTI</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -118,6 +113,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>PHASE</name>
@@ -127,11 +127,6 @@
</entityField>
<entityConsumer>
<name>KeywordPricePolitics</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -139,14 +134,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordWeaknesses</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordWeaknesses</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -154,14 +149,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordStrenghts</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordStrenghts</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -169,14 +164,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordPhases</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordPhases</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -184,14 +179,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordStates</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -199,15 +194,15 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<state>DISABLED</state>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -222,6 +217,11 @@
<valueProcess>%aditoprj%/entity/Competition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>IMAGE</name>
@@ -254,11 +254,6 @@
</entityConsumer>
<entityConsumer>
<name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -267,18 +262,15 @@
<mandatory v="true" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>Links</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>be977304-6623-42eb-a8bd-80ef43831204</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Competitions</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -289,6 +281,14 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>be977304-6623-42eb-a8bd-80ef43831204</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Competitions</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 41a386bd8dce1d009f4b1887e118adb79b9165cc..051d569c5b1e50b704fc389e793839d515280e2d 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -65,17 +65,17 @@
</entityField>
<entityConsumer>
<name>Organisations</name>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>WithPersonIdFilter</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>WithPersonIdFilter</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>PersonId_param</name>
@@ -86,6 +86,12 @@
<name>PersonRelated</name>
<targetContextField>targetContext</targetContextField>
<targetIdField>CONTACTID</targetIdField>
+ <children>
+ <entityParameter>
+ <name>OwnContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>14975dad-907c-4f8c-bd39-243508ede721</name>
@@ -94,12 +100,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>OwnContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityField>
<name>ADDRESS_ID</name>
@@ -115,31 +115,31 @@
</entityField>
<entityConsumer>
<name>Communications</name>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>AllCommunications</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>ContactAddresses</name>
<dependency>
<name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>ContactAddresses</fieldName>
+ <entityName>Communication_entity</entityName>
+ <fieldName>AllCommunications</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ContactAddresses</name>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/contactaddresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>ContactAddresses</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>LANGUAGE</name>
@@ -163,6 +163,13 @@
<targetContextField>targetContext</targetContextField>
<targetIdField>CONTACTID</targetIdField>
<titlePlural>Other Contactroles</titlePlural>
+ <children>
+ <entityParameter>
+ <name>PersonId_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>34cc85f4-5555-4631-94fc-f3ad35b7ce7e</name>
@@ -171,13 +178,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>PersonId_param</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>OwnContactId_param</name>
@@ -198,17 +198,17 @@
</entityField>
<entityConsumer>
<name>KeywordContactStates</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>LanguageKey_param</name>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index a8e3222ec7e8946419c18e8a795c0bf427a244e6..8e8f8d01c34ea6b4acb2208b165bd6bcc58e60a5 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -30,6 +30,16 @@
</entityField>
<entityProvider>
<name>Context</name>
+ <children>
+ <entityParameter>
+ <name>InvertBlacklist_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>Blacklist_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>dab09827-2eeb-403d-a070-ba805d2640ee</name>
@@ -56,16 +66,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>InvertBlacklist_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>Blacklist_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>Blacklist_param</name>
@@ -74,6 +74,13 @@
</entityParameter>
<entityProvider>
<name>ActivityLinkable</name>
+ <children>
+ <entityParameter>
+ <name>Blacklist_param</name>
+ <valueProcess>%aditoprj%/entity/Context_entity/entityfields/activitylinkable/children/blacklist_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>de50f67e-5ed0-46aa-b007-8c086cf5fea5</name>
@@ -82,16 +89,16 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ </entityProvider>
+ <entityProvider>
+ <name>TaskLinkable</name>
<children>
<entityParameter>
<name>Blacklist_param</name>
- <valueProcess>%aditoprj%/entity/Context_entity/entityfields/activitylinkable/children/blacklist_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Context_entity/entityfields/tasklinkable/children/blacklist_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
- </entityProvider>
- <entityProvider>
- <name>TaskLinkable</name>
<dependencies>
<entityDependency>
<name>ff8925da-b69a-46dd-8fe2-d6707da8808e</name>
@@ -100,13 +107,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>Blacklist_param</name>
- <valueProcess>%aditoprj%/entity/Context_entity/entityfields/tasklinkable/children/blacklist_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>InvertBlacklist_param</name>
@@ -157,6 +157,17 @@
</entityProvider>
<entityProvider>
<name>ContextTemplatePlaceOfUse</name>
+ <children>
+ <entityParameter>
+ <name>InvertBlacklist_param</name>
+ <valueProcess>%aditoprj%/entity/Context_entity/entityfields/contexttemplateplaceofuse/children/invertblacklist_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Blacklist_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>423a7a33-02f4-4975-94fd-fa0c21278e3b</name>
@@ -171,17 +182,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>InvertBlacklist_param</name>
- <valueProcess>%aditoprj%/entity/Context_entity/entityfields/contexttemplateplaceofuse/children/invertblacklist_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Blacklist_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 9a4408cb03cc9d0d4de39895c93611b24df313da..1b19a2841ca62eacc9ae2a1ee8ce5442028172ce 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -16,6 +16,18 @@
<name>ISO2Name</name>
<lookupIdfield>ISO2</lookupIdfield>
<documentation>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>Key_param</name>
+ <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>Value_param</name>
+ <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
@@ -30,18 +42,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>Key_param</name>
- <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>Value_param</name>
- <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>Key_param</name>
diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
index 9a090c1ee2cc636fcc7b1dfe8a5651482b51f376..c170fcd06fc27a9ff7ef23c14a110bf5205daef0 100644
--- a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
+++ b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
@@ -83,31 +83,31 @@
</entityField>
<entityConsumer>
<name>KeywordDeadline</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/keyworddeadline/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordTransmission</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordTransmission</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/keywordtransmission/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>TRANSMISSION</name>
@@ -140,17 +140,17 @@
</entityConsumer>
<entityConsumer>
<name>KeywordGuarantee</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/keywordguarantee/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index 19cefc3a19e90adbc2a12a91fe584c93032a6554..a6445e18ca69ee174c9338f15491fcfc8240d805 100644
--- a/entity/DSGVO_entity/DSGVO_entity.aod
+++ b/entity/DSGVO_entity/DSGVO_entity.aod
@@ -84,11 +84,6 @@
</entityField>
<entityConsumer>
<name>KeywordDSGVOPurpose</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -96,20 +91,25 @@
<valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/keyworddsgvopurpose/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordDSGVOStatuoritysource</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDSGVOStatuoritysource</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/keyworddsgvostatuoritysource/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Communications</name>
@@ -181,17 +181,17 @@
</entityField>
<entityConsumer>
<name>KeywordDSGVOType</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/keyworddsgvotype/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>DSGVOEntries</name>
diff --git a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
index 83aa32b97318445d0891b35c2443d6452e929739..125b89eb929ff7c7bc2f82abb6b513a12cfea883 100644
--- a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
+++ b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
@@ -40,17 +40,17 @@
</entityField>
<entityConsumer>
<name>Languages</name>
- <dependency>
- <name>dependency</name>
- <entityName>Language_entity</entityName>
- <fieldName>ISO3NameFiltered</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ExcludedIds_param</name>
<valueProcess>%aditoprj%/entity/DescriptionTranslation_entity/entityfields/languages/children/excludedids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3NameFiltered</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>ObjectType_param</name>
diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index 4062bb8fd405fd3447584e1169ac5f9f8e15c83c..542e050c6414a26472b63a41636ef1632d31f79e 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -37,11 +37,6 @@
</entityField>
<entityConsumer>
<name>Departments</name>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ParentId_param</name>
@@ -49,6 +44,11 @@
<description>parent id, this is used for filtering by the parent in the content process</description>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Employees</name>
@@ -90,14 +90,6 @@
<lookupIdfield>DISTRICTRESPONSIBLEID</lookupIdfield>
<documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc</documentation>
<titlePlural>Responsibles</titlePlural>
- <dependencies>
- <entityDependency>
- <name>ef26fdb6-5fcf-416e-bcc8-380b5751b523</name>
- <entityName>District_entity</entityName>
- <fieldName>DistrictResponsibles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>DistrictId_param</name>
@@ -108,6 +100,14 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>ef26fdb6-5fcf-416e-bcc8-380b5751b523</name>
+ <entityName>District_entity</entityName>
+ <fieldName>DistrictResponsibles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityParameter>
<name>DistrictId_param</name>
@@ -116,25 +116,20 @@
</entityParameter>
<entityConsumer>
<name>LogHistories</name>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Documents</name>
<dependency>
<name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Documents</name>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -145,6 +140,11 @@
<valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>departmentAttributeName</name>
@@ -159,6 +159,12 @@
<targetContextField>targetContext</targetContextField>
<targetIdField>EMPLOYEE_CONTACT_ID</targetIdField>
<documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>DistrictId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>9c2fe0da-9456-44ef-ac6c-28ac234b35f7</name>
@@ -173,12 +179,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>DistrictId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>OrgUid_param</name>
diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
index e775acd3c2243cada93f42afa935b6336bb8d256..8ae74f7b15631f61f43dfe094c3931db48eb1339 100644
--- a/entity/District_entity/District_entity.aod
+++ b/entity/District_entity/District_entity.aod
@@ -82,14 +82,6 @@
<documentation>%aditoprj%/entity/District_entity/entityfields/responsibledistricts/documentation.adoc</documentation>
<titlePlural>Responsible Districts</titlePlural>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>291c0ca4-5a68-45f5-80a7-745c7df56d7c</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>Districts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ExcludedDistrictIds_param</name>
@@ -100,6 +92,14 @@
<mandatory v="true" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>291c0ca4-5a68-45f5-80a7-745c7df56d7c</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>Districts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityConsumer>
<name>Languages</name>
@@ -111,17 +111,17 @@
</entityConsumer>
<entityConsumer>
<name>DistrictResponsibles</name>
- <dependency>
- <name>dependency</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>DistrictResponsibles</fieldName>
- </dependency>
<children>
<entityParameter>
<name>DistrictId_param</name>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/districtresponsibles/children/districtid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DistrictResponsible_entity</entityName>
+ <fieldName>DistrictResponsibles</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
@@ -142,17 +142,17 @@
<entityConsumer>
<name>Organisations</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>FilterPreSet_param</name>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/organisations/children/filterpreset_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Organisations</fieldName>
+ </dependency>
</entityConsumer>
<entityFieldGroup>
<name>DISTRICT_NUMBER_fieldGroup</name>
@@ -164,11 +164,6 @@
</entityFieldGroup>
<entityConsumer>
<name>Documents</name>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -179,6 +174,11 @@
<valueProcess>%aditoprj%/entity/District_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>LogHistories</name>
@@ -217,21 +217,27 @@
</entityProvider>
<entityConsumer>
<name>ParentDistricts</name>
- <dependency>
- <name>dependency</name>
- <entityName>#ENTITY</entityName>
- <fieldName>ValidParentDistricts</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ExcludedDistrictIds_param</name>
<valueProcess>%aditoprj%/entity/District_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>#ENTITY</entityName>
+ <fieldName>ValidParentDistricts</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>ValidParentDistricts</name>
<documentation>%aditoprj%/entity/District_entity/entityfields/validparentdistricts/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>DistrictsByContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>8b0738a4-e4cd-4f9e-8df1-f499046c81bf</name>
@@ -240,12 +246,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>DistrictsByContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>ExcludedDistrictIds_param</name>
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index e848d6cbed30ee763ef247d2b50de2b6a9fcd166..045e605d322c3f26bb96ae14b37d59b96a15be20 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -51,11 +51,6 @@
</entityParameter>
<entityConsumer>
<name>Attachments</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>Attachments</fieldName>
- </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -63,20 +58,17 @@
<valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/attachments/children/documenttemplatetype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>Attachments</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>Links</name>
<targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
<documentation>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/links/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>db3b7e04-ca3b-4205-a1d3-5e5e5cb13073</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>Links</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>DocumentId_param</name>
@@ -87,6 +79,14 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>db3b7e04-ca3b-4205-a1d3-5e5e5cb13073</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>Links</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityParameter>
<name>Type_param</name>
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index bea4c1751d8494da143d1330f839615910e4cba6..c6fa4c852db2405ec9cfc663e8fe80f4ed1ac4fc 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -32,6 +32,12 @@
<lookupIdfield>KEYID</lookupIdfield>
<documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
+ <children>
+ <entityParameter>
+ <name>usageFilter_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>5eb6b17c-8c13-48df-84d5-a949b7d21cf3</name>
@@ -40,12 +46,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>usageFilter_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index dbb9e49a3b635be85e5615422520d9f08d387aac..b19bc7ae52fbb3717e35a9917861913b69a226e4 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -94,11 +94,6 @@
</entityField>
<entityConsumer>
<name>Documents</name>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentTable_param</name>
@@ -109,6 +104,11 @@
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Languages</name>
@@ -120,27 +120,22 @@
</entityConsumer>
<entityConsumer>
<name>KeywordDocumentTemplateType</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -151,6 +146,11 @@
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>Content</name>
@@ -176,11 +176,6 @@
</entityField>
<entityConsumer>
<name>DocumentTemplateTypeCategory</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplateTypeCategory_entity</entityName>
- <fieldName>ByCategory</fieldName>
- </dependency>
<children>
<entityParameter>
<name>usageFilter_param</name>
@@ -188,6 +183,11 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplateTypeCategory_entity</entityName>
+ <fieldName>ByCategory</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>Attachments</name>
@@ -208,11 +208,6 @@
<entityConsumer>
<name>Links</name>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplateLink_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
<children>
<entityParameter>
<name>DocumentId_param</name>
@@ -225,6 +220,11 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplateLink_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>DocumentTemplateTypeClassification_param</name>
@@ -234,6 +234,12 @@
<entityProvider>
<name>DocumentTemplateProvider</name>
<documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>ComingFrom_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>9c10883d-eb73-4587-b758-693a66367a4c</name>
@@ -278,12 +284,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ComingFrom_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -322,11 +322,6 @@
<name>DocumentTemplatePlaceOfUse</name>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplatePlaceOfUse_entity</entityName>
- <fieldName>DocumentTemplatePlaceOfUse</fieldName>
- </dependency>
<children>
<entityParameter>
<name>DocumentTemplatePlaceOfUse_param</name>
@@ -334,6 +329,11 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplatePlaceOfUse_entity</entityName>
+ <fieldName>DocumentTemplatePlaceOfUse</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>ComingFrom_param</name>
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index fb343c9aa35db6794cf56f61fb5920617e799a91..b03785e283988f81205973dca4b69b0f77b34416 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
@@ -74,17 +74,17 @@
</entityField>
<entityConsumer>
<name>ScannerResultFieldsConfig_Consumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>DuplicateScannerResultFieldConfig_entity</entityName>
- <fieldName>ScannerResultFieldConfigProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>DuplicateScannerId_param</name>
<valueProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/scannerresultfieldsconfig_consumer/children/duplicatescannerid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DuplicateScannerResultFieldConfig_entity</entityName>
+ <fieldName>ScannerResultFieldConfigProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityActionGroup>
<name>RunActionGroup</name>
diff --git a/entity/Duplicates_entity/Duplicates_entity.aod b/entity/Duplicates_entity/Duplicates_entity.aod
index 54ee932a3235f4e127feeb5112c9c11e3e7f2e47..01016698641fb613af8dd98543ce9c7d4e3fd809 100644
--- a/entity/Duplicates_entity/Duplicates_entity.aod
+++ b/entity/Duplicates_entity/Duplicates_entity.aod
@@ -42,11 +42,6 @@
</entityProvider>
<entityConsumer>
<name>SelfPersonDuplicatesConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>Duplicates_entity</entityName>
- <fieldName>SelfPersonDuplicatesProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>TargetEntity</name>
@@ -58,6 +53,11 @@
<valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/selfpersonduplicatesconsumer/children/clusterid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Duplicates_entity</entityName>
+ <fieldName>SelfPersonDuplicatesProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>TargetEntity</name>
@@ -66,11 +66,6 @@
</entityParameter>
<entityConsumer>
<name>SelfOrganisationDuplicatesConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>Duplicates_entity</entityName>
- <fieldName>SelfOrganisationDuplicatesProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>TargetEntity</name>
@@ -81,6 +76,11 @@
<valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/selforganisationduplicatesconsumer/children/clusterid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Duplicates_entity</entityName>
+ <fieldName>SelfOrganisationDuplicatesProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>SelfOrganisationDuplicatesProvider</name>
@@ -88,11 +88,6 @@
</entityProvider>
<entityConsumer>
<name>DuplicatesUnrelatedPersonConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>DuplicatesUnrelated_entity</entityName>
- <fieldName>UnrelatedPersonsProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>TargetEntity</name>
@@ -103,17 +98,17 @@
<valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/duplicatesunrelatedpersonconsumer/children/clusterid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DuplicatesUnrelated_entity</entityName>
+ <fieldName>UnrelatedPersonsProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>CLUSTER_ID</name>
</entityField>
<entityConsumer>
<name>DuplicatePersonsConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>NonselfDuplicates</fieldName>
- </dependency>
<children>
<entityParameter>
<name>OnlyShowContactIds_param</name>
@@ -124,6 +119,11 @@
<valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/duplicatepersonsconsumer/children/duplicateactionscontrol_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>NonselfDuplicates</fieldName>
+ </dependency>
</entityConsumer>
<entityActionGroup>
<name>DuplicateClusterActionGroup</name>
@@ -140,11 +140,6 @@
</entityActionGroup>
<entityConsumer>
<name>DuplicatesUnrelatedOrganisationConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>DuplicatesUnrelated_entity</entityName>
- <fieldName>UnrelatedOrganisationsProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>TargetEntity</name>
@@ -155,6 +150,11 @@
<valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/duplicatesunrelatedorganisationconsumer/children/clusterid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DuplicatesUnrelated_entity</entityName>
+ <fieldName>UnrelatedOrganisationsProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityActionGroup>
<name>PersonOpenClusterDetailActionGroup</name>
@@ -186,11 +186,6 @@
</entityActionGroup>
<entityConsumer>
<name>DuplicateOrganisationsConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>NonselfDuplicates</fieldName>
- </dependency>
<children>
<entityParameter>
<name>DuplicateActionsControl_param</name>
@@ -201,6 +196,11 @@
<valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/duplicateorganisationsconsumer/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>NonselfDuplicates</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index 8bf5d69b2368ae1236e0d8eedd86745dbfa9927f..a3ed777f95a55fdcb1a293e7ba64444d9eb0ebdb 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -26,6 +26,13 @@
<name>EmployeeRoles</name>
<targetContextField>TARGETCONTEXT</targetContextField>
<targetIdField>UID</targetIdField>
+ <children>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
@@ -34,13 +41,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>UserTitle_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityField>
<name>ROLE</name>
@@ -51,17 +51,17 @@
</entityField>
<entityConsumer>
<name>Roles</name>
- <dependency>
- <name>dependency</name>
- <entityName>Role_entity</entityName>
- <fieldName>FilteredRoles</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ExcludeRoles_param</name>
<valueProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/roles/children/excluderoles_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Role_entity</entityName>
+ <fieldName>FilteredRoles</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>TARGETCONTEXT</name>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 68c651f1fc8e501cb7342373ff56dfdffd0e3a7b..1a1e23ee1f1ae219859ec7c852cfb9d68271b8aa 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -111,11 +111,6 @@
<entityConsumer>
<name>Attributes</name>
<onValidation>%aditoprj%/entity/Employee_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -126,6 +121,11 @@
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
</entityConsumer>
<entityFieldGroup>
<name>NAME_fieldGroup</name>
@@ -156,25 +156,20 @@
</entityField>
<entityConsumer>
<name>EmployeeRoles</name>
- <dependency>
- <name>dependency</name>
- <entityName>EmployeeRole_entity</entityName>
- <fieldName>EmployeeRoles</fieldName>
- </dependency>
<children>
<entityParameter>
<name>UserTitle_param</name>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>AttributeTree</name>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
+ <entityName>EmployeeRole_entity</entityName>
+ <fieldName>EmployeeRoles</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -185,15 +180,15 @@
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentTable_param</name>
@@ -204,11 +199,22 @@
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>Employees</name>
<lookupIdfield>CONTACT_ID</lookupIdfield>
<filterVariablesProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/filterVariablesProcess.js</filterVariablesProcess>
+ <children>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>0ca415b9-a940-424e-bee8-05c007b20659</name>
@@ -283,26 +289,20 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
</entityProvider>
<entityConsumer>
<name>Departments</name>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ParentId_param</name>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/departments/children/parentid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>openAdminView</name>
@@ -313,17 +313,17 @@
</entityActionField>
<entityConsumer>
<name>PossibleRoles</name>
- <dependency>
- <name>dependency</name>
- <entityName>Role_entity</entityName>
- <fieldName>FilteredRoles</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ExcludeRoles_param</name>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/possibleroles/children/excluderoles_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Role_entity</entityName>
+ <fieldName>FilteredRoles</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>SHORT_UID</name>
@@ -364,31 +364,31 @@
<entityConsumer>
<name>MyPermission</name>
<refreshParent v="false" />
- <dependency>
- <name>dependency</name>
- <entityName>PermissionCalendar_entity</entityName>
- <fieldName>Permissions</fieldName>
- </dependency>
<children>
<entityParameter>
<name>PermissionProcurer_param</name>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/mypermission/children/permissionprocurer_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>TheirPermissions</name>
<dependency>
<name>dependency</name>
<entityName>PermissionCalendar_entity</entityName>
<fieldName>Permissions</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>TheirPermissions</name>
<children>
<entityParameter>
<name>PermissionDealer_param</name>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/theirpermissions/children/permissiondealer_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>PermissionCalendar_entity</entityName>
+ <fieldName>Permissions</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>PICTURE</name>
@@ -410,17 +410,17 @@
</entityParameter>
<entityConsumer>
<name>EmployeeTokens</name>
- <dependency>
- <name>dependency</name>
- <entityName>EmployeeToken_entity</entityName>
- <fieldName>EmployeeTokenProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>employeeId_param</name>
<valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeetokens/children/employeeid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>EmployeeToken_entity</entityName>
+ <fieldName>EmployeeTokenProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>EmployeeContactIdWhitelist_param</name>
diff --git a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
index 2840322c0f7c58e64da8ab5f42cd09ded6c47426..b8dcbc15cc2c0d02368ba2b6ffa60e8023e2c034 100644
--- a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
+++ b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
@@ -29,11 +29,6 @@
</entityParameter>
<entityConsumer>
<name>ExportTemplateComsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>ExportTemplate_entity</entityName>
- <fieldName>ExportTemplateIDs</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ExportTemplateIDs_param</name>
@@ -44,6 +39,11 @@
<valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exporttemplatecomsumer/children/comingfrom_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ExportTemplate_entity</entityName>
+ <fieldName>ExportTemplateIDs</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>UID</name>
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
index eafabfcf64d2ef9eaea73303673e6b186e7ab184..58d538be7dfd130e9c953f05ff1d7f2145d3e1ac 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -10,14 +10,13 @@ import("system.entities");
if(vars.get("$local.idvalues") && vars.get("$local.idvalues").length != 0)
{
- var selected = vars.get("$local.idvalues");
- var selectedFavos = [];
+ var seekedByCore = vars.get("$local.idvalues");
+ var seekedByCoreFavos = [];
- for(h = 0; h < selected.length; h++)
- selectedFavos.push(buildFavoriteForDeletion(favorite.getFavorites(favorite.createGetFavoriteByIdConfig()
- .setId(selected[h]))[0]));
+ var config = favorite.createGetFavoriteByIdConfig().setIds(seekedByCore);
+ seekedByCoreFavos = buildFavoritesForDeletion(favorite.getFavorites(config));
- result.object(selectedFavos);
+ result.object(seekedByCoreFavos);
}
else
{
@@ -32,12 +31,16 @@ else
var finishedFavoritesForDisplay = [];
var allContexts = getAllFavoriteEnabledContexts();
+ var allFavorites = favorite.getFavorites(favorite.createGetFavoritesConfig()
+ .setUserId(tools.getCurrentUser()[tools.NAME]));
for(i = 0; i < allContexts.length; i++)
{
- var allFavorites = favorite.getFavorites(favorite.createGetFavoritesConfig()
- .setUserId(tools.getCurrentUser()[tools.NAME])
- .setObjectType(allContexts[i]));
- var builtFavos = buildFavorites(allFavorites, allContexts[i]);
+ var contextFavorites = [];
+ for(x = 0; x < allFavorites.length; x++)
+ if(allFavorites[x]["objecttype"] === allContexts[i])
+ contextFavorites.push(allFavorites[x])
+
+ var builtFavos = buildFavorites(contextFavorites, allContexts[i]);
for(let x = 0; x < builtFavos.length; x++)
{
@@ -193,29 +196,36 @@ function getAllFavoriteEnabledContexts()
return permittedContexts;
}
-function buildFavoriteForDeletion(favo)
-{
- var groupid = favo["group"]["groupid"];
- var grouptitle = favo["group"]["grouptitle"];
- var grouptype = favo["group"]["grouptype"];
- var objecttype = favo["objecttype"];
- var image = "";
- var rowid = favo["rowid"];
- var title = "";
- var id = favo["id"];
- var user = favo["group"]["groupuser"];
-
- return [
- groupid,
- grouptitle,
- grouptype,
- objecttype,
- image,
- rowid,
- title,
- id,
- user
- ];
+function buildFavoritesForDeletion(favos)
+{
+ var results = [];
+
+ for(i = 0; i < favos.length; i++)
+ {
+ var groupid = favos[i]["group"]["groupid"];
+ var grouptitle = favos[i]["group"]["grouptitle"];
+ var grouptype = favos[i]["group"]["grouptype"];
+ var objecttype = favos[i]["objecttype"];
+ var image = "";
+ var rowid = favos[i]["rowid"];
+ var title = "";
+ var id = favos[i]["id"];
+ var user = favos[i]["group"]["groupuser"];
+
+ results.push([
+ groupid,
+ grouptitle,
+ grouptype,
+ objecttype,
+ image,
+ rowid,
+ title,
+ id,
+ user
+ ]);
+ }
+
+ return results;
}
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js
index 5c5ab2b521e59ad3ba0e1b71bb5c99b51044fdf3..70ac8f02ca1518b3ce375c2f4c5901d08d2c1d4f 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js
@@ -1,4 +1,5 @@
import("system.vars");
import("system.favorite");
-favorite.remove(favorite.createRemoveByIdConfig().setFavoriteRecordId(vars.get("$local.uid")));
\ No newline at end of file
+var selected = vars.get("$local.uid");
+favorite.remove(favorite.createRemoveMultipleByIdConfig().setFavoriteRecordIds([selected]));
\ No newline at end of file
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index 75fd4c7ae9258a52deeef0b48abc4dc96905bda3..7487314f3553b288e9711c5c4bf89961a3aeb295 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -53,11 +53,6 @@
</entityField>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -65,6 +60,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>OBJECT_TYPE</name>
@@ -75,11 +75,6 @@
</entityField>
<entityConsumer>
<name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -88,6 +83,11 @@
<mandatory v="true" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Contexts</name>
diff --git a/entity/ImportField_Entity/ImportField_Entity.aod b/entity/ImportField_Entity/ImportField_Entity.aod
index cb5bb3fb6434c7a789b8d105cc18d40891bfd3f5..8b47e84bc5da830c573bd68818dceb0f58ad71f3 100644
--- a/entity/ImportField_Entity/ImportField_Entity.aod
+++ b/entity/ImportField_Entity/ImportField_Entity.aod
@@ -72,17 +72,17 @@
</entityParameter>
<entityConsumer>
<name>KeywordImportFields</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/ImportField_Entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index 81be338ad3887462424137b8445aaeef00347076..16bede930f35ec4d63ade98263a7b0b2ccb29d1a 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -51,6 +51,13 @@
<name>AttributesForKeywordEntry</name>
<titlePlural></titlePlural>
<recordContainer>db</recordContainer>
+ <children>
+ <entityParameter>
+ <name>KeywordEntryId_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>490d12c0-6ace-42e5-89e1-d40b25322161</name>
@@ -59,13 +66,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>KeywordEntryId_param</name>
- <expose v="true" />
- <mandatory v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>ContainerName_param</name>
@@ -75,11 +75,6 @@
</entityParameter>
<entityConsumer>
<name>KeywordAttributes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordAttribute_entity</entityName>
- <fieldName>SpecificContainerKeyword</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -92,6 +87,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordAttribute_entity</entityName>
+ <fieldName>SpecificContainerKeyword</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>KeywordEntryId_param</name>
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index 660467e301eb5004b4aca71e1aa786ba5d0df3cc..13cb14c44b1c2b480f27cd3e54c51a2fd6b0af97 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -69,11 +69,6 @@
</entityParameter>
<entityConsumer>
<name>KeywordAttributeTypes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -81,6 +76,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index da1fd18132223cb497a95878741c0b95b08c5448..d4054b78086a57ff19b59201546b0f0483bebb0c 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -645,7 +645,7 @@
<name>ExcludedKeyIdsSubquery_param</name>
<expose v="true" />
<documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/excludedkeyidssubquery_param/documentation.adoc</documentation>
- <description>PARAMETER</description>
+ <description>DEPRECATED!!! DO NOT USE!!!</description>
</entityParameter>
<entityParameter>
<name>WhitelistIds_param</name>
@@ -667,6 +667,10 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityParameter>
+ <name>BlacklistIds_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/KeywordEntry_entity/entityfields/excludedkeyidssubquery_param/documentation.adoc b/entity/KeywordEntry_entity/entityfields/excludedkeyidssubquery_param/documentation.adoc
index 55fde66fa9fdb8f3dfebb3341ea9f95471189c32..5992cb1957a8d69753478d3e19384a511371d90f 100644
--- a/entity/KeywordEntry_entity/entityfields/excludedkeyidssubquery_param/documentation.adoc
+++ b/entity/KeywordEntry_entity/entityfields/excludedkeyidssubquery_param/documentation.adoc
@@ -1,2 +1,5 @@
+DEPRECATED! This parameter does not work with caching, because if the result of the subquery changes while the subquery itself doesn't, the cached
+result won't be updated
+
Can be filled with a subquery-string, which delivers KeyIds to exclude.
The subquery is used insade a "KEYID not in(...)"
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js b/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js
index bd9e8c01354097c564fcb6fd65e3e5390fbb9f10..822b1e5a4479fd59faf95e148e48d34d917071e2 100644
--- a/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js
+++ b/entity/KeywordEntry_entity/recordcontainers/db/cacheKeyProcess.js
@@ -1,6 +1,6 @@
import("CachedRecordContainer_lib");
import("system.result")
-var res = CachedRecordContainerUtils.getCommonKey("$param.ContainerName_param", "$param.ExcludedKeyIdsSubquery_param", "$param.OnlyActives_param"
+var res = CachedRecordContainerUtils.getCommonKey("$param.ContainerName_param", "$param.BlacklistIds_param", "$param.OnlyActives_param"
, "$param.WhitelistIds_param");
result.string(res);
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js b/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
index c2921e933fff759455fdd5adefee3f8731fe79d3..90f58744de34c09de3164a324889dc3d3bf03859 100644
--- a/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.vars");
import("system.db");
import("system.result");
@@ -13,14 +14,16 @@ if (vars.get("$param.OnlyActives_param") == "true")
if (vars.exists("$param.ExcludedKeyIdsSubquery_param") && vars.get("$param.ExcludedKeyIdsSubquery_param"))
cond.and("AB_KEYWORD_ENTRY.KEYID not in (" + vars.get("$param.ExcludedKeyIdsSubquery_param") + ")");
-if (vars.getString("$param.WhitelistIds_param"))
+var whitelist = Utils.parseJSON(vars.get("$param.WhitelistIds_param"));
+var blacklist = Utils.parseJSON(vars.get("$param.BlacklistIds_param"));
+if (whitelist)
{
- var whitelist = JSON.parse(vars.getString("$param.WhitelistIds_param"));
-
if (whitelist.length > 0)
- cond.and("AB_KEYWORD_ENTRY.KEYID", JSON.parse(vars.getString("$param.WhitelistIds_param")), SqlBuilder.IN());
+ cond.and("AB_KEYWORD_ENTRY.KEYID", whitelist, SqlBuilder.IN());
else
cond.noResult(); // force empty result if whitelist is empty
}
+if (blacklist && blacklist.length > 0)
+ cond.and("AB_KEYWORD_ENTRY.KEYID", blacklist, SqlBuilder.NOT_IN());
result.string(cond.toString());
diff --git a/entity/KnowledgeDiscussion_entity/KnowledgeDiscussion_entity.aod b/entity/KnowledgeDiscussion_entity/KnowledgeDiscussion_entity.aod
index 79d764acc09b4d2c7f678768bbbc646a4e2a1a14..81246e32ac3a583b322226484c6a2b62a406c5ea 100644
--- a/entity/KnowledgeDiscussion_entity/KnowledgeDiscussion_entity.aod
+++ b/entity/KnowledgeDiscussion_entity/KnowledgeDiscussion_entity.aod
@@ -62,11 +62,6 @@
</entityField>
<entityConsumer>
<name>StatusKeyword</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -77,6 +72,11 @@
<valueProcess>%aditoprj%/entity/KnowledgeDiscussion_entity/entityfields/statuskeyword/children/onlyactives_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>ByKnowledgeId</name>
diff --git a/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod b/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod
index 93ad79b6566ef190263ed841571ff5d38d9e2341..e77405dfb6540f4ce466f897ed6bb42fd94866c1 100644
--- a/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod
+++ b/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod
@@ -58,17 +58,17 @@
</entityConsumer>
<entityConsumer>
<name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>Entity_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeLink_entity/entityfields/objects/children/entity_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectProxy_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>KnowledgeManagementId_param</name>
@@ -79,14 +79,6 @@
<targetContextField>OBJECT_TYPE</targetContextField>
<targetIdField>ROW_ID</targetIdField>
<documentation>%aditoprj%/entity/KnowledgeLink_entity/entityfields/byknowledgeid/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>c3ed10c1-db55-4e55-9c18-2b8d400df033</name>
- <entityName>KnowledgeManagement_entity</entityName>
- <fieldName>LinksByKnowledgeId</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -97,6 +89,14 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>c3ed10c1-db55-4e55-9c18-2b8d400df033</name>
+ <entityName>KnowledgeManagement_entity</entityName>
+ <fieldName>LinksByKnowledgeId</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityParameter>
<name>RowId_param</name>
diff --git a/entity/KnowledgeManagementTags_entity/KnowledgeManagementTags_entity.aod b/entity/KnowledgeManagementTags_entity/KnowledgeManagementTags_entity.aod
index 14f18612c20c2205a6932245f0baa06728d0b0e1..94e8106d88dd3b8f4f1b2205b0d9d5b300bc8bb2 100644
--- a/entity/KnowledgeManagementTags_entity/KnowledgeManagementTags_entity.aod
+++ b/entity/KnowledgeManagementTags_entity/KnowledgeManagementTags_entity.aod
@@ -15,6 +15,12 @@
<entityProvider>
<name>ByKnowledgeManagementId</name>
<documentation>%aditoprj%/entity/KnowledgeManagementTags_entity/entityfields/byknowledgemanagementid/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>KnowledgeManagementId_param</name>
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>8d86a61b-0fe3-44c4-a512-e044c990fded</name>
@@ -23,12 +29,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>KnowledgeManagementId_param</name>
- <mandatory v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityField>
<name>TAG</name>
diff --git a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
index 0d58306fea52a8b0dce7324e1232499c395522ff..93e235fcee3100efa34cbea44a49489448453b71 100644
--- a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
+++ b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
@@ -101,32 +101,32 @@
<refreshParent v="true" />
<state>EDITABLE</state>
<onValidation>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>KnowledgeManagementTags_entity</entityName>
- <fieldName>ByKnowledgeManagementId</fieldName>
- </dependency>
<children>
<entityParameter>
<name>KnowledgeManagementId_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/children/knowledgemanagementid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KnowledgeManagementTags_entity</entityName>
+ <fieldName>ByKnowledgeManagementId</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>DiscussionsByKnowledgeId</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>KnowledgeDiscussion_entity</entityName>
- <fieldName>ByKnowledgeId</fieldName>
- </dependency>
<children>
<entityParameter>
<name>KnowledgeId_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/discussionsbyknowledgeid/children/knowledgeid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KnowledgeDiscussion_entity</entityName>
+ <fieldName>ByKnowledgeId</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>Provider</name>
@@ -142,42 +142,37 @@
</entityConsumer>
<entityConsumer>
<name>KeywordKnowledgeType</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/keywordknowledgetype/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordPublish</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordPublish</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/keywordpublish/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>indexTag</name>
</entityField>
<entityConsumer>
<name>LinkedDocuments</name>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentTable_param</name>
@@ -188,6 +183,11 @@
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/linkeddocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>openEntryAsMail</name>
@@ -200,17 +200,17 @@
<entityConsumer>
<name>LinksByKnowledgeId</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>KnowledgeLink_entity</entityName>
- <fieldName>ByKnowledgeId</fieldName>
- </dependency>
<children>
<entityParameter>
<name>KnowledgeManagementId_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/linksbyknowledgeid/children/knowledgemanagementid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KnowledgeLink_entity</entityName>
+ <fieldName>ByKnowledgeId</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>LastChange</name>
@@ -219,17 +219,17 @@
</entityField>
<entityConsumer>
<name>LogHistories</name>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>exportHTML_action</name>
@@ -271,11 +271,6 @@
<name>KnowledgeRoles</name>
<stateProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/knowledgeroles/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/knowledgeroles/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>KnowledgeRole_entity</entityName>
- <fieldName>KnowledgeRole</fieldName>
- </dependency>
<children>
<entityParameter>
<name>KnowledgeManagement_param</name>
@@ -287,14 +282,14 @@
<expose v="true" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Tasks</name>
<dependency>
<name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
+ <entityName>KnowledgeRole_entity</entityName>
+ <fieldName>KnowledgeRole</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Tasks</name>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -309,6 +304,11 @@
<valueProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>RESPONSIBLE_CONTACT_ID</name>
diff --git a/entity/KnowledgeRole_entity/KnowledgeRole_entity.aod b/entity/KnowledgeRole_entity/KnowledgeRole_entity.aod
index 427a175e7b5d20abc6cabca10d456d38d1512933..fe16e94a9f9fc50735030a2c181ef8cf5e38c9af 100644
--- a/entity/KnowledgeRole_entity/KnowledgeRole_entity.aod
+++ b/entity/KnowledgeRole_entity/KnowledgeRole_entity.aod
@@ -17,17 +17,17 @@
</entityField>
<entityConsumer>
<name>NewsRole</name>
- <dependency>
- <name>dependency</name>
- <entityName>Role_entity</entityName>
- <fieldName>FilterRolesWithoutPermission</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ExcludeRoles_param</name>
<valueProcess>%aditoprj%/entity/KnowledgeRole_entity/entityfields/newsrole/children/excluderoles_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Role_entity</entityName>
+ <fieldName>FilterRolesWithoutPermission</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>KnowledgeRole</name>
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 2afefb3f30bcad00355211100c7b648e58118ddf..6c74b7472d2e9dc5877912344d0593fb0cc9edaf 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -33,6 +33,12 @@
<lookupIdfield>ISO3</lookupIdfield>
<documentation>%aditoprj%/entity/Language_entity/entityfields/iso3name/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
+ <children>
+ <entityParameter>
+ <name>ExcludedIds_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>471b099a-03ab-4c49-8372-729b1e789ecc</name>
@@ -95,17 +101,17 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ExcludedIds_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityProvider>
<name>ISO3NameFiltered</name>
<lookupIdfield>ISO3</lookupIdfield>
<documentation>%aditoprj%/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>ExcludedIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>2df9d0ed-c26b-4166-9667-786a55146e05</name>
@@ -114,12 +120,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ExcludedIds_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>ExcludedIds_param</name>
diff --git a/entity/LeadLog_entity/LeadLog_entity.aod b/entity/LeadLog_entity/LeadLog_entity.aod
index ca424a627c7dd8b54e6c90a2383f372981e6c5d3..c5d2fde11e07a8ac46e81662fc89aa749460597f 100644
--- a/entity/LeadLog_entity/LeadLog_entity.aod
+++ b/entity/LeadLog_entity/LeadLog_entity.aod
@@ -61,11 +61,6 @@
</entityField>
<entityConsumer>
<name>LogDocuments</name>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentName_param</name>
@@ -80,6 +75,11 @@
<valueProcess>%aditoprj%/entity/LeadLog_entity/entityfields/logdocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/Lead_entity/Lead_entity.aod b/entity/Lead_entity/Lead_entity.aod
index 6a8a9fed94965be2a51c7c27cef30ed371dc7631..1889a635743be724c4dc634e2c9a4bca56e66828 100644
--- a/entity/Lead_entity/Lead_entity.aod
+++ b/entity/Lead_entity/Lead_entity.aod
@@ -77,17 +77,17 @@
</entityField>
<entityConsumer>
<name>ContactId</name>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>Contact</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Lead_entity/entityfields/contactid/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Contact</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>LEADDUP_STATUS</name>
@@ -108,11 +108,6 @@
</entityField>
<entityConsumer>
<name>KeywordDupStatus</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -120,6 +115,11 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
index f985150a0e1cb55d7858aa3540456b609937f07d..f525794d52d51a5b529dc78b5247db6196e626d9 100644
--- a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
+++ b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
@@ -70,17 +70,17 @@
</entityParameter>
<entityConsumer>
<name>KeywordImportFields</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index e14d1cf8eba7469610518dc02aab6709166a5fa4..141e0c172a3f2b0d90e9efc1bff354503ff3d12e 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -105,17 +105,17 @@
</entityField>
<entityConsumer>
<name>KeywordImportStatus</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/keywordimportstatus/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Leadimport_Empl</name>
@@ -154,25 +154,20 @@
</entityProvider>
<entityConsumer>
<name>ImportFieldID</name>
- <dependency>
- <name>dependency</name>
- <entityName>ImportField_Entity</entityName>
- <fieldName>LeadImportIds</fieldName>
- </dependency>
<children>
<entityParameter>
<name>LeadImportID</name>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/importfieldid/children/leadimportid/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>DocumentC</name>
<dependency>
<name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
+ <entityName>ImportField_Entity</entityName>
+ <fieldName>LeadImportIds</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>DocumentC</name>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -183,28 +178,28 @@
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/documentc/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>LogHistoryC</name>
<dependency>
<name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>LogHistoryC</name>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/loghistoryc/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Tasks</name>
<dependency>
<name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Tasks</name>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -215,15 +210,15 @@
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<onValidation>%aditoprj%/entity/Leadimport_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -234,6 +229,11 @@
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>UID</name>
@@ -266,45 +266,45 @@
</entityActionField>
<entityConsumer>
<name>LeadTempC</name>
+ <children>
+ <entityParameter>
+ <name>LeadImportId</name>
+ <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadtempc/children/leadimportid/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
<dependency>
<name>dependency</name>
<entityName>LeadTemp_entity</entityName>
<fieldName>LeadTempP</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>LeadC</name>
<children>
<entityParameter>
<name>LeadImportId</name>
- <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadtempc/children/leadimportid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadc/children/leadimportid/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>LeadC</name>
<dependency>
<name>dependency</name>
<entityName>Lead_entity</entityName>
<fieldName>LeadP</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>LeadLogC</name>
<children>
<entityParameter>
<name>LeadImportId</name>
- <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadc/children/leadimportid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadlogc/children/leadimportid/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>LeadLogC</name>
<dependency>
<name>dependency</name>
<entityName>LeadLog_entity</entityName>
<fieldName>LeadLogP</fieldName>
</dependency>
- <children>
- <entityParameter>
- <name>LeadImportId</name>
- <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadlogc/children/leadimportid/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
</entityConsumer>
<entityActionField>
<name>LeadimportReset</name>
@@ -316,17 +316,17 @@
</entityActionField>
<entityConsumer>
<name>LeadimportMappings</name>
- <dependency>
- <name>dependency</name>
- <entityName>LeadimportMappingAssistant_entity</entityName>
- <fieldName>LeadimportMapping</fieldName>
- </dependency>
<children>
<entityParameter>
<name>Leadimport_ID_param</name>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LeadimportMappingAssistant_entity</entityName>
+ <fieldName>LeadimportMapping</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>LEADIMPORT_OBJECTTYPE</name>
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index 5e357ba666061841bd96270267b9be9f7dc091ca..6140a981138f2c49c09a60f45e731f0685e65c3e 100644
--- a/entity/Letter_entity/Letter_entity.aod
+++ b/entity/Letter_entity/Letter_entity.aod
@@ -22,11 +22,6 @@
</entityField>
<entityConsumer>
<name>DocumentTemplates</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -37,6 +32,11 @@
<valueProcess>%aditoprj%/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>ContactId_param</name>
diff --git a/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod b/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod
index 791b08d72b2e85a807d11a6c47284056ae16a977..8efdde1d70c6ad1164767134ad57e8e1282e13b9 100644
--- a/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod
+++ b/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod
@@ -22,11 +22,6 @@
<entityConsumer>
<name>WorkflowLauncherIntegration</name>
<isOneToOneRelationship v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowLauncher_entity</entityName>
- <fieldName>Integration</fieldName>
- </dependency>
<children>
<entityParameter>
<name>Validationerrors_param</name>
@@ -45,6 +40,11 @@
<valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targetcontext_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>WorkflowLauncher_entity</entityName>
+ <fieldName>Integration</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>ObjectType_param</name>
@@ -60,11 +60,6 @@
</entityParameter>
<entityConsumer>
<name>EmailTemplates</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -75,6 +70,11 @@
<valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/comingfrom_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
</entityConsumer>
</entityFields>
<recordContainers>
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 576d1171a8410d0c8fc1a15614a746438582b1c0..4340bcf19196be6814b2294b553a9013ceea00bb 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -26,6 +26,16 @@
<targetContextField>TYPE</targetContextField>
<targetIdField>ROW_ID</targetIdField>
<recordContainer>jdito</recordContainer>
+ <children>
+ <entityParameter>
+ <name>ContextName_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ID_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>7da88ffb-4292-4fe2-88e2-dda2dc4aa625</name>
@@ -46,16 +56,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ContextName_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ID_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityField>
<name>PARENT_ID</name>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 2668a0419e9a0b0d0d74c0f6f25867fd05c13faf..07dd08d1d45a3f702685d1a844e52d28ff548ddf 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -173,6 +173,7 @@
<entityField>
<name>SUBCATEGORY</name>
<title>Subcategory</title>
+ <groupable v="true" />
</entityField>
</entityFields>
<recordContainers>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index a2a47eb12c23e662e6c4e789dd4f4b5ae4d032a0..4488b7e9c3c10e6801d1c176c4936df657b38717 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -30,6 +30,13 @@
</entityParameter>
<entityProvider>
<name>ObjectRelationTypes</name>
+ <children>
+ <entityParameter>
+ <name>OnlyFirstSide_param</name>
+ <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>81f4567a-fc89-49fc-be86-77600cb66305</name>
@@ -38,13 +45,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>OnlyFirstSide_param</name>
- <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>OnlyFirstSide_param</name>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 4266919a6b46eca1ea8ba194b849935a8c606e23..7edb15c3b6b7c93b3b7c06acdec09c16b828d48c 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -17,6 +17,16 @@
<name>TreeProvider</name>
<targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>TARGET_ID</targetIdField>
+ <children>
+ <entityParameter>
+ <name>Uid_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>RelationTypes_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
@@ -31,16 +41,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>Uid_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>RelationTypes_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>ObjectIds_param</name>
@@ -68,17 +68,17 @@
</entityField>
<entityConsumer>
<name>ObjectRelationTypes</name>
- <dependency>
- <name>dependency</name>
- <entityName>ObjectRelationType_entity</entityName>
- <fieldName>ObjectRelationTypes</fieldName>
- </dependency>
<children>
<entityParameter>
<name>SourceObjectTypes_param</name>
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypes/children/sourceobjecttypes_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectRelationType_entity</entityName>
+ <fieldName>ObjectRelationTypes</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>ObjectTypes_param</name>
@@ -126,11 +126,6 @@
</entityField>
<entityConsumer>
<name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -142,6 +137,11 @@
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityActionGroup>
<name>alter</name>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index e3633e2483c72e9e19c36651dd093c209f4b90d0..884a3a733c379f529f1d10c2ad7b4cd9d144900f 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -27,6 +27,21 @@
<targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/allobjects/targetConsumerProcess.js</targetConsumerProcess>
<documentation>%aditoprj%/entity/Object_entity/entityfields/allobjects/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>445b79b3-e826-40d1-b6c2-46d62daf0818</name>
@@ -65,43 +80,23 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ExcludedObjectIds_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityConsumer>
<name>Organisations</name>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ExcludedContactIds_param</name>
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Persons</name>
<dependency>
<name>dependency</name>
- <entityName>Person_entity</entityName>
+ <entityName>Organisation_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Persons</name>
<children>
<entityParameter>
<name>ExcludedContactIds_param</name>
@@ -112,34 +107,39 @@
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/persons/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Offers</name>
<dependency>
<name>dependency</name>
- <entityName>Offer_entity</entityName>
+ <entityName>Person_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Offers</name>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Orders</name>
<dependency>
<name>dependency</name>
- <entityName>Order_entity</entityName>
+ <entityName>Offer_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Orders</name>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/orders/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Products</name>
@@ -151,31 +151,31 @@
</entityConsumer>
<entityConsumer>
<name>Contracts</name>
- <dependency>
- <name>dependency</name>
- <entityName>Contract_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/contracts/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Salesprojects</name>
<dependency>
<name>dependency</name>
- <entityName>Salesproject_entity</entityName>
+ <entityName>Contract_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Salesprojects</name>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>ExcludedObjectIds_param</name>
@@ -185,6 +185,21 @@
<entityProvider>
<name>FilteredObjects</name>
<targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/filteredobjects/targetConsumerProcess.js</targetConsumerProcess>
+ <children>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>e644a709-cc8f-425e-bef2-9c51eea9bbe9</name>
@@ -205,21 +220,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ExcludedObjectIds_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityConsumer>
<name>Campaigns</name>
@@ -243,17 +243,17 @@
</entityParameter>
<entityConsumer>
<name>PrivatePersons</name>
- <dependency>
- <name>dependency</name>
- <entityName>PrivatePerson_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ExcludedPersonIds_param</name>
<valueProcess>%aditoprj%/entity/Object_entity/entityfields/privatepersons/children/excludedpersonids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>PrivatePerson_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Activities</name>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index e486ce29844d16dea182c205a9b5cdb696acfdf5..5349b4d8fd4c116790e08f7527679c5de5f74b5f 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -117,11 +117,6 @@
<name>Offeritems</name>
<refreshParent v="true" />
<description></description>
- <dependency>
- <name>dependency</name>
- <entityName>Offeritem_entity</entityName>
- <fieldName>OfferItems</fieldName>
- </dependency>
<children>
<entityParameter>
<name>OfferId_param</name>
@@ -151,6 +146,11 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/language_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Offeritem_entity</entityName>
+ <fieldName>OfferItems</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>newOfferVersion</name>
@@ -247,27 +247,22 @@
</entityField>
<entityConsumer>
<name>AnyContacts</name>
- <dependency>
- <name>dependency</name>
- <entityName>AnyContact_entity</entityName>
- <fieldName>OnlySameCompany</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/anycontacts/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AnyContact_entity</entityName>
+ <fieldName>OnlySameCompany</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -278,15 +273,15 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>MainDocuments</name>
- <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
+ <fieldName>Documents</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>MainDocuments</name>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -297,6 +292,11 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>ADDRESS</name>
@@ -323,11 +323,6 @@
</entityField>
<entityConsumer>
<name>KeywordCurrencies</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -335,14 +330,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordOfferStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordOfferStates</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -350,6 +345,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>newOrder</name>
@@ -367,11 +367,6 @@
</entityConsumer>
<entityConsumer>
<name>KeywordProbabilities</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -379,14 +374,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Activities</name>
<dependency>
<name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Activities</name>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -401,6 +396,11 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
@@ -412,26 +412,6 @@
</entityActionField>
<entityProvider>
<name>ContactOffers</name>
- <dependencies>
- <entityDependency>
- <name>5c9720b5-1288-4a30-88fd-6dcff6359083</name>
- <entityName>Person_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b308795f-3c81-4e60-99ca-3b5f8e82f62a</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a74b02c4-bdb3-4ba8-9207-66a0af528b1b</name>
- <entityName>Order_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -482,6 +462,26 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>5c9720b5-1288-4a30-88fd-6dcff6359083</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b308795f-3c81-4e60-99ca-3b5f8e82f62a</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>a74b02c4-bdb3-4ba8-9207-66a0af528b1b</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityParameter>
<name>OfferCurrency_param</name>
@@ -551,40 +551,35 @@
</entityField>
<entityConsumer>
<name>KeywordPaymentTerm</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordDeliveryTerm</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDeliveryTerm</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -599,6 +594,11 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>INFO</name>
@@ -610,11 +610,6 @@
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Offer_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -625,6 +620,11 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>OfferPaymentTerm_param</name>
@@ -664,17 +664,17 @@
</entityField>
<entityConsumer>
<name>PossibleAddresses</name>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>OrganisationAndContactAddresses</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>OrganisationAndContactAddresses</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>ChoosenTEXHeader</name>
@@ -716,11 +716,6 @@
</entityField>
<entityConsumer>
<name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -731,14 +726,14 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/objects/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Contexts</name>
<dependency>
<name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Exclusive</fieldName>
+ <entityName>Object_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Contexts</name>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -749,18 +744,15 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Exclusive</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>Links</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>88a166e6-ccd0-4d51-b554-e3327f66d834</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>OfferDeliveryTerm_param</name>
@@ -816,6 +808,14 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>88a166e6-ccd0-4d51-b554-e3327f66d834</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -833,11 +833,6 @@
</entityField>
<entityConsumer>
<name>DocumentTemplateTexHeader</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -848,20 +843,25 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>LogHistories</name>
<dependency>
<name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>LogHistories</name>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>FOOTER</name>
@@ -888,11 +888,6 @@
</entityField>
<entityConsumer>
<name>DocumentTemplateTexFooter</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -903,20 +898,25 @@
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Salesprojects</name>
<dependency>
<name>dependency</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Salesprojects</fieldName>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Salesprojects</name>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>CONTACT_ID</name>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index a900e6473e8d7ded55a0ca946aa0798296bf657e..281231dc1f88650ef4b04dd1f128b7d1438a4e60 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -163,14 +163,6 @@
<entityProvider>
<name>OfferItems</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Offeritems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -194,6 +186,14 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Offeritems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>INFO</name>
@@ -204,11 +204,6 @@
</entityField>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -216,14 +211,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -231,6 +226,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Products</name>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 64b551ee2df1561b3ccfbb6e88f07aae263c0836..0bda9d9f780367d4ddabd0e30a5e482e6d67418c 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -107,11 +107,6 @@
<entityConsumer>
<name>Orderitems</name>
<description></description>
- <dependency>
- <name>dependency</name>
- <entityName>Orderitem_entity</entityName>
- <fieldName>Orderitems</fieldName>
- </dependency>
<children>
<entityParameter>
<name>OrderId_param</name>
@@ -137,6 +132,11 @@
<mandatory v="true" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Orderitem_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>NET</name>
@@ -198,11 +198,6 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -213,15 +208,15 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>MainDocuments</name>
- <stateProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
+ <fieldName>Documents</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>MainDocuments</name>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -232,28 +227,28 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Salesprojects</name>
<dependency>
<name>dependency</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Salesprojects</fieldName>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Salesprojects</name>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordCurrencies</name>
<dependency>
<name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordCurrencies</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -261,14 +256,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordStates</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -276,6 +271,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Languages</name>
@@ -294,11 +294,6 @@
</entityParameter>
<entityConsumer>
<name>Activities</name>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -313,6 +308,11 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>OFFER_ID</name>
@@ -326,11 +326,6 @@
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -345,15 +340,15 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<onValidation>%aditoprj%/entity/Order_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -364,15 +359,15 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>AttributeTree</name>
- <stateProcess>%aditoprj%/entity/Order_entity/entityfields/attributetree/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/attributetree/stateProcess.js</stateProcess>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -383,20 +378,25 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>LogHistories</name>
<dependency>
<name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>LogHistories</name>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>ORDERTYPE</name>
@@ -474,31 +474,31 @@
</entityField>
<entityConsumer>
<name>KeywordOrderTypes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordordertypes/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordDunningLevels</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDunningLevels</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keyworddunninglevels/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>OBJECT_ROWID</name>
@@ -526,11 +526,6 @@
</entityField>
<entityConsumer>
<name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -541,14 +536,14 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Contexts</name>
<dependency>
<name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Exclusive</fieldName>
+ <entityName>Object_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Contexts</name>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -559,6 +554,11 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Exclusive</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>PossibleConnectionTypes</name>
@@ -611,46 +611,46 @@
</entityField>
<entityConsumer>
<name>KeywordPaymentTerms</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keywordpaymentterms/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordDeliveryTerms</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDeliveryTerms</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/keyworddeliveryterms/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>PossibleAddresses</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/possibleaddresses/documentation.adoc</documentation>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>OrganisationAndContactAddresses</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>OrganisationAndContactAddresses</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>NOTICE</name>
@@ -667,25 +667,20 @@
</entityField>
<entityConsumer>
<name>Offers</name>
- <dependency>
- <name>dependency</name>
- <entityName>Offer_entity</entityName>
- <fieldName>ContactOffers</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>DocumentTemplateTexHeader</name>
<dependency>
<name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
+ <entityName>Offer_entity</entityName>
+ <fieldName>ContactOffers</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>DocumentTemplateTexHeader</name>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -696,14 +691,14 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>DocumentTemplateTexFooter</name>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>DocumentTemplateTexFooter</name>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -714,6 +709,11 @@
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>ChosenTexHeader</name>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 888a453225876d3097dfbf65f250e8a3576e83b5..1f80cb9b60958fc24d08fd0d68b3b04b2ff95c97 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -144,20 +144,6 @@
<entityProvider>
<name>Orderitems</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
- <entityName>Order_entity</entityName>
- <fieldName>Orderitems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
- <entityName>Order_entity</entityName>
- <fieldName>Orderitems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -180,6 +166,20 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>INFO</name>
@@ -188,11 +188,6 @@
</entityField>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -200,14 +195,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -215,6 +210,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Products</name>
diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
index 6fd9cfebf50492e7de30e44e050a9e60450778b5..c4614de972159eb81a5f83a2576106930fdee3cf 100644
--- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+++ b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
@@ -147,11 +147,6 @@
</entityField>
<entityConsumer>
<name>Departments</name>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ParentId_param</name>
@@ -162,6 +157,11 @@
<valueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/departments/children/includeparentrecord_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>User</name>
@@ -184,17 +184,17 @@
</entityField>
<entityConsumer>
<name>KeywordPermissionCalendarTypes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/keywordpermissioncalendartypes/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>PermissionDealer_param</name>
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index e18801ffb9cab3450e4dc8c5dbe77069c76add1b..afc95caa0edab0f2d58760314ef6c1987c2e5c8c 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -139,11 +139,6 @@
</entityParameter>
<entityConsumer>
<name>KeywordConditionType</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -151,14 +146,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordAccessType</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordAccessType</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -166,17 +161,17 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>PermissionActions</name>
<refreshParent v="true" />
<stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/permissionactions/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/PermissionDetail_entity/entityfields/permissionactions/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>PermissionAction_entity</entityName>
- <fieldName>PermissionActions</fieldName>
- </dependency>
<children>
<entityParameter>
<name>PermissionId_param</name>
@@ -195,6 +190,11 @@
<valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/permissionactions/children/fullpermissions_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>PermissionAction_entity</entityName>
+ <fieldName>PermissionActions</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>FULLPERMISSIONS</name>
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index b2006b9d74a349c0fd3b27a7ceca370802b5c8d6..6c80e3e90f082da76319817007d6a006c1349bd2 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -32,6 +32,12 @@
<entityProvider>
<name>MetaData</name>
<recordContainer>jDito</recordContainer>
+ <children>
+ <entityParameter>
+ <name>EntityName_param</name>
+ <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>3b2c9421-5ff0-49a3-99f0-6790f17bd76c</name>
@@ -40,42 +46,36 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>EntityName_param</name>
- <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
</entityProvider>
<entityConsumer>
<name>PermissionOverviews</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>PermissionOverview_entity</entityName>
- <fieldName>PermissionOverviews</fieldName>
- </dependency>
<children>
<entityParameter>
<name>EntityTitle_param</name>
<valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissionoverviews/children/entitytitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>PermissionOverview_entity</entityName>
+ <fieldName>PermissionOverviews</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>PermissionDetails</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>PermissionDetail_entity</entityName>
- <fieldName>Permissions</fieldName>
- </dependency>
<children>
<entityParameter>
<name>EntityTitle_param</name>
<valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissiondetails/children/entitytitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>PermissionDetail_entity</entityName>
+ <fieldName>Permissions</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>EntityName_param</name>
diff --git a/entity/PrivatePerson_entity/PrivatePerson_entity.aod b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
index e3cc784be65ee3ec69e37b8921bdc7fa2076e089..4739b80b0fe7a898f97a61866813f11d8241ff37 100644
--- a/entity/PrivatePerson_entity/PrivatePerson_entity.aod
+++ b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
@@ -60,11 +60,6 @@
</entityParameter>
<entityConsumer>
<name>Persons</name>
- <dependency>
- <name>dependency</name>
- <entityName>Contact_entity</entityName>
- <fieldName>PersonRelated</fieldName>
- </dependency>
<children>
<entityParameter>
<name>PersonId_param</name>
@@ -75,6 +70,11 @@
<valueProcess>%aditoprj%/entity/PrivatePerson_entity/entityfields/persons/children/readonly_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>PersonRelated</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 824ac6d55edafc5cacd1bee2233dc435a517f290..06bfbd33787ea979611fd6b76f525c744a211290 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -64,14 +64,6 @@
<name>ProductLinks</name>
<targetContextField>targetContext</targetContextField>
<targetIdField>SOURCE_ID</targetIdField>
- <dependencies>
- <entityDependency>
- <name>4bd06e3b-17a0-483e-a61c-818ff7e86be3</name>
- <entityName>Product_entity</entityName>
- <fieldName>ProductLinks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ProductId_param</name>
@@ -82,6 +74,14 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>4bd06e3b-17a0-483e-a61c-818ff7e86be3</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>ProductLinks</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>PRODUCTCODE</name>
@@ -104,11 +104,6 @@
</entityActionGroup>
<entityConsumer>
<name>Products</name>
- <dependency>
- <name>dependency</name>
- <entityName>Product_entity</entityName>
- <fieldName>Products</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ExcludedProducts_param</name>
@@ -116,6 +111,11 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Products</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>PRODUCTID</name>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index b8443f6c3fe69dbec64969e38d8eaec4e2d46c97..f9026b60de2e8f36a316601aa9135b5db131e0ce 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -89,46 +89,46 @@
</entityField>
<entityConsumer>
<name>Organisations</name>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Organisations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>OrganisationType_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Productprices</name>
<dependency>
<name>dependency</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>Productprices</fieldName>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Organisations</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Productprices</name>
<children>
<entityParameter>
<name>ProductId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/productprices/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Productprice_entity</entityName>
+ <fieldName>Productprices</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Stocks</name>
<selectionMode>SINGLE</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>Stock_entity</entityName>
- <fieldName>Stocks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/stocks/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Stock_entity</entityName>
+ <fieldName>Stocks</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>PICTURE</name>
@@ -137,17 +137,17 @@
<entityConsumer>
<name>StockCounts</name>
<state>READONLY</state>
- <dependency>
- <name>dependency</name>
- <entityName>Stock_entity</entityName>
- <fieldName>Stocks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/stockcounts/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Stock_entity</entityName>
+ <fieldName>Stocks</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER</name>
@@ -181,11 +181,6 @@
</entityProvider>
<entityConsumer>
<name>ProductLinks</name>
- <dependency>
- <name>dependency</name>
- <entityName>Prod2prod_entity</entityName>
- <fieldName>ProductLinks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
@@ -194,6 +189,11 @@
<mandatory v="true" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Prod2prod_entity</entityName>
+ <fieldName>ProductLinks</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>CONTACT_ID</name>
@@ -211,11 +211,6 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -226,15 +221,15 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>MainDocuments</name>
- <stateProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
+ <fieldName>Documents</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>MainDocuments</name>
+ <stateProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -245,14 +240,14 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordProductGroupcodes</name>
<dependency>
<name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordProductGroupcodes</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -260,14 +255,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -275,14 +270,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Activities</name>
<dependency>
<name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Activities</name>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -293,6 +288,11 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
@@ -306,11 +306,6 @@
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Product_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -323,6 +318,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>ExcludedProducts_param</name>
@@ -331,6 +331,12 @@
</entityParameter>
<entityProvider>
<name>Products</name>
+ <children>
+ <entityParameter>
+ <name>ExcludedProducts_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>1b12e8ef-74ba-4294-bd2b-9d4afa80798c</name>
@@ -345,12 +351,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ExcludedProducts_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityActionField>
<name>newTask</name>
@@ -361,11 +361,6 @@
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -376,15 +371,15 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -395,6 +390,11 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
@@ -418,17 +418,17 @@
</entityField>
<entityConsumer>
<name>LogHistories</name>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>ProductText_param</name>
@@ -436,11 +436,6 @@
</entityParameter>
<entityConsumer>
<name>DescriptionTranslations</name>
- <dependency>
- <name>dependency</name>
- <entityName>DescriptionTranslation_entity</entityName>
- <fieldName>DescriptionTranslations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowid_param</name>
@@ -451,6 +446,11 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/descriptiontranslations/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DescriptionTranslation_entity</entityName>
+ <fieldName>DescriptionTranslations</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>openAdminView</name>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 61bf5454ab35395bca8b5fb61db8ee6d5996cfba..26dbe5048b3b016ef6199d2c569b6ab67c3a81c9 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -143,6 +143,16 @@
<name>Productprices</name>
<titlePluralProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprices/titlePluralProcess.js</titlePluralProcess>
<recordContainer>db</recordContainer>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ProductId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>d5f4c7c4-cd21-4075-bd56-c479672dc09a</name>
@@ -163,24 +173,9 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ProductId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityConsumer>
<name>KeywordCurrencies</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -188,14 +183,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordPricelists</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordPricelists</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -203,6 +198,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>DELIVERYTERM</name>
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index fe83641faf97bfc9c0ccc2d595d9105d5ff1b3d2..8f84148e24fc98d4526789179082ecc244fe9b9e 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_entity.aod
@@ -22,11 +22,6 @@
</entityField>
<entityConsumer>
<name>Adresses</name>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>QuickEntryAdresses</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -37,14 +32,14 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/adresses/children/contacttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Communications</name>
<dependency>
<name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>QuickEntryCommunications</fieldName>
+ <entityName>Address_entity</entityName>
+ <fieldName>QuickEntryAdresses</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Communications</name>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -55,6 +50,11 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/communications/children/additionalcontactids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>QuickEntryCommunications</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Languages</name>
@@ -94,25 +94,20 @@
</entityField>
<entityConsumer>
<name>Salutations</name>
- <dependency>
- <name>dependency</name>
- <entityName>SalutationDistinct_entity</entityName>
- <fieldName>Salutations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>Language_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/salutations/children/language_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>SalutationTitles</name>
<dependency>
<name>dependency</name>
- <entityName>SalutationTitleDistinct_entity</entityName>
- <fieldName>SalutationTitles</fieldName>
+ <entityName>SalutationDistinct_entity</entityName>
+ <fieldName>Salutations</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>SalutationTitles</name>
<children>
<entityParameter>
<name>Language_param</name>
@@ -123,20 +118,25 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/salutationtitles/children/salutation_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Contacts</name>
<dependency>
<name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>QuickEntryContacts</fieldName>
+ <entityName>SalutationTitleDistinct_entity</entityName>
+ <fieldName>SalutationTitles</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Contacts</name>
<children>
<entityParameter>
<name>OrgId_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/contacts/children/orgid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>QuickEntryContacts</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>ISOLANGUAGE</name>
@@ -147,11 +147,6 @@
</entityField>
<entityConsumer>
<name>Activities</name>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>Direction_param</name>
@@ -170,6 +165,11 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>DATE_NEW</name>
@@ -185,11 +185,6 @@
</entityField>
<entityConsumer>
<name>Salesprojects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>QuickEntrySalesprojects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -200,14 +195,14 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/salesprojects/children/presettitle_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>OrgAddresses</name>
<dependency>
<name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>QuickEntryAdresses</fieldName>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>QuickEntrySalesprojects</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>OrgAddresses</name>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -218,6 +213,11 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/orgaddresses/children/contacttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>QuickEntryAdresses</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>leadQuickAcquisition</name>
@@ -228,11 +228,6 @@
</entityField>
<entityConsumer>
<name>OrgAndPersDuplicates</name>
- <dependency>
- <name>dependency</name>
- <entityName>AnyContact_entity</entityName>
- <fieldName>ContactsByIds</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContactIds_param</name>
@@ -243,6 +238,11 @@
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/organdpersduplicates/children/withprivatepersons_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AnyContact_entity</entityName>
+ <fieldName>ContactsByIds</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index bbe19fd7cf0c5a29fb1036d0841e1f07169f5e32..59562dd82e0b190e77e3cefd9f1b87e6124bf55a 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -147,39 +147,34 @@
</entityField>
<entityConsumer>
<name>SalesprojectSources</name>
- <dependency>
- <name>dependency</name>
- <entityName>SalesprojectSource_entity</entityName>
- <fieldName>SalesprojectSouces</fieldName>
- </dependency>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectsources/children/salesprojectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>SalesprojectPhaseMilestones</name>
<dependency>
<name>dependency</name>
- <entityName>SalesprojectMilestone_entity</entityName>
- <fieldName>PhaseMilestones</fieldName>
+ <entityName>SalesprojectSource_entity</entityName>
+ <fieldName>SalesprojectSouces</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>SalesprojectPhaseMilestones</name>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasemilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Forecasts</name>
<dependency>
<name>dependency</name>
- <entityName>Forecast_entity</entityName>
- <fieldName>Links</fieldName>
+ <entityName>SalesprojectMilestone_entity</entityName>
+ <fieldName>PhaseMilestones</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Forecasts</name>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -192,15 +187,15 @@
<expose v="true" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Competitions</name>
- <selectionMode>MULTI</selectionMode>
<dependency>
<name>dependency</name>
- <entityName>Competition_entity</entityName>
+ <entityName>Forecast_entity</entityName>
<fieldName>Links</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Competitions</name>
+ <selectionMode>MULTI</selectionMode>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -213,14 +208,14 @@
<expose v="true" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Offers</name>
<dependency>
<name>dependency</name>
- <entityName>Offer_entity</entityName>
+ <entityName>Competition_entity</entityName>
<fieldName>Links</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Offers</name>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -233,14 +228,14 @@
<expose v="true" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Activities</name>
<dependency>
<name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Links</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Activities</name>
<children>
<entityParameter>
<name>PresetLinks_param</name>
@@ -255,14 +250,14 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Members</name>
<dependency>
<name>dependency</name>
- <entityName>Member_entity</entityName>
- <fieldName>WithDistrictResponsibles</fieldName>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Members</name>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -287,6 +282,11 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/members/children/salesprojectcode_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Member_entity</entityName>
+ <fieldName>WithDistrictResponsibles</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>newOffer</name>
@@ -299,11 +299,6 @@
<entityConsumer>
<name>Timetrackings</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>Timetracking_entity</entityName>
- <fieldName>Timetrackings</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -314,6 +309,11 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackings/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Timetracking_entity</entityName>
+ <fieldName>Timetrackings</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>ContactId_param</name>
@@ -337,11 +337,6 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -356,15 +351,15 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/documents/children/mstteamid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>MainDocuments</name>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
+ <fieldName>Documents</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>MainDocuments</name>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -375,6 +370,11 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>newTimetracking</name>
@@ -385,11 +385,6 @@
</entityActionField>
<entityConsumer>
<name>KeywordProbabilties</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -398,14 +393,14 @@
<expose v="false" />
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordStates</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordStates</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -413,6 +408,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
@@ -432,17 +432,17 @@
<entityConsumer>
<name>KeywordWonLost</name>
<selectionMode>MULTI</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordwonlost/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>REASONS</name>
@@ -459,6 +459,17 @@
</entityField>
<entityProvider>
<name>Salesprojects</name>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>PresetTitle_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>0925d17f-a26a-4641-aaf4-0f74796fefa7</name>
@@ -479,17 +490,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>PresetTitle_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityActionField>
<name>newTask</name>
@@ -500,11 +500,6 @@
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
<children>
<entityParameter>
<name>RowId_param</name>
@@ -519,17 +514,14 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>OpenSalesprojects</name>
- <dependencies>
- <entityDependency>
- <name>631f55f9-fb0f-4205-bdb8-6e3476268ab4</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Status_param</name>
@@ -540,6 +532,14 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>631f55f9-fb0f-4205-bdb8-6e3476268ab4</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityParameter>
<name>Status_param</name>
@@ -548,27 +548,22 @@
</entityParameter>
<entityConsumer>
<name>SalesprojectStateMilestones</name>
- <dependency>
- <name>dependency</name>
- <entityName>SalesprojectMilestone_entity</entityName>
- <fieldName>StateMilestones</fieldName>
- </dependency>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectstatemilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalesprojectMilestone_entity</entityName>
+ <fieldName>StateMilestones</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -579,15 +574,15 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>AttributeTree</name>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributetree/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributetree/stateProcess.js</stateProcess>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -598,29 +593,29 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>LogHistories</name>
<dependency>
<name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>LogHistories</name>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Classifications</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>Classification_entity</entityName>
- <fieldName>Classifications</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowid_param</name>
@@ -635,6 +630,11 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classifications/children/classificationtype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Classification_entity</entityName>
+ <fieldName>Classifications</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>RemainingTime</name>
@@ -648,11 +648,6 @@
</entityField>
<entityConsumer>
<name>SalesprojectForecastCharts</name>
- <dependency>
- <name>dependency</name>
- <entityName>Turnover_entity</entityName>
- <fieldName>FilteredTurnovers</fieldName>
- </dependency>
<children>
<entityParameter>
<name>SalesprojectId_param</name>
@@ -671,20 +666,25 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecastcharts/children/yearcounttoshow_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>SalesprojectPhaseStepper</name>
<dependency>
<name>dependency</name>
- <entityName>SalesprojectPhase_entity</entityName>
- <fieldName>Phases</fieldName>
+ <entityName>Turnover_entity</entityName>
+ <fieldName>FilteredTurnovers</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>SalesprojectPhaseStepper</name>
<children>
<entityParameter>
<name>CurrentPhase_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectphasestepper/children/currentphase_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalesprojectPhase_entity</entityName>
+ <fieldName>Phases</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>PHASEINFO</name>
@@ -707,17 +707,17 @@
</entityField>
<entityConsumer>
<name>ProjectTypeAttribute</name>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projecttypeattribute/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>QuickEntrySalesprojects</name>
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index bacd4cd101bf6204fbe070899602d47442afcd16..8109ebac747af0d39e0af423ecde388fb52b335b 100644
--- a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
+++ b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
@@ -14,6 +14,12 @@
</entityField>
<entityProvider>
<name>Salutations</name>
+ <children>
+ <entityParameter>
+ <name>Language_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>2f56ee5c-0f54-4d26-a4d8-a598c136967b</name>
@@ -22,12 +28,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>Language_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>Language_param</name>
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index e23ed314f9c293c89abced5dd2aad800d5deddd9..1919f07f0a8d78ae58435d8e94b06c058b231ba5 100644
--- a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
+++ b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
@@ -19,14 +19,6 @@
</entityParameter>
<entityProvider>
<name>SalutationTitles</name>
- <dependencies>
- <entityDependency>
- <name>3514c1fb-09f5-485f-884b-2e21e4e85490</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>SalutationTitles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Language_param</name>
@@ -37,6 +29,14 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>3514c1fb-09f5-485f-884b-2e21e4e85490</name>
+ <entityName>QuickEntry_entity</entityName>
+ <fieldName>SalutationTitles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityParameter>
<name>Language_param</name>
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index 48def7ff858d71be38bba90a5da0a11ae0c556a1..0d2090d77402c252fd43813978bdf505a60b810b 100644
--- a/entity/Salutation_entity/Salutation_entity.aod
+++ b/entity/Salutation_entity/Salutation_entity.aod
@@ -59,17 +59,17 @@
</entityField>
<entityConsumer>
<name>KeywordGenders</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Salutation_entity/entityfields/keywordgenders/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordLanguages</name>
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index 315503bad3d29396d5daeabbf8bff267ab8147d1..558eb8a4b6c36a7640a05b1253e977aa9e22941a 100644
--- a/entity/SerialLetter_entity/SerialLetter_entity.aod
+++ b/entity/SerialLetter_entity/SerialLetter_entity.aod
@@ -39,17 +39,17 @@
</entityField>
<entityConsumer>
<name>Recipients</name>
- <dependency>
- <name>dependency</name>
- <entityName>LetterRecipient_entity</entityName>
- <fieldName>SerialLetterRecipients</fieldName>
- </dependency>
<children>
<entityParameter>
<name>SerialLetterId_param</name>
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/recipients/children/serialletterid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LetterRecipient_entity</entityName>
+ <fieldName>SerialLetterRecipients</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>ICON</name>
@@ -59,11 +59,6 @@
</entityField>
<entityConsumer>
<name>Templates</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -74,6 +69,11 @@
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/templates/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>TITLE</name>
@@ -88,17 +88,17 @@
</entityField>
<entityConsumer>
<name>LogHistories</name>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>bindata</name>
@@ -114,26 +114,21 @@
</entityField>
<entityConsumer>
<name>StatusKeyword</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Activities</name>
<state>INVISIBLE</state>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -144,6 +139,11 @@
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>downloadLetter</name>
@@ -174,11 +174,6 @@
<entityConsumer>
<name>Documents</name>
<refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>SingleDocument</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -197,6 +192,11 @@
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/documents/children/disallowcreate_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>SingleDocument</fieldName>
+ </dependency>
</entityConsumer>
<entityActionField>
<name>generateLetter</name>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index 79a929f5a6b9403a98d9b9d03c1d6c07c7401b98..b77312e1cbbab6ba451690e9148c7d54e1ff5c67 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -53,6 +53,12 @@
<entityProvider>
<name>Stocks</name>
<recordContainer>db</recordContainer>
+ <children>
+ <entityParameter>
+ <name>ProductId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>aa9264c8-2c96-4a7a-94c7-e38bc0ae7df3</name>
@@ -67,12 +73,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ProductId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityField>
<name>IMAGE</name>
@@ -95,11 +95,6 @@
</entityProvider>
<entityConsumer>
<name>KeywordWarehouses</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -107,6 +102,11 @@
<expose v="false" />
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 7449b20944182a2ae8080df096fc422e31e44ca2..4b3790f99674dd10365dab4146a709f622f5e355 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -128,27 +128,22 @@
</entityParameter>
<entityConsumer>
<name>Links</name>
- <dependency>
- <name>dependency</name>
- <entityName>TaskLink_entity</entityName>
- <fieldName>Link</fieldName>
- </dependency>
<children>
<entityParameter>
<name>TaskId_param</name>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/links/children/taskid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>TaskLink_entity</entityName>
+ <fieldName>Link</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -171,15 +166,15 @@
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- </dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -190,15 +185,15 @@
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>Documents</name>
- <selectionMode>MULTI</selectionMode>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
+ <fieldName>MainDocuments</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Documents</name>
+ <selectionMode>MULTI</selectionMode>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
@@ -209,20 +204,25 @@
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>LogHistories</name>
<dependency>
<name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>LogHistories</name>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>TASK_PROGRESS</name>
@@ -234,17 +234,17 @@
</entityField>
<entityConsumer>
<name>KeywordProgress</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordprogress/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>TICKETTYPE</name>
@@ -274,25 +274,20 @@
</entityField>
<entityConsumer>
<name>KeywordTickettype</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordtickettype/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordTaskState</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordTaskState</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -303,6 +298,11 @@
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>TicketType_param</name>
@@ -311,17 +311,17 @@
</entityParameter>
<entityConsumer>
<name>KeywordTaskPriority</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityConsumer>
<name>ContactEditors</name>
@@ -354,11 +354,6 @@
</entityActionField>
<entityConsumer>
<name>ModuleTrees</name>
- <dependency>
- <name>dependency</name>
- <entityName>ModuleTree_entity</entityName>
- <fieldName>TreeProviders</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ContextName_param</name>
@@ -369,6 +364,11 @@
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/moduletrees/children/id_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ModuleTree_entity</entityName>
+ <fieldName>TreeProviders</fieldName>
+ </dependency>
</entityConsumer>
<entityField>
<name>TASK_PARENT_ID</name>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 759282daf39bbcbd59b7a37223e1c9d4873dfaca..90fc5bd337839eda64e940dc36f318a771e74a2b 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -39,6 +39,12 @@
<targetIdField>OBJECT_ROWID</targetIdField>
<documentation>%aditoprj%/entity/TaskLink_entity/entityfields/link/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
+ <children>
+ <entityParameter>
+ <name>TaskId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>40cc8bcd-c178-4a77-a968-642e1d8e1f70</name>
@@ -53,12 +59,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>TaskId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>TaskId_param</name>
@@ -75,17 +75,17 @@
</entityConsumer>
<entityConsumer>
<name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index fc202492285ba2545d3502221077c49200a9f2cf..f4b7bc526823c1c31110183136f7e949a2f5e8ce 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -75,14 +75,6 @@
<entityProvider>
<name>Timetrackings</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>3636c414-fbc9-4144-a8b1-8e4ca0a146b2</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Timetrackings</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ObjectId_param</name>
@@ -93,6 +85,14 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>3636c414-fbc9-4144-a8b1-8e4ca0a146b2</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Timetrackings</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityConsumer>
<name>Employees</name>
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
index d275ce95c96dde9bf3a79215960a2701d79a014d..d8624334458293fd8c90bf4b4dedf67e728e894e 100644
--- a/entity/TurnoverTree_entity/TurnoverTree_entity.aod
+++ b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
@@ -57,6 +57,12 @@
<entityProvider>
<name>FilteredTurnovers</name>
<documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/filteredturnovers/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>YearCountToShow_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>0ea4ad47-985b-4a9c-81d8-946be324ae04</name>
@@ -65,12 +71,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>YearCountToShow_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityField>
<name>PARENT</name>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index 0737e151be2ff946ccf52770b97fc832bbae30ea..81fdfb8dd00879d70df1b70c4d3ccdf8b770b99f 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -54,14 +54,6 @@
<entityProvider>
<name>FilteredTurnovers</name>
<documentation>%aditoprj%/entity/Turnover_entity/entityfields/filteredturnovers/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>51106aba-bd82-4ac5-8de6-fc56d53c6117</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectForecastCharts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>MaxYear_param</name>
@@ -72,14 +64,17 @@
<expose v="true" />
</entityParameter>
</children>
+ <dependencies>
+ <entityDependency>
+ <name>51106aba-bd82-4ac5-8de6-fc56d53c6117</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>SalesprojectForecastCharts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityConsumer>
<name>Turnover_tree</name>
- <dependency>
- <name>dependency</name>
- <entityName>TurnoverTree_entity</entityName>
- <fieldName>FilteredTurnovers</fieldName>
- </dependency>
<children>
<entityParameter>
<name>MaxYear_param</name>
@@ -98,6 +93,11 @@
<valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/showturnover_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>TurnoverTree_entity</entityName>
+ <fieldName>FilteredTurnovers</fieldName>
+ </dependency>
</entityConsumer>
<entityParameter>
<name>SalesprojectId_param</name>
diff --git a/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod b/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
index 1abb59ffc8bc30f70492cbe64475651d62da62a8..57fdcb96a603fd37d3f7cf3566b93109223ad307 100644
--- a/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
+++ b/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
@@ -24,17 +24,17 @@
</entityParameter>
<entityConsumer>
<name>Activities</name>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
<children>
<entityParameter>
<name>ActivityIDs_param</name>
<valueProcess>%aditoprj%/entity/UniversalFileProcessor_entity/entityfields/activities/children/activityids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
index 42eb73a718ae614066df3597d25cc982dc96b69b..29ba9b689d57567d2aadb708693d3217d916ec15 100644
--- a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
+++ b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
@@ -49,17 +49,17 @@
<entityConsumer>
<name>UnlinkedMailMappingLinks</name>
<documentation>%aditoprj%/entity/UnlinkedMailMappingWrapper_entity/entityfields/unlinkedmailmappinglinks/documentation.adoc</documentation>
- <dependency>
- <name>dependency</name>
- <entityName>UnlinkedMailMappingLink_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
<children>
<entityParameter>
<name>MailAsText_param</name>
<valueProcess>%aditoprj%/entity/UnlinkedMailMappingWrapper_entity/entityfields/unlinkedmailmappinglinks/children/mailastext_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>UnlinkedMailMappingLink_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
index 6447068d1fbe5e27834dadb2d5238618b744c4d2..3efac8736808923f7b6f7f71f618f59517fbf5c9 100644
--- a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+++ b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
@@ -209,7 +209,6 @@
<title>Contact</title>
<consumer>Persons</consumer>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
@@ -226,6 +225,16 @@
<entityName>Person_entity</entityName>
<fieldName>Contacts</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyShowContactIds_param</name>
+ <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityParameter>
<name>ContactId_param</name>
diff --git a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
index e57032a87e242a6b8ff0c370c488b2b318835316..2d30eb85c0a2d04e62f73c1d8b354bb72d86d52f 100644
--- a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
+++ b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
@@ -49,11 +49,6 @@
</entityProvider>
<entityConsumer>
<name>Contexts</name>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Exclusive</fieldName>
- </dependency>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -64,20 +59,25 @@
<valueProcess>%aditoprj%/entity/WorkflowStartConfig_entity/entityfields/contexts/children/invertblacklist_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- </entityConsumer>
- <entityConsumer>
- <name>TriggerKeyword</name>
<dependency>
<name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
+ <entityName>Context_entity</entityName>
+ <fieldName>Exclusive</fieldName>
</dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>TriggerKeyword</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/WorkflowStartConfig_entity/entityfields/triggerkeyword/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index e64f1cfd25a821e44d5b0acfd2a5338866171c5e..6cd9555affc3bc6e5e7e4ebbb931855722fc4cc5 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8385,6 +8385,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Subcategory</key>
+ <value>Unterkategorie</value>
</entry>
<entry>
<key>The radius has to be at least %0.</key>
@@ -10038,6 +10039,9 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>My campaigns</key>
</entry>
+ <entry>
+ <key>Subcategory</key>
+ </entry>
<entry>
<key>Campaign costs</key>
</entry>
diff --git a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
index f214b8b117eec17e871e9246d0cf63ca4e1ddd1a..5bc07ac524def8c194dcbfd82a0293952b194784 100644
--- a/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
+++ b/neonView/360DegreeFilter_view/360DegreeFilter_view.aod
@@ -17,7 +17,6 @@
<iconField>ICON</iconField>
<hideContentSearch v="false" />
<entityField>#ENTITY</entityField>
- <linkedColumns />
<defaultGroupFields>
<element>GROUP</element>
</defaultGroupFields>
diff --git a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
index 1931907f2f4af939eeee74134d9146d38118205f..3219f78a4aa76843ad6a8e0f1c6bddfac9f35e9d 100644
--- a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
+++ b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
@@ -18,13 +18,13 @@
<predecessorIdField>PREDECESSORSTEP_ID</predecessorIdField>
<entityField>#ENTITY</entityField>
<isDeletable v="true" />
- <isEditable v="true" />
<title></title>
<devices>
<element>TABLET</element>
<element>DESKTOP</element>
</devices>
<isCreatable v="true" />
+ <isEditable v="true" />
<columns>
<neonTableColumn>
<name>9469e2f2-35ac-4f87-a4a7-959b47a5e7bb</name>
diff --git a/process/AISalesproject_lib/AISalesproject_lib.aod b/process/AISalesproject_lib/AISalesproject_lib.aod
index 13b8a275db57d71b190f905695f39072a7756756..a6f99a40249dc800e535938f99bcf7dff042bbf1 100644
--- a/process/AISalesproject_lib/AISalesproject_lib.aod
+++ b/process/AISalesproject_lib/AISalesproject_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>AISalesproject_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/AISalesproject_lib/process.js</process>
diff --git a/process/AI_lib/AI_lib.aod b/process/AI_lib/AI_lib.aod
index 153e8fc6b66bfd5d8016c8a0a22521c04ad0e209..7ae40f7d1ad20b3763a454857962bf66ec77e35f 100644
--- a/process/AI_lib/AI_lib.aod
+++ b/process/AI_lib/AI_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>AI_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/AI_lib/process.js</process>
diff --git a/process/ActivityTask_lib/ActivityTask_lib.aod b/process/ActivityTask_lib/ActivityTask_lib.aod
index 141c9c3f9344db9b60ff2be3992885545ebcb96a..75bb8811f6e3483be857978d6ee10456e7e79d25 100644
--- a/process/ActivityTask_lib/ActivityTask_lib.aod
+++ b/process/ActivityTask_lib/ActivityTask_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>ActivityTask_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/ActivityTask_lib/process.js</process>
diff --git a/process/AddressEntity_lib/AddressEntity_lib.aod b/process/AddressEntity_lib/AddressEntity_lib.aod
index 4ecf49e2e70d3882be5ed8a66b3ec91a4d509593..432deaa1e5b6a1e7a0e8e82e339e76cb9e0b83a5 100644
--- a/process/AddressEntity_lib/AddressEntity_lib.aod
+++ b/process/AddressEntity_lib/AddressEntity_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>AddressEntity_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/AddressEntity_lib/process.js</process>
diff --git a/process/Address_lib/Address_lib.aod b/process/Address_lib/Address_lib.aod
index dc170bb2e025b240f859db1cdca75dd3eb7d972c..8b4c8d490fcd065fdca889e0daa3282dddcc239b 100644
--- a/process/Address_lib/Address_lib.aod
+++ b/process/Address_lib/Address_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Address_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/Address_lib/documentation.adoc</documentation>
diff --git a/process/Appointment_lib/Appointment_lib.aod b/process/Appointment_lib/Appointment_lib.aod
index 5b832c601af4bab0a69bff58acf1c2427be6911c..048b24bb7449670791195d1c9710d5fa9f858ec9 100644
--- a/process/Appointment_lib/Appointment_lib.aod
+++ b/process/Appointment_lib/Appointment_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Appointment_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Appointment_lib/process.js</process>
diff --git a/process/AttributeFilter_lib/AttributeFilter_lib.aod b/process/AttributeFilter_lib/AttributeFilter_lib.aod
index 57e3edcba2b142a37bc925f7db45a4cbf4006464..0e96ad73bb494c36ab2a394571a7a27946ccccb6 100644
--- a/process/AttributeFilter_lib/AttributeFilter_lib.aod
+++ b/process/AttributeFilter_lib/AttributeFilter_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>AttributeFilter_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/AttributeFilter_lib/process.js</process>
diff --git a/process/AttributeRegistry_basic/AttributeRegistry_basic.aod b/process/AttributeRegistry_basic/AttributeRegistry_basic.aod
index d4917ea14ea0bb20d46d5ca2680e75daa034ce5c..3ed840c1e53f66ed4c7fa01b61bdd16433537664 100644
--- a/process/AttributeRegistry_basic/AttributeRegistry_basic.aod
+++ b/process/AttributeRegistry_basic/AttributeRegistry_basic.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>AttributeRegistry_basic</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/AttributeRegistry_basic/process.js</process>
diff --git a/process/Attribute_lib/Attribute_lib.aod b/process/Attribute_lib/Attribute_lib.aod
index 7d9936e818274c5e11dd7fec0c27953f2d32d4e9..0d46a6a7dc9b186e465727e6fa1806abfad13f58 100644
--- a/process/Attribute_lib/Attribute_lib.aod
+++ b/process/Attribute_lib/Attribute_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Attribute_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Attribute_lib/process.js</process>
diff --git a/process/Binary_lib/Binary_lib.aod b/process/Binary_lib/Binary_lib.aod
index 39de483b5c216084257d95a007b355a11c1d53c0..338211a33b61dfeed03e065d60e6eabb1f67ed0c 100644
--- a/process/Binary_lib/Binary_lib.aod
+++ b/process/Binary_lib/Binary_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Binary_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Binary_lib/process.js</process>
diff --git a/process/Bulkmail_lib/Bulkmail_lib.aod b/process/Bulkmail_lib/Bulkmail_lib.aod
index 0befb2a734840466905596858a7e558a4052f232..6bc2e64de1b4da7172b3984b996837925bf07c10 100644
--- a/process/Bulkmail_lib/Bulkmail_lib.aod
+++ b/process/Bulkmail_lib/Bulkmail_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Bulkmail_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Bulkmail_lib/process.js</process>
diff --git a/process/CachedRecordContainer_lib/CachedRecordContainer_lib.aod b/process/CachedRecordContainer_lib/CachedRecordContainer_lib.aod
index 07b3e2150f48a91844aeada49cb40dfbb5d04cf1..7257f6acb059c410783b52c8e68da1637a4d111f 100644
--- a/process/CachedRecordContainer_lib/CachedRecordContainer_lib.aod
+++ b/process/CachedRecordContainer_lib/CachedRecordContainer_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>CachedRecordContainer_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/CachedRecordContainer_lib/process.js</process>
diff --git a/process/Calendar_lib/Calendar_lib.aod b/process/Calendar_lib/Calendar_lib.aod
index ba466c5bf5fc50d099a4c5de79e3808744b53b56..657f6034dea6a1ee813d796025e4c9861432d484 100644
--- a/process/Calendar_lib/Calendar_lib.aod
+++ b/process/Calendar_lib/Calendar_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Calendar_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Calendar_lib/process.js</process>
diff --git a/process/Campaign_lib/Campaign_lib.aod b/process/Campaign_lib/Campaign_lib.aod
index 6cff8443c7403caa3bbdc859ee356e248dc54018..1018469206a67ad0b29b351669b2b1882538d96a 100644
--- a/process/Campaign_lib/Campaign_lib.aod
+++ b/process/Campaign_lib/Campaign_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Campaign_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Campaign_lib/process.js</process>
diff --git a/process/ClassificationFilter_lib/ClassificationFilter_lib.aod b/process/ClassificationFilter_lib/ClassificationFilter_lib.aod
index 9b182044a8785df3037df931f0df656d095ae109..705efe2d6620d1a37bc4b723a9615acc23895e35 100644
--- a/process/ClassificationFilter_lib/ClassificationFilter_lib.aod
+++ b/process/ClassificationFilter_lib/ClassificationFilter_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>ClassificationFilter_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/ClassificationFilter_lib/process.js</process>
diff --git a/process/Classification_lib/Classification_lib.aod b/process/Classification_lib/Classification_lib.aod
index 659223c9d3b507cfadcd0a8e6a6d0b71f1efe0e5..5b4114c59eaaabf71c169a9f4cd0582cfa6ab60b 100644
--- a/process/Classification_lib/Classification_lib.aod
+++ b/process/Classification_lib/Classification_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Classification_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Classification_lib/process.js</process>
diff --git a/process/Communication_lib/Communication_lib.aod b/process/Communication_lib/Communication_lib.aod
index a69299aa2aa56c2a3a2b1a4321e8779ff438187b..1bc1f16ef819bc6d5e27a7223595440cbc1e0d54 100644
--- a/process/Communication_lib/Communication_lib.aod
+++ b/process/Communication_lib/Communication_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Communication_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Communication_lib/process.js</process>
diff --git a/process/Contact_lib/Contact_lib.aod b/process/Contact_lib/Contact_lib.aod
index ea8e5020017153333df78eddfd6bfd9c415e7208..3f85ffbdb21af8da880c9506eb12cdb42083f393 100644
--- a/process/Contact_lib/Contact_lib.aod
+++ b/process/Contact_lib/Contact_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Contact_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Contact_lib/process.js</process>
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index 7bbafdc693adac2eb70bf75da3d35f24790c6560..4a59839543915bbe0c16edfb2c56985efe935f15 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -528,10 +528,8 @@ ContactUtils.hasCommRestriction = function(pContactId, pMedium, pStartDate)
*/
ContactUtils.getActiveCommRestrictionsSubselect = function()
{
- var mediumList = KeywordUtils.getEntryNamesAndIdsByContainer($KeywordRegistry.communicationMediumCampaign());
- var sqlMasking = new SqlMaskingUtils();
-
- var parts = [];
+ var mediumList = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.communicationMediumCampaign(), "COMMRESTRICTION.MEDIUM");
+ var mask = new SqlMaskingUtils()
var orgContactSubselect = newSelect("orgContact.CONTACTID")
.from("CONTACT anyContact")
@@ -539,20 +537,19 @@ ContactUtils.getActiveCommRestrictionsSubselect = function()
.and("orgContact.PERSON_ID IS NULL"))
.where("anyContact.CONTACTID = CONTACT.CONTACTID")
- mediumList.forEach(function(pMedium)
+ var group = mask.getGroupConcat("DISTINCT "+mediumList, "', '");
+ var subselect = "''";
+ if(group)
{
- var subquery = newSelect("COMMRESTRICTION.MEDIUM, COMMRESTRICTIONID")
- .from("COMMRESTRICTION")
- .where("COMMRESTRICTION.MEDIUM", pMedium[0])
- .and("COMMRESTRICTION.STARTDATE", vars.get("$sys.date"), SqlBuilder.LESS_OR_EQUAL())
- .and(newWhere()
- .or("COMMRESTRICTION.CONTACT_ID = CONTACT.CONTACTID")
- .or("COMMRESTRICTION.CONTACT_ID", orgContactSubselect));
- //!SqlBuilder
- parts.push("case when exists(" + subquery.toString() + ") then '" + pMedium[1] + "' else '' end");
- })
-
- return sqlMasking.concatWithSeparator(parts, " ", false);
+ var res = newSelect(group).from("COMMRESTRICTION")
+ .where("COMMRESTRICTION.CONTACT_ID = CONTACT.CONTACTID")
+
+ var subres = newSelect(group).from("COMMRESTRICTION")
+ .where("COMMRESTRICTION.CONTACT_ID in ( "+orgContactSubselect.toString()+")")
+
+ subselect = mask.concatWithSeparator(["("+res.toString()+")", "("+subres.toString()+")"], ", ", false);
+ }
+ return subselect;
}
/**
diff --git a/process/Context_lib/Context_lib.aod b/process/Context_lib/Context_lib.aod
index 88f0211eacad5423f96a78a8ceaa903a1bf72cdb..85bdd8cc4de7cbecc8feed39e346e5769e89a853 100644
--- a/process/Context_lib/Context_lib.aod
+++ b/process/Context_lib/Context_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Context_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Context_lib/process.js</process>
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index a938c5d286655fc03057e7d612d9727b01f34294..aaecfe01d9b8faa1aaaff16fc18c71e58864c180 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -290,28 +290,36 @@ ContextUtils.loadContent = function(pEntity, pUid, pFields, pExcludeIDs, pProvid
*/
ContextUtils.getContexts = function(pBlacklist, pInvertBlacklist)
{
- if (pInvertBlacklist == undefined)
- pInvertBlacklist = false;
-
-
- var contexts = project.getDataModels(project.DATAMODEL_KIND_CONTEXT);
- var contextsStandardList = ["Organisation", "Person", "PrivatePerson", "Activity", "Salesproject", "Contract", "Offer", "Order", "Product", "Task",
- "Campaign", "CampaignStep", "SupportTicket", "Leadimport"];
-
- contexts = contexts.filter(function(pContext) {
- if (contextsStandardList.indexOf(pContext[0]) > -1)
- return true;
- return false;
- });
-
- if (pBlacklist)
+ var whitelist;
+ if (pInvertBlacklist && pBlacklist)
+ whitelist = new Set(pBlacklist);
+ else
{
- contexts = contexts.filter(function(pContext) {
- if (pBlacklist && pBlacklist.indexOf(pContext[0]) > -1 != pInvertBlacklist)
- return false;
- return true;
- });
+ whitelist = new Set()
+ .add("Organisation")
+ .add("Person")
+ .add("PrivatePerson")
+ .add("Activity")
+ .add("Salesproject")
+ .add("Contract")
+ .add("Offer")
+ .add("Order")
+ .add("Product")
+ .add("Task")
+ .add("Campaign")
+ .add("CampaignStep")
+ .add("SupportTicket")
+ .add("Leadimport");
+
+ if (pBlacklist)
+ pBlacklist.forEach(whitelist["delete"], whitelist);
}
+
+ var contexts = project.getDataModels(project.DATAMODEL_KIND_CONTEXT);
+ contexts = contexts.filter(function(context)
+ {
+ return whitelist.has(context[0]);
+ });
return contexts.map(ContextUtils._contextDataMapping).sort(function(pContext1, pContext2)
{
diff --git a/process/Contract_lib/Contract_lib.aod b/process/Contract_lib/Contract_lib.aod
index f7e066be340112fbe6298f410624cc9ba6284dad..080920179a585c383923d1e2176a995de2bb6c7a 100644
--- a/process/Contract_lib/Contract_lib.aod
+++ b/process/Contract_lib/Contract_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Contract_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Contract_lib/process.js</process>
diff --git a/process/CountryInfoData_lib/CountryInfoData_lib.aod b/process/CountryInfoData_lib/CountryInfoData_lib.aod
index d1612a9f77a923a06489237005292a2055f0cd74..ecc2eedbcd9ecf42c4b0af0be9586e5f1181c9e7 100644
--- a/process/CountryInfoData_lib/CountryInfoData_lib.aod
+++ b/process/CountryInfoData_lib/CountryInfoData_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>CountryInfoData_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/CountryInfoData_lib/process.js</process>
diff --git a/process/CountryInfo_lib/CountryInfo_lib.aod b/process/CountryInfo_lib/CountryInfo_lib.aod
index d078970229a859484e2ed6c577f386f33d404ae5..69b0a804f393c38451118b8bb66a7dcb8544aa82 100644
--- a/process/CountryInfo_lib/CountryInfo_lib.aod
+++ b/process/CountryInfo_lib/CountryInfo_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>CountryInfo_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/CountryInfo_lib/process.js</process>
diff --git a/process/CreateActivity_workflowService/CreateActivity_workflowService.aod b/process/CreateActivity_workflowService/CreateActivity_workflowService.aod
index 0241a4b95bb97c496d2b06b83887d46045fa7058..d58e85470416d18524f0b384981b5fb1e19eea60 100644
--- a/process/CreateActivity_workflowService/CreateActivity_workflowService.aod
+++ b/process/CreateActivity_workflowService/CreateActivity_workflowService.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>CreateActivity_workflowService</name>
<title>Create activity</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/CreateNotification_workflowService/CreateNotification_workflowService.aod b/process/CreateNotification_workflowService/CreateNotification_workflowService.aod
index e6455f2cd5a5798b87d51712a6bc525e434c0a78..d2630a2a5638fa17a1526a519952b9c564f3c3e4 100644
--- a/process/CreateNotification_workflowService/CreateNotification_workflowService.aod
+++ b/process/CreateNotification_workflowService/CreateNotification_workflowService.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>CreateNotification_workflowService</name>
<title>Create notification</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/CreateSalesprojectTouchpoint_workflowService/CreateSalesprojectTouchpoint_workflowService.aod b/process/CreateSalesprojectTouchpoint_workflowService/CreateSalesprojectTouchpoint_workflowService.aod
index df1d296af52649bba991103fa19f6839afd86f3a..6e44f166f6448deeff7b7dea82ab256e34aa16c3 100644
--- a/process/CreateSalesprojectTouchpoint_workflowService/CreateSalesprojectTouchpoint_workflowService.aod
+++ b/process/CreateSalesprojectTouchpoint_workflowService/CreateSalesprojectTouchpoint_workflowService.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>CreateSalesprojectTouchpoint_workflowService</name>
<title>Create salesproject touchpoint</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/CreateSalesproject_workflowService/CreateSalesproject_workflowService.aod b/process/CreateSalesproject_workflowService/CreateSalesproject_workflowService.aod
index 8b41b437136f9d92113d9f4cb310c3c127239e78..fa5f2a849d62b5144be2eb954f8460569e2c05ab 100644
--- a/process/CreateSalesproject_workflowService/CreateSalesproject_workflowService.aod
+++ b/process/CreateSalesproject_workflowService/CreateSalesproject_workflowService.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>CreateSalesproject_workflowService</name>
<title>Create salesproject</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/CustomPlaceholder_lib/CustomPlaceholder_lib.aod b/process/CustomPlaceholder_lib/CustomPlaceholder_lib.aod
index 8e915687a2ad2cdd2fcdcc75bb67e37635191fdc..1a6e6266888b8ffbfd7e375eb395198a87f6b30f 100644
--- a/process/CustomPlaceholder_lib/CustomPlaceholder_lib.aod
+++ b/process/CustomPlaceholder_lib/CustomPlaceholder_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>CustomPlaceholder_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/CustomPlaceholder_lib/process.js</process>
diff --git a/process/DataCaching_lib/DataCaching_lib.aod b/process/DataCaching_lib/DataCaching_lib.aod
index 732c9784be4434a3a4776c4865536eaeb260e280..06e4baffd563073f815edf70cc7164ad632a7e5e 100644
--- a/process/DataCaching_lib/DataCaching_lib.aod
+++ b/process/DataCaching_lib/DataCaching_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>DataCaching_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/DataCaching_lib/process.js</process>
diff --git a/process/DataPrivacy_lib/DataPrivacy_lib.aod b/process/DataPrivacy_lib/DataPrivacy_lib.aod
index 87e4a73a1b3e1111ba777f8296eda926464c7777..229eb4f89658803f65a7b693a026cfb3709db9a0 100644
--- a/process/DataPrivacy_lib/DataPrivacy_lib.aod
+++ b/process/DataPrivacy_lib/DataPrivacy_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>DataPrivacy_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/DataPrivacy_lib/process.js</process>
diff --git a/process/Data_lib/Data_lib.aod b/process/Data_lib/Data_lib.aod
index 7e6dc0e007d710b42680bd618e2e6e4889e0296d..316134e4f970129928126e6cc33547d76b580e79 100644
--- a/process/Data_lib/Data_lib.aod
+++ b/process/Data_lib/Data_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Data_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Data_lib/process.js</process>
diff --git a/process/Date_lib/Date_lib.aod b/process/Date_lib/Date_lib.aod
index 9833cb86c53bc720131800ef98c93138e6b61db2..4442988df03042c92262a00d87308c4785e62828 100644
--- a/process/Date_lib/Date_lib.aod
+++ b/process/Date_lib/Date_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Date_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Date_lib/process.js</process>
diff --git a/process/Dependency_lib/Dependency_lib.aod b/process/Dependency_lib/Dependency_lib.aod
index 3475b073c30bb76653e8c7f2ae098f2977ae287a..be3eec18d19dfe0ecd4abba618560bb14d59a086 100644
--- a/process/Dependency_lib/Dependency_lib.aod
+++ b/process/Dependency_lib/Dependency_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Dependency_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Dependency_lib/process.js</process>
diff --git a/process/DocumentTemplate_lib/DocumentTemplate_lib.aod b/process/DocumentTemplate_lib/DocumentTemplate_lib.aod
index f7dede09487b8661444e1673ef88ecca8b415c21..65a45cc2df2f4d6e372ede48d756207df60b06fd 100644
--- a/process/DocumentTemplate_lib/DocumentTemplate_lib.aod
+++ b/process/DocumentTemplate_lib/DocumentTemplate_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>DocumentTemplate_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/DocumentTemplate_lib/documentation.adoc</documentation>
diff --git a/process/Document_lib/Document_lib.aod b/process/Document_lib/Document_lib.aod
index 9f2ede3e40f379602f2d598e9027e4605ab4044c..cc120d3f86f8378ebbaeb9f71e07b807bcc2b1b8 100644
--- a/process/Document_lib/Document_lib.aod
+++ b/process/Document_lib/Document_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Document_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Document_lib/process.js</process>
diff --git a/process/DocxTemplater_lib/DocxTemplater_lib.aod b/process/DocxTemplater_lib/DocxTemplater_lib.aod
index 3c96ec6b8264873a8317f644ec78bb7e59cd268b..8dfbdd5ebc9fd32efaff4ea00e28b127598ba762 100644
--- a/process/DocxTemplater_lib/DocxTemplater_lib.aod
+++ b/process/DocxTemplater_lib/DocxTemplater_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>DocxTemplater_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/DocxTemplater_lib/process.js</process>
diff --git a/process/DuplicateScanner_lib/DuplicateScanner_lib.aod b/process/DuplicateScanner_lib/DuplicateScanner_lib.aod
index 17d38fd00ac39e96737a745e8e7ce109efd1e8ad..6b45659f204354af0a6d1a39a810a6f008eda16c 100644
--- a/process/DuplicateScanner_lib/DuplicateScanner_lib.aod
+++ b/process/DuplicateScanner_lib/DuplicateScanner_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>DuplicateScanner_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/DuplicateScanner_lib/process.js</process>
diff --git a/process/EmailUtil_lib/EmailUtil_lib.aod b/process/EmailUtil_lib/EmailUtil_lib.aod
index 04b24ec7e102599577d29f2cea0cc85e7c4f048d..694639f440cc39e293d9a1960e890fdeb056aedb 100644
--- a/process/EmailUtil_lib/EmailUtil_lib.aod
+++ b/process/EmailUtil_lib/EmailUtil_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>EmailUtil_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/EmailUtil_lib/process.js</process>
diff --git a/process/Email_lib/Email_lib.aod b/process/Email_lib/Email_lib.aod
index 6022256dea0248db39f796a2a79b0e55178d4044..d1b4a5a2f481c273f871c407b1018c4dbbae2a98 100644
--- a/process/Email_lib/Email_lib.aod
+++ b/process/Email_lib/Email_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Email_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Email_lib/process.js</process>
diff --git a/process/Employee_lib/Employee_lib.aod b/process/Employee_lib/Employee_lib.aod
index 1a08f91b6ef81042668340de79dfea0687a520e6..bf491daa912ecb65c240d820ce73baac879246c8 100644
--- a/process/Employee_lib/Employee_lib.aod
+++ b/process/Employee_lib/Employee_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Employee_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Employee_lib/process.js</process>
diff --git a/process/Entity_lib/Entity_lib.aod b/process/Entity_lib/Entity_lib.aod
index d106b77a163c3a6f9266ffd622878cd794b9699a..81c2102218a1279f39ab1d8cb6516a0de085512f 100644
--- a/process/Entity_lib/Entity_lib.aod
+++ b/process/Entity_lib/Entity_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Entity_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Entity_lib/process.js</process>
diff --git a/process/EwsClient_lib/EwsClient_lib.aod b/process/EwsClient_lib/EwsClient_lib.aod
index 6343b20344c5462d4d714e1bb7cc697669244611..988c9f615a2ca71f5859f8ec0253be800cdf9b83 100644
--- a/process/EwsClient_lib/EwsClient_lib.aod
+++ b/process/EwsClient_lib/EwsClient_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>EwsClient_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/EwsClient_lib/process.js</process>
diff --git a/process/ExportTemplate_lib/ExportTemplate_lib.aod b/process/ExportTemplate_lib/ExportTemplate_lib.aod
index 7caa047e49c2fef06484706319038c76196b7408..347c2bddef076b805409a78895a51a36914f6f32 100644
--- a/process/ExportTemplate_lib/ExportTemplate_lib.aod
+++ b/process/ExportTemplate_lib/ExportTemplate_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>ExportTemplate_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/ExportTemplate_lib/process.js</process>
diff --git a/process/Favorites_lib/Favorites_lib.aod b/process/Favorites_lib/Favorites_lib.aod
index cae0fb68babcc9bc0d63f870308e1571808c527b..1512c3b435da8286670c2c886d709582b7b5e4c7 100644
--- a/process/Favorites_lib/Favorites_lib.aod
+++ b/process/Favorites_lib/Favorites_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Favorites_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Favorites_lib/process.js</process>
diff --git a/process/FilterCondition_lib/FilterCondition_lib.aod b/process/FilterCondition_lib/FilterCondition_lib.aod
index 501b03729ea169b526cad1548517b937c6dfab68..a69dbb1ec7562964c049d98c602b3e2fc523d214 100644
--- a/process/FilterCondition_lib/FilterCondition_lib.aod
+++ b/process/FilterCondition_lib/FilterCondition_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>FilterCondition_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/FilterCondition_lib/process.js</process>
diff --git a/process/FilterViewAction_lib/FilterViewAction_lib.aod b/process/FilterViewAction_lib/FilterViewAction_lib.aod
index 48c19eee90b9f6d0af7eef5c7d56053ce1cbb706..83be35832aac8118a4ea6c6f5303da92279e165d 100644
--- a/process/FilterViewAction_lib/FilterViewAction_lib.aod
+++ b/process/FilterViewAction_lib/FilterViewAction_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>FilterViewAction_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/FilterViewAction_lib/process.js</process>
diff --git a/process/Html_lib/Html_lib.aod b/process/Html_lib/Html_lib.aod
index 98ca38b6fb0b91eaf40a3bc4df951523298405b6..52d9fb2676cc9bd5c6830314d4ea3dc03f5c77bb 100644
--- a/process/Html_lib/Html_lib.aod
+++ b/process/Html_lib/Html_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Html_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Html_lib/process.js</process>
diff --git a/process/ImporterCustomMappingFunctions_lib/ImporterCustomMappingFunctions_lib.aod b/process/ImporterCustomMappingFunctions_lib/ImporterCustomMappingFunctions_lib.aod
index bda7727edbe38bf67567ed6bf614368f276cacc6..e5e687932c1f9a7c032b98a697d4cce04b62c23e 100644
--- a/process/ImporterCustomMappingFunctions_lib/ImporterCustomMappingFunctions_lib.aod
+++ b/process/ImporterCustomMappingFunctions_lib/ImporterCustomMappingFunctions_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>ImporterCustomMappingFunctions_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/ImporterCustomMappingFunctions_lib/documentation.adoc</documentation>
diff --git a/process/ImporterMappingFunctions_lib/ImporterMappingFunctions_lib.aod b/process/ImporterMappingFunctions_lib/ImporterMappingFunctions_lib.aod
index 8a5c80a490d63a3c52aecaa1f3c2fd22e206c0e0..9c1fdace0d76d26c686e2696f82367c4b9520898 100644
--- a/process/ImporterMappingFunctions_lib/ImporterMappingFunctions_lib.aod
+++ b/process/ImporterMappingFunctions_lib/ImporterMappingFunctions_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>ImporterMappingFunctions_lib</name>
<comment></comment>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/ImporterTest_lib/ImporterTest_lib.aod b/process/ImporterTest_lib/ImporterTest_lib.aod
index e1204321106696757a47000f28e10cc890d73182..18c823d8efb53c2729837bed17354bcc5d518145 100644
--- a/process/ImporterTest_lib/ImporterTest_lib.aod
+++ b/process/ImporterTest_lib/ImporterTest_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>ImporterTest_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/ImporterTest_lib/process.js</process>
diff --git a/process/Importer_lib/Importer_lib.aod b/process/Importer_lib/Importer_lib.aod
index 157f0d47a73b0864183bb16bdd52a1df8aa60151..1d6a37d39b4020a34413b08f937d71f1b2aa6434 100644
--- a/process/Importer_lib/Importer_lib.aod
+++ b/process/Importer_lib/Importer_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Importer_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/Importer_lib/documentation.adoc</documentation>
diff --git a/process/IncomingCallExecutor_lib/IncomingCallExecutor_lib.aod b/process/IncomingCallExecutor_lib/IncomingCallExecutor_lib.aod
index 9d36946fdfeba69161bdfea00b2fb36fff5e9703..6659a5fab6a825cf1ac27042fa364121ef42d443 100644
--- a/process/IncomingCallExecutor_lib/IncomingCallExecutor_lib.aod
+++ b/process/IncomingCallExecutor_lib/IncomingCallExecutor_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>IncomingCallExecutor_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/IncomingCallExecutor_lib/process.js</process>
diff --git a/process/IncomingEmailExecutor_lib/IncomingEmailExecutor_lib.aod b/process/IncomingEmailExecutor_lib/IncomingEmailExecutor_lib.aod
index 1dbef1a882583c24721c0d35583dfdc1506ef5f4..5d940a9124d30b9cfdbfa030b459f3802d9e8139 100644
--- a/process/IncomingEmailExecutor_lib/IncomingEmailExecutor_lib.aod
+++ b/process/IncomingEmailExecutor_lib/IncomingEmailExecutor_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>IncomingEmailExecutor_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/IncomingEmailExecutor_lib/process.js</process>
diff --git a/process/IndexSearch_lib/IndexSearch_lib.aod b/process/IndexSearch_lib/IndexSearch_lib.aod
index bfc314526ea673c93e94af2e8fae2d019e835386..b5a2aacd8c33062115f137291582acd7c0d8a36b 100644
--- a/process/IndexSearch_lib/IndexSearch_lib.aod
+++ b/process/IndexSearch_lib/IndexSearch_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>IndexSearch_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/IndexSearch_lib/process.js</process>
diff --git a/process/JditoFilter_lib/JditoFilter_lib.aod b/process/JditoFilter_lib/JditoFilter_lib.aod
index e6721ea4e24d19d56ce2a3054d799e994536ed7c..1276959dc464987cf335240fa6c934a9261a328c 100644
--- a/process/JditoFilter_lib/JditoFilter_lib.aod
+++ b/process/JditoFilter_lib/JditoFilter_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>JditoFilter_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/JditoFilter_lib/documentation.adoc</documentation>
diff --git a/process/KeywordAttribute_test/KeywordAttribute_test.aod b/process/KeywordAttribute_test/KeywordAttribute_test.aod
index 5956980e85aba58177a5e931c819b50b4894f796..d22a7e77434dce92542facb54aabfd1a93d5a438 100644
--- a/process/KeywordAttribute_test/KeywordAttribute_test.aod
+++ b/process/KeywordAttribute_test/KeywordAttribute_test.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>KeywordAttribute_test</name>
<title>[TEST] KeywordAttribute_lib</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/KeywordData_lib/KeywordData_lib.aod b/process/KeywordData_lib/KeywordData_lib.aod
index a4aab38ec5e70adb742a4c84ca34d1428449465f..6955ec39f1f168d9c31fb731c2d6aa16fd02b00c 100644
--- a/process/KeywordData_lib/KeywordData_lib.aod
+++ b/process/KeywordData_lib/KeywordData_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>KeywordData_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/KeywordData_lib/process.js</process>
diff --git a/process/KeywordRegistry_basic/KeywordRegistry_basic.aod b/process/KeywordRegistry_basic/KeywordRegistry_basic.aod
index f16c2160c96dbf655bd3d9e8c09fa6cdf23fe58f..3e8c6225484280a86952143b84f07255692204c7 100644
--- a/process/KeywordRegistry_basic/KeywordRegistry_basic.aod
+++ b/process/KeywordRegistry_basic/KeywordRegistry_basic.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>KeywordRegistry_basic</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/KeywordRegistry_basic/process.js</process>
diff --git a/process/Keyword_lib/Keyword_lib.aod b/process/Keyword_lib/Keyword_lib.aod
index 2dd2a647ff95df46a7e1b5d118e021129d1d30d7..641f19343bb3f869b69ebb3c2b0bfd8464c32229 100644
--- a/process/Keyword_lib/Keyword_lib.aod
+++ b/process/Keyword_lib/Keyword_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Keyword_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Keyword_lib/process.js</process>
diff --git a/process/Keyword_test/Keyword_test.aod b/process/Keyword_test/Keyword_test.aod
index e654f56663b71ec5ed3e6241aa1be9bd76dc1d87..fa9513b2863452c919eb7342a1f1fd5b0d3cfd27 100644
--- a/process/Keyword_test/Keyword_test.aod
+++ b/process/Keyword_test/Keyword_test.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Keyword_test</name>
<title>[TEST] Keyword_lib</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/KnowledgeManagement_lib/KnowledgeManagement_lib.aod b/process/KnowledgeManagement_lib/KnowledgeManagement_lib.aod
index 7119bdb3846ad9854af7575629a9c7a7c46b7d48..38b9d6a998f6bef55bf0a50b487a124f62e6de18 100644
--- a/process/KnowledgeManagement_lib/KnowledgeManagement_lib.aod
+++ b/process/KnowledgeManagement_lib/KnowledgeManagement_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>KnowledgeManagement_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/KnowledgeManagement_lib/process.js</process>
diff --git a/process/LeadQuickAcquisition_lib/LeadQuickAcquisition_lib.aod b/process/LeadQuickAcquisition_lib/LeadQuickAcquisition_lib.aod
index dd1aecc728e349ceced88023f48b3c214a33ca1b..2ac6bab47ac32ade4753eae8e051fe6d1e55b9f4 100644
--- a/process/LeadQuickAcquisition_lib/LeadQuickAcquisition_lib.aod
+++ b/process/LeadQuickAcquisition_lib/LeadQuickAcquisition_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>LeadQuickAcquisition_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/LeadQuickAcquisition_lib/process.js</process>
diff --git a/process/Leadimport_lib/Leadimport_lib.aod b/process/Leadimport_lib/Leadimport_lib.aod
index 2b0a6ccc76164c013c73ed247fdd212d3e8defb0..6426e09650258a2fbb87212c736d911eda3b40e4 100644
--- a/process/Leadimport_lib/Leadimport_lib.aod
+++ b/process/Leadimport_lib/Leadimport_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Leadimport_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Leadimport_lib/process.js</process>
diff --git a/process/Liquibase_lib/Liquibase_lib.aod b/process/Liquibase_lib/Liquibase_lib.aod
index 5fc68808e15f30333eeb59291fa318d56e028ac1..31fe997666b305a5ae1f926f766e79a14160fae0 100644
--- a/process/Liquibase_lib/Liquibase_lib.aod
+++ b/process/Liquibase_lib/Liquibase_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Liquibase_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Liquibase_lib/process.js</process>
diff --git a/process/Location_lib/Location_lib.aod b/process/Location_lib/Location_lib.aod
index 1a9a229f653f16af767f0c6193958ec831ea120c..812115767215451b35b717b2f7f88a8ff712ece7 100644
--- a/process/Location_lib/Location_lib.aod
+++ b/process/Location_lib/Location_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Location_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Location_lib/process.js</process>
diff --git a/process/Loghistory_lib/Loghistory_lib.aod b/process/Loghistory_lib/Loghistory_lib.aod
index 454f37cd2f2f3108e77c6eb547d95229067e1eca..bcbd876cc0fc2aa81d819bc2f8903ce6210b7eb2 100644
--- a/process/Loghistory_lib/Loghistory_lib.aod
+++ b/process/Loghistory_lib/Loghistory_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Loghistory_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Loghistory_lib/process.js</process>
diff --git a/process/MSTeams_lib/MSTeams_lib.aod b/process/MSTeams_lib/MSTeams_lib.aod
index 466fb42fa29e0b9981cd93b2dfee6d5940e1c0d5..8572851b599c49dd3565445c8acb5f2a5e7bc7b9 100644
--- a/process/MSTeams_lib/MSTeams_lib.aod
+++ b/process/MSTeams_lib/MSTeams_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>MSTeams_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/MSTeams_lib/process.js</process>
diff --git a/process/MimeType_lib/MimeType_lib.aod b/process/MimeType_lib/MimeType_lib.aod
index 01ad226f611bd45cacf2aca4b7ad0649a439afea..dbc01a017d0133e40fe7301c12108f02e232ccf2 100644
--- a/process/MimeType_lib/MimeType_lib.aod
+++ b/process/MimeType_lib/MimeType_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>MimeType_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/MimeType_lib/process.js</process>
diff --git a/process/Money_lib/Money_lib.aod b/process/Money_lib/Money_lib.aod
index 9c27e1c6debbf49bc099056bddd3fe16f4243480..5232420c51a99d8a74ec92dfb5667b5f564993dc 100644
--- a/process/Money_lib/Money_lib.aod
+++ b/process/Money_lib/Money_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Money_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Money_lib/process.js</process>
diff --git a/process/Neon_lib/Neon_lib.aod b/process/Neon_lib/Neon_lib.aod
index 6c99555616cb23f3c63162b338d9d03a4fb86a04..0a51cffca155b7298f9f83a18d71bfca25884031 100644
--- a/process/Neon_lib/Neon_lib.aod
+++ b/process/Neon_lib/Neon_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Neon_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/Neon_lib/documentation.adoc</documentation>
diff --git a/process/NewsSystem_lib/NewsSystem_lib.aod b/process/NewsSystem_lib/NewsSystem_lib.aod
index f4907ecd213576e621efc14f752d3cfcf07c539e..8c226c330e0ee283d37c6ea4421bc4e6a12d0b02 100644
--- a/process/NewsSystem_lib/NewsSystem_lib.aod
+++ b/process/NewsSystem_lib/NewsSystem_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>NewsSystem_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/NewsSystem_lib/process.js</process>
diff --git a/process/Notification_lib/Notification_lib.aod b/process/Notification_lib/Notification_lib.aod
index 41cd1071d9d966bb2f65b117d6604310ee061511..28beacbb0d89e042930c765435f9356d30159cd6 100644
--- a/process/Notification_lib/Notification_lib.aod
+++ b/process/Notification_lib/Notification_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Notification_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Notification_lib/process.js</process>
diff --git a/process/ObjectRelationTypeRegistry_basic/ObjectRelationTypeRegistry_basic.aod b/process/ObjectRelationTypeRegistry_basic/ObjectRelationTypeRegistry_basic.aod
index fe86c4d1f97ec9f9611d761f65c14d51c27e3f02..65ad5b0b0b220dad46352ae8b2c3e5abb8f2a7f7 100644
--- a/process/ObjectRelationTypeRegistry_basic/ObjectRelationTypeRegistry_basic.aod
+++ b/process/ObjectRelationTypeRegistry_basic/ObjectRelationTypeRegistry_basic.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>ObjectRelationTypeRegistry_basic</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/ObjectRelationTypeRegistry_basic/process.js</process>
diff --git a/process/ObjectRelation_lib/ObjectRelation_lib.aod b/process/ObjectRelation_lib/ObjectRelation_lib.aod
index e5a4d95eb356b4bf2900d50e7b7a62ed22355697..b48e1daede58b2cf8d4d1abee0a5bc749e4088a8 100644
--- a/process/ObjectRelation_lib/ObjectRelation_lib.aod
+++ b/process/ObjectRelation_lib/ObjectRelation_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>ObjectRelation_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/ObjectRelation_lib/process.js</process>
diff --git a/process/OfferOrder_lib/OfferOrder_lib.aod b/process/OfferOrder_lib/OfferOrder_lib.aod
index 0df9d9a624d014c6b4583935732acbdea2b2b99e..353cb8ca017b884d62b217dec8fb764c6d08b6f5 100644
--- a/process/OfferOrder_lib/OfferOrder_lib.aod
+++ b/process/OfferOrder_lib/OfferOrder_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>OfferOrder_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/OfferOrder_lib/process.js</process>
diff --git a/process/Offer_lib/Offer_lib.aod b/process/Offer_lib/Offer_lib.aod
index 41247d62423c487255eb9fe234106031fd8a1b6f..d1f79adeeb65335a2c2652db92555530fb3e2403 100644
--- a/process/Offer_lib/Offer_lib.aod
+++ b/process/Offer_lib/Offer_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Offer_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Offer_lib/process.js</process>
diff --git a/process/Order_lib/Order_lib.aod b/process/Order_lib/Order_lib.aod
index 3e225851b15f65e8d77e15182de060a04aee4878..5f4e4c315b81d7aad9b321298486d9d4591e66ac 100644
--- a/process/Order_lib/Order_lib.aod
+++ b/process/Order_lib/Order_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Order_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Order_lib/process.js</process>
diff --git a/process/Organisation_lib/Organisation_lib.aod b/process/Organisation_lib/Organisation_lib.aod
index 47bca652458c91d875f43aa22721999afeb471e7..1f0d01aabbddda8eb361bc70f337f423e640d513 100644
--- a/process/Organisation_lib/Organisation_lib.aod
+++ b/process/Organisation_lib/Organisation_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Organisation_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Organisation_lib/process.js</process>
diff --git a/process/PermissionCalendar_lib/PermissionCalendar_lib.aod b/process/PermissionCalendar_lib/PermissionCalendar_lib.aod
index 8f5c6970ce7e043c67c775b033e685acbb4ac8a8..1b2ab4f46514eb141579af4444ec1bbbcf7bd4f0 100644
--- a/process/PermissionCalendar_lib/PermissionCalendar_lib.aod
+++ b/process/PermissionCalendar_lib/PermissionCalendar_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>PermissionCalendar_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/PermissionCalendar_lib/process.js</process>
diff --git a/process/Permission_lib/Permission_lib.aod b/process/Permission_lib/Permission_lib.aod
index 00dceca975179d33311ba7f807e5800a2f748d98..642b9b00218b040d6b833530810f5439a0effc75 100644
--- a/process/Permission_lib/Permission_lib.aod
+++ b/process/Permission_lib/Permission_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Permission_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Permission_lib/process.js</process>
diff --git a/process/Person_lib/Person_lib.aod b/process/Person_lib/Person_lib.aod
index 04c0795c9a2fcb6fcdd7f580da9ffe3a2be374e9..80e4dc8248fca9713ea9c6419d8e9ff647956527 100644
--- a/process/Person_lib/Person_lib.aod
+++ b/process/Person_lib/Person_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Person_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Person_lib/process.js</process>
diff --git a/process/Placeholder_lib/Placeholder_lib.aod b/process/Placeholder_lib/Placeholder_lib.aod
index 1cc12d42bd4091664def57971f81d140c9dcc0e2..2af9f3a9ab189e4a59216d944a9d9703eb9880f6 100644
--- a/process/Placeholder_lib/Placeholder_lib.aod
+++ b/process/Placeholder_lib/Placeholder_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Placeholder_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Placeholder_lib/process.js</process>
diff --git a/process/PostalAddress_lib/PostalAddress_lib.aod b/process/PostalAddress_lib/PostalAddress_lib.aod
index f7af81f2c9b9cb3ab8b20c4faa523894b5df10f7..a07348310e4c97fb5da2bf3bdd9b86e56994aaed 100644
--- a/process/PostalAddress_lib/PostalAddress_lib.aod
+++ b/process/PostalAddress_lib/PostalAddress_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>PostalAddress_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/PostalAddress_lib/process.js</process>
diff --git a/process/Product_lib/Product_lib.aod b/process/Product_lib/Product_lib.aod
index 9c72fa0f0cdb72396fc83c73d54fadb87bcfd7ad..a1197452b9288cb8d7c3224f2e669f0d47505649 100644
--- a/process/Product_lib/Product_lib.aod
+++ b/process/Product_lib/Product_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Product_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Product_lib/process.js</process>
diff --git a/process/Proto_lib/Proto_lib.aod b/process/Proto_lib/Proto_lib.aod
index dd8841dc7aba84fa95c02f339956908458bb7307..ce167574ad6d6a97588312e3f6cbc5d0156933ae 100644
--- a/process/Proto_lib/Proto_lib.aod
+++ b/process/Proto_lib/Proto_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Proto_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Proto_lib/process.js</process>
diff --git a/process/RebuildAllDuplicateCaches_serverProcess/RebuildAllDuplicateCaches_serverProcess.aod b/process/RebuildAllDuplicateCaches_serverProcess/RebuildAllDuplicateCaches_serverProcess.aod
index 7d7d887aa097e608434cd4b22d55986a75d7f33b..11432054cc7356358ef25e9d7b657ca5973bba2f 100644
--- a/process/RebuildAllDuplicateCaches_serverProcess/RebuildAllDuplicateCaches_serverProcess.aod
+++ b/process/RebuildAllDuplicateCaches_serverProcess/RebuildAllDuplicateCaches_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>RebuildAllDuplicateCaches_serverProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/RebuildAllDuplicateCaches_serverProcess/process.js</process>
diff --git a/process/RebuildDuplicatesCache_serverProcess/RebuildDuplicatesCache_serverProcess.aod b/process/RebuildDuplicatesCache_serverProcess/RebuildDuplicatesCache_serverProcess.aod
index 21d0559480699c819f719274c88863094991a05d..078550c7200171ccff2e26f2515a616016da481a 100644
--- a/process/RebuildDuplicatesCache_serverProcess/RebuildDuplicatesCache_serverProcess.aod
+++ b/process/RebuildDuplicatesCache_serverProcess/RebuildDuplicatesCache_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>RebuildDuplicatesCache_serverProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/RebuildDuplicatesCache_serverProcess/process.js</process>
diff --git a/process/RemoveFromCampaign_workflowService/RemoveFromCampaign_workflowService.aod b/process/RemoveFromCampaign_workflowService/RemoveFromCampaign_workflowService.aod
index 8dde3d1708e628524bbffd2d07f452a7f9cdbf0e..9a2e06c6e7128e5448ad661af163c5f1ff23986d 100644
--- a/process/RemoveFromCampaign_workflowService/RemoveFromCampaign_workflowService.aod
+++ b/process/RemoveFromCampaign_workflowService/RemoveFromCampaign_workflowService.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>RemoveFromCampaign_workflowService</name>
<title>Remove from Campaign</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/Report_lib/Report_lib.aod b/process/Report_lib/Report_lib.aod
index b847e04de6288a50fd822dffef554f45c285423f..a7caa94038945e9aa86704ab525dc5dc21b037e5 100644
--- a/process/Report_lib/Report_lib.aod
+++ b/process/Report_lib/Report_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Report_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Report_lib/process.js</process>
diff --git a/process/Salesproject_lib/Salesproject_lib.aod b/process/Salesproject_lib/Salesproject_lib.aod
index 06956e427082baea872c1f395aca9c5337032e42..32fb545354a53bee2209d60d4cdbf64074e24a55 100644
--- a/process/Salesproject_lib/Salesproject_lib.aod
+++ b/process/Salesproject_lib/Salesproject_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Salesproject_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Salesproject_lib/process.js</process>
diff --git a/process/SendEmail_workflowService/SendEmail_workflowService.aod b/process/SendEmail_workflowService/SendEmail_workflowService.aod
index d58abf463370007f75396e6fc71b93827fcfabd3..2dbab69e62effe7618abfdd14335a8de7fdc0c27 100644
--- a/process/SendEmail_workflowService/SendEmail_workflowService.aod
+++ b/process/SendEmail_workflowService/SendEmail_workflowService.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>SendEmail_workflowService</name>
<title>Send email</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/SetAttribute_workflowService/SetAttribute_workflowService.aod b/process/SetAttribute_workflowService/SetAttribute_workflowService.aod
index 0816609206a36c0993b7f8a5eff2cfb94344662a..17c234d1ae4af84fa4575854505e42e53b478c81 100644
--- a/process/SetAttribute_workflowService/SetAttribute_workflowService.aod
+++ b/process/SetAttribute_workflowService/SetAttribute_workflowService.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>SetAttribute_workflowService</name>
<title>Set attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/SetCampaignStep_workflowService/SetCampaignStep_workflowService.aod b/process/SetCampaignStep_workflowService/SetCampaignStep_workflowService.aod
index 708612a5a1a3d624e9dad5ef53a066daefb7bd7f..202fd45600846fdcb2781ad3fd2a518f5e73a64c 100644
--- a/process/SetCampaignStep_workflowService/SetCampaignStep_workflowService.aod
+++ b/process/SetCampaignStep_workflowService/SetCampaignStep_workflowService.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>SetCampaignStep_workflowService</name>
<title>Set Campaign Step</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/SetSalesprojectPhase_workflowService/SetSalesprojectPhase_workflowService.aod b/process/SetSalesprojectPhase_workflowService/SetSalesprojectPhase_workflowService.aod
index cd9e8f63d12bd4f5af9c1555277c6a54fb82db93..19550d2d6b58731f3730a99daecbaea1041213b7 100644
--- a/process/SetSalesprojectPhase_workflowService/SetSalesprojectPhase_workflowService.aod
+++ b/process/SetSalesprojectPhase_workflowService/SetSalesprojectPhase_workflowService.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>SetSalesprojectPhase_workflowService</name>
<title>Set salesproject phase</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/SqlBuilder_test/SqlBuilder_test.aod b/process/SqlBuilder_test/SqlBuilder_test.aod
index 3992282911646839e2344fc4154d6a0a30666daf..c8c1620c9e458c45817eb40fc2dde2d643fce18c 100644
--- a/process/SqlBuilder_test/SqlBuilder_test.aod
+++ b/process/SqlBuilder_test/SqlBuilder_test.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>SqlBuilder_test</name>
<title>[TEST] Sql_lib - SqlBuilder</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/SqlMaskingUtils_test/SqlMaskingUtils_test.aod b/process/SqlMaskingUtils_test/SqlMaskingUtils_test.aod
index 8636a3707b101a2e7e0b22e10e54c6d596508b53..e3fbcc2640d62d2800c77178cbedea4a1ad35f93 100644
--- a/process/SqlMaskingUtils_test/SqlMaskingUtils_test.aod
+++ b/process/SqlMaskingUtils_test/SqlMaskingUtils_test.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>SqlMaskingUtils_test</name>
<title>[TEST] Sql_lib - SqlMaskingUtils</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/Sql_lib/Sql_lib.aod b/process/Sql_lib/Sql_lib.aod
index 8e786ba49ef55715b8396b364c1339d19c3d829d..9ecdf3e0cef487950e3ce08b11bc7640e3d5b866 100644
--- a/process/Sql_lib/Sql_lib.aod
+++ b/process/Sql_lib/Sql_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Sql_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/Sql_lib/documentation.adoc</documentation>
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index eecd2a9c83628dd909a5c182d53c53d38963a53b..8c981ecd4db360cd95a00663a447f1ebf3f8be5c 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -3292,6 +3292,45 @@ SqlMaskingUtils.prototype.getConcatSymbol = function()
}
}
+
+/**
+* Returns the group_concat function, which groups <br>
+* multiple Row Values into one Cell. Note: This function <br>
+* does not work on Derby<br>
+*
+* @param {String} pField <p>
+* Expression that shall be grouped.<br>
+* @param {String} pSeperator <p>
+* Character that shall be used as Seperator<br>
+* @return {String} <p>
+* Returns the field with groupConcat wrapped around<br>
+*/
+SqlMaskingUtils.prototype.getGroupConcat = function(pField, pSeperator)
+{
+ var group;
+ if(pField == null || pSeperator == null || pField == null && pSeperator == null)
+ throw new Error(translate.withArguments("Field or Seperator were empty function: %0", ["SqlMaskingUtils.prototype.getGroupConcat"]));
+
+ switch(this.dbType)
+ {
+ case db.DBTYPE_MARIADB10:
+ case db.DBTYPE_MYSQL4:
+ group = " GROUP_CONCAT("+pField+" SEPARATOR "+pSeperator+")";
+ break;
+ case db.DBTYPE_ORACLE10_CLUSTER:
+ case db.DBTYPE_ORACLE10_THIN:
+ case db.DBTYPE_ORACLE10_OCI:
+ case db.DBTYPE_POSTGRESQL8:
+ case db.DBTYPE_SQLSERVER2000:
+ group = " STRING_AGG("+pField+", "+pSeperator+")";
+ break;
+ case db.DBTYPE_DERBY10:
+ logging.log(translate.withArguments("${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0", ["SqlMaskingUtils.prototype.getGroupConcat"]), logging.ERROR);
+ break;
+ }
+ return group;
+}
+
/**
* Returns the trim function, which removes the<br>
* leading and trailing spaces in a string, depending<br>
diff --git a/process/StandardObject_lib/StandardObject_lib.aod b/process/StandardObject_lib/StandardObject_lib.aod
index 94c1fcc045a7d0035211ebd8afb1d46832b39065..c69d626eb8d55e3c7820c9a130c16ff3e790d850 100644
--- a/process/StandardObject_lib/StandardObject_lib.aod
+++ b/process/StandardObject_lib/StandardObject_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>StandardObject_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/StandardObject_lib/documentation.adoc</documentation>
diff --git a/process/TempRebuildIndexPerson_serverProcess/TempRebuildIndexPerson_serverProcess.aod b/process/TempRebuildIndexPerson_serverProcess/TempRebuildIndexPerson_serverProcess.aod
index bffee7201afb41060808fc74c155973b7f9a4ca8..3d6e25db86c11f51f4f20f0ab10b249a7166843a 100644
--- a/process/TempRebuildIndexPerson_serverProcess/TempRebuildIndexPerson_serverProcess.aod
+++ b/process/TempRebuildIndexPerson_serverProcess/TempRebuildIndexPerson_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>TempRebuildIndexPerson_serverProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/TempRebuildIndexPerson_serverProcess/process.js</process>
diff --git a/process/Terminal_lib/Terminal_lib.aod b/process/Terminal_lib/Terminal_lib.aod
index 9fa0811425e089b731f59a376c4089e526725b17..fee1f093874fd8eaab65e87dbe5c346c66a17860 100644
--- a/process/Terminal_lib/Terminal_lib.aod
+++ b/process/Terminal_lib/Terminal_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Terminal_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/Terminal_lib/documentation.adoc</documentation>
diff --git a/process/TestIndexSearch/TestIndexSearch.aod b/process/TestIndexSearch/TestIndexSearch.aod
index 9dfabc2aa4b1af9a5d9d3f1d1eaac79c2a20c66c..66107b82c6692ba97791ea6e0ef9eb87a8c70372 100644
--- a/process/TestIndexSearch/TestIndexSearch.aod
+++ b/process/TestIndexSearch/TestIndexSearch.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>TestIndexSearch</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/TestIndexSearch/process.js</process>
diff --git a/process/Ticket_lib/Ticket_lib.aod b/process/Ticket_lib/Ticket_lib.aod
index 5ce9c41505cb4df632f5c1d34f0bbaf80f48a171..f8dd6fe8f2e97ce7d9eebbf8e1f725b9eeba4b34 100644
--- a/process/Ticket_lib/Ticket_lib.aod
+++ b/process/Ticket_lib/Ticket_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Ticket_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Ticket_lib/process.js</process>
diff --git a/process/Timetracking_lib/Timetracking_lib.aod b/process/Timetracking_lib/Timetracking_lib.aod
index b514721991f2a2544cf57c10e3bc5d89c0571d7b..140b9a95c1bc4667c5056929735b6e5bd0ac6e75 100644
--- a/process/Timetracking_lib/Timetracking_lib.aod
+++ b/process/Timetracking_lib/Timetracking_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Timetracking_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Timetracking_lib/process.js</process>
diff --git a/process/Turnover_lib/Turnover_lib.aod b/process/Turnover_lib/Turnover_lib.aod
index 28bacd7d8eaa8d0f3bd01ed7f72c229487b2372e..12dbb916887a5ee928249e5e2a08760389bab573 100644
--- a/process/Turnover_lib/Turnover_lib.aod
+++ b/process/Turnover_lib/Turnover_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Turnover_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Turnover_lib/process.js</process>
diff --git a/process/UnitTest_lib/UnitTest_lib.aod b/process/UnitTest_lib/UnitTest_lib.aod
index a44993167651207727a423951deff7db60238dfb..25bd7badb373769aa481fb03fab69956dc8b704f 100644
--- a/process/UnitTest_lib/UnitTest_lib.aod
+++ b/process/UnitTest_lib/UnitTest_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>UnitTest_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:CHECK_CIRCLE_O</icon>
diff --git a/process/UnitTest_test/UnitTest_test.aod b/process/UnitTest_test/UnitTest_test.aod
index 095a395529bdac348b397a4854c6939cccab89f3..853608a4031b47bab007db1dd836433d694f1c2e 100644
--- a/process/UnitTest_test/UnitTest_test.aod
+++ b/process/UnitTest_test/UnitTest_test.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>UnitTest_test</name>
<title>[TEST] UnitTest_lib</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/UpdateOffer_workflowService/UpdateOffer_workflowService.aod b/process/UpdateOffer_workflowService/UpdateOffer_workflowService.aod
index 6afa7117eb943d416023c4c05c6371266bb01ab7..39149b2c28f79fd5db740299f0ce80a0f29a5311 100644
--- a/process/UpdateOffer_workflowService/UpdateOffer_workflowService.aod
+++ b/process/UpdateOffer_workflowService/UpdateOffer_workflowService.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>UpdateOffer_workflowService</name>
<title>Update offer</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/UserSettings_lib/UserSettings_lib.aod b/process/UserSettings_lib/UserSettings_lib.aod
index 41d85657ed0bcbfa6492589ee6a7238af2859f05..c1470052e9c9fd7d43344513964da783102380d2 100644
--- a/process/UserSettings_lib/UserSettings_lib.aod
+++ b/process/UserSettings_lib/UserSettings_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>UserSettings_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/UserSettings_lib/process.js</process>
diff --git a/process/Util_lib/Util_lib.aod b/process/Util_lib/Util_lib.aod
index 6a28f6ac135dc0e474b2a0c951704dc8635e5591..67bbab87069f4098d62bd0bf30556729eefca16e 100644
--- a/process/Util_lib/Util_lib.aod
+++ b/process/Util_lib/Util_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Util_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Util_lib/process.js</process>
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index 00ddb82a71bc8976508282f740e58b7fc996d5a3..154076f048f07ef9c800784fb3e056ea741ee46c 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -411,7 +411,7 @@ Utils.objectValues = function (pObject)
*/
Utils.buildFilterObj = function(pFilterObj, pFieldName, pOperator, pContentType, pValue, pKey, pParentOperator)
{
-
+ //TODO: maybe something like this should be inside the JditoFilter_lib, but more fluent
if(pParentOperator && pParentOperator != "AND" && pParentOperator != "OR")
throw new Error(translate.text("Illegal Parent Operator in buildFilterObj-Function: "+pParentOperator));
diff --git a/process/ViewTemplateData_lib/ViewTemplateData_lib.aod b/process/ViewTemplateData_lib/ViewTemplateData_lib.aod
index 5bb454846588aa47368b0a1b4dcba63e3540fb71..c176378fed5c683a712cb73660d8c09f2329ec9d 100644
--- a/process/ViewTemplateData_lib/ViewTemplateData_lib.aod
+++ b/process/ViewTemplateData_lib/ViewTemplateData_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>ViewTemplateData_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/ViewTemplateData_lib/process.js</process>
diff --git a/process/Workflow_lib/Workflow_lib.aod b/process/Workflow_lib/Workflow_lib.aod
index 3045e31bec24acabc4d44347f9c8f91fc613e9c6..bff9603a4c8686ef9c379fbd4690b665a7ab6c33 100644
--- a/process/Workflow_lib/Workflow_lib.aod
+++ b/process/Workflow_lib/Workflow_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>Workflow_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Workflow_lib/process.js</process>
diff --git a/process/WsValidation_lib/WsValidation_lib.aod b/process/WsValidation_lib/WsValidation_lib.aod
index a896dd2fdc17d3ddc9035ac2f5e6370513d0e9a7..fcb5a966b0dcbd779e3a055a9b6a968d42ae8b36 100644
--- a/process/WsValidation_lib/WsValidation_lib.aod
+++ b/process/WsValidation_lib/WsValidation_lib.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>WsValidation_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/WsValidation_lib/documentation.adoc</documentation>
diff --git a/process/_all_test/_all_test.aod b/process/_all_test/_all_test.aod
index 4336a9ddb94b6e8c5741887bbfd4e636f23b0541..f65a8c72b0b9ade07fc33a65875810fbe9e3ba16 100644
--- a/process/_all_test/_all_test.aod
+++ b/process/_all_test/_all_test.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>_all_test</name>
<title>[TEST] .All</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/_test_clientProcess/_test_clientProcess.aod b/process/_test_clientProcess/_test_clientProcess.aod
index d003fb54e120cf37ede7b6068a820e10a07e2574..083128043b009ec6417b6ecb0589e04ba2c4eead 100644
--- a/process/_test_clientProcess/_test_clientProcess.aod
+++ b/process/_test_clientProcess/_test_clientProcess.aod
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>_test_clientProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/_test_clientProcess/documentation.adoc</documentation>
<process>%aditoprj%/process/_test_clientProcess/process.js</process>
<publishAsWebservice v="true" />
<wsdl>%aditoprj%/process/_test_clientProcess/wsdl.wsdl</wsdl>
- <loginTypeId>internal.none</loginTypeId>
+ <loginTypeId>
+ <element>internal.none</element>
+ </loginTypeId>
<alias>Data_alias</alias>
<variants>
<element>EXECUTABLE</element>
diff --git a/process/_test_importer/_test_importer.aod b/process/_test_importer/_test_importer.aod
index 609067fbad20084a0ca5eef1fb0dcb1c6030f59d..86b1e22c42fded0be140b3dadad42671f76b3fa6 100644
--- a/process/_test_importer/_test_importer.aod
+++ b/process/_test_importer/_test_importer.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>_test_importer</name>
<title>Importer</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/autostartNeon/autostartNeon.aod b/process/autostartNeon/autostartNeon.aod
index 5cae2b54c4df27afd135f072eb2e42809dfd90c7..53cfbced0376808b3cc01e1a318a0865f39b4d77 100644
--- a/process/autostartNeon/autostartNeon.aod
+++ b/process/autostartNeon/autostartNeon.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>autostartNeon</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/autostartNeon/process.js</process>
diff --git a/process/blobHandler/blobHandler.aod b/process/blobHandler/blobHandler.aod
index ea16fe9164248509d582008e59c1fb8c3b11f554..df5da687878fc7ea5c3aff68e901c195a1883c9b 100644
--- a/process/blobHandler/blobHandler.aod
+++ b/process/blobHandler/blobHandler.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>blobHandler</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/blobHandler/process.js</process>
diff --git a/process/buildSerialLetter_serverProcess/buildSerialLetter_serverProcess.aod b/process/buildSerialLetter_serverProcess/buildSerialLetter_serverProcess.aod
index 5474adbf834c476e62b2ea0402e39d29c1e4ff3a..c5fa5bae70e0432c332962e39305acfe37e3948e 100644
--- a/process/buildSerialLetter_serverProcess/buildSerialLetter_serverProcess.aod
+++ b/process/buildSerialLetter_serverProcess/buildSerialLetter_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>buildSerialLetter_serverProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/buildSerialLetter_serverProcess/documentation.adoc</documentation>
diff --git a/process/ctiCall/ctiCall.aod b/process/ctiCall/ctiCall.aod
index efab080bf759f15b9fc8ae22098447a6d810a32d..6614528e0386b2a7b3fc4b705e1861b64445e33e 100644
--- a/process/ctiCall/ctiCall.aod
+++ b/process/ctiCall/ctiCall.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>ctiCall</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/ctiCall/process.js</process>
diff --git a/process/ctiServerEvents/ctiServerEvents.aod b/process/ctiServerEvents/ctiServerEvents.aod
index 0b6ce1bf16282c51184affeb49fc8a91106f955b..4f02a720a23094e2ff2425a8f94dc52c0f2d2730 100644
--- a/process/ctiServerEvents/ctiServerEvents.aod
+++ b/process/ctiServerEvents/ctiServerEvents.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>ctiServerEvents</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/ctiServerEvents/process.js</process>
diff --git a/process/emailWrite/emailWrite.aod b/process/emailWrite/emailWrite.aod
index 60d3efe9f572e652c49a01965c3cc95514253914..a752349818c0a8632c76c4167a1e9ed84af7cf51 100644
--- a/process/emailWrite/emailWrite.aod
+++ b/process/emailWrite/emailWrite.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>emailWrite</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/emailWrite/process.js</process>
diff --git a/process/ewsSyncCalendarPermissions_serverProcess/ewsSyncCalendarPermissions_serverProcess.aod b/process/ewsSyncCalendarPermissions_serverProcess/ewsSyncCalendarPermissions_serverProcess.aod
index 703deab5221c889c45a77b3a60b6ab4b5f58e31e..353165e368d282145e8820da01ae290c587b5198 100644
--- a/process/ewsSyncCalendarPermissions_serverProcess/ewsSyncCalendarPermissions_serverProcess.aod
+++ b/process/ewsSyncCalendarPermissions_serverProcess/ewsSyncCalendarPermissions_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>ewsSyncCalendarPermissions_serverProcess</name>
<title>Synchronize calendar permissions from Exchange to ADITO</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/exportLiquibaseContent_serverProcess/exportLiquibaseContent_serverProcess.aod b/process/exportLiquibaseContent_serverProcess/exportLiquibaseContent_serverProcess.aod
index 117726612c9ffdc42c5f4e04273f6b9acf1c4094..81c7818957427295a4efcf597330f34df0a8bda2 100644
--- a/process/exportLiquibaseContent_serverProcess/exportLiquibaseContent_serverProcess.aod
+++ b/process/exportLiquibaseContent_serverProcess/exportLiquibaseContent_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>exportLiquibaseContent_serverProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/exportLiquibaseContent_serverProcess/documentation.adoc</documentation>
diff --git a/process/exportLiquibaseSystemalias_serverProcess/exportLiquibaseSystemalias_serverProcess.aod b/process/exportLiquibaseSystemalias_serverProcess/exportLiquibaseSystemalias_serverProcess.aod
index 9437d3b30537612af789f265de1b2a9375903711..2f46ffd47d194aa90c1d54f61acb1682b485ca48 100644
--- a/process/exportLiquibaseSystemalias_serverProcess/exportLiquibaseSystemalias_serverProcess.aod
+++ b/process/exportLiquibaseSystemalias_serverProcess/exportLiquibaseSystemalias_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>exportLiquibaseSystemalias_serverProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/exportLiquibaseSystemalias_serverProcess/process.js</process>
diff --git a/process/getDocxDocument_serverProcess/getDocxDocument_serverProcess.aod b/process/getDocxDocument_serverProcess/getDocxDocument_serverProcess.aod
index cb4430fb0bcd05511a4cbdf794dc665aa2e28bc1..fe54f57b76aac1e81d0e497629b7ab0aaa33931c 100644
--- a/process/getDocxDocument_serverProcess/getDocxDocument_serverProcess.aod
+++ b/process/getDocxDocument_serverProcess/getDocxDocument_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>getDocxDocument_serverProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/getDocxDocument_serverProcess/documentation.adoc</documentation>
diff --git a/process/importLead_serverProcess/importLead_serverProcess.aod b/process/importLead_serverProcess/importLead_serverProcess.aod
index 4316e4127172656ebfb03e03a6d853daeb077a20..a73a9e8246f9160d8c50abddfc0bc0d1863dc050 100644
--- a/process/importLead_serverProcess/importLead_serverProcess.aod
+++ b/process/importLead_serverProcess/importLead_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>importLead_serverProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/importLead_serverProcess/process.js</process>
diff --git a/process/mailbridge/mailbridge.aod b/process/mailbridge/mailbridge.aod
index 254ff35492e5ce5eccb03b1d7a55c4ced626e8a1..079dab4650beb124ce85f9345c4928b87a80fc4c 100644
--- a/process/mailbridge/mailbridge.aod
+++ b/process/mailbridge/mailbridge.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>mailbridge</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/mailbridge/documentation.adoc</documentation>
diff --git a/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod b/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod
index cfd92c97942fb960b69e71317d82e75f4f013e0f..a6d4fe24cf1fc3a4d501acd6546807ac3bea8180 100644
--- a/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod
+++ b/process/mark_cachedrecordcontainers_invalid_serverProcess/mark_cachedrecordcontainers_invalid_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>mark_cachedrecordcontainers_invalid_serverProcess</name>
<title>Mark all cached record containers as invalid</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/mstBot_rest/mstBot_rest.aod b/process/mstBot_rest/mstBot_rest.aod
index dd88fc1a4c12fafd80261eb24b58ffab76e0c65f..64a88b4452787c65f100f261960f91835763daa3 100644
--- a/process/mstBot_rest/mstBot_rest.aod
+++ b/process/mstBot_rest/mstBot_rest.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>mstBot_rest</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/mstBot_rest/process.js</process>
@@ -7,7 +7,9 @@
<style>REST</style>
<restAcceptedMimeType>application/json</restAcceptedMimeType>
<restDeliveredMimeType>application/json</restDeliveredMimeType>
- <loginTypeId>internal.none</loginTypeId>
+ <loginTypeId>
+ <element>internal.none</element>
+ </loginTypeId>
<publishAsClientWebservice v="true" />
<alias>Data_alias</alias>
</process>
diff --git a/process/process_audit/process_audit.aod b/process/process_audit/process_audit.aod
index 55b53099a0f6b045a1699cb473417840521a8b09..fb5dcd8da903ba9ffe3172451cd386e094fb0441 100644
--- a/process/process_audit/process_audit.aod
+++ b/process/process_audit/process_audit.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>process_audit</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/process_audit/process.js</process>
diff --git a/process/rebuildIndex_serverProcess/rebuildIndex_serverProcess.aod b/process/rebuildIndex_serverProcess/rebuildIndex_serverProcess.aod
index 710063184897bbc4ad2e09ff1f8e3cac536b1b68..106c678f9add12e1f3afe67989627720cd6515d2 100644
--- a/process/rebuildIndex_serverProcess/rebuildIndex_serverProcess.aod
+++ b/process/rebuildIndex_serverProcess/rebuildIndex_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>rebuildIndex_serverProcess</name>
<title>rebuild Index</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/redirect_rest/redirect_rest.aod b/process/redirect_rest/redirect_rest.aod
index 3087b0ad4b7fcc1e48a6122ae26fe32120328632..bda233f7990cbcde49e43a759006b8fd964fc26d 100644
--- a/process/redirect_rest/redirect_rest.aod
+++ b/process/redirect_rest/redirect_rest.aod
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>redirect_rest</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/redirect_rest/process.js</process>
<publishAsWebservice v="true" />
<style>REST</style>
- <loginTypeId>internal.none</loginTypeId>
+ <loginTypeId>
+ <element>internal.none</element>
+ </loginTypeId>
<variants>
<element>EXECUTABLE</element>
</variants>
diff --git a/process/removeMSTTeams_serverProcess/removeMSTTeams_serverProcess.aod b/process/removeMSTTeams_serverProcess/removeMSTTeams_serverProcess.aod
index f8b67e0fdd01a7f82c495f0105ac180558ccaf85..c120e20c39f5b8e0c8348dd823abb61a2890bd85 100644
--- a/process/removeMSTTeams_serverProcess/removeMSTTeams_serverProcess.aod
+++ b/process/removeMSTTeams_serverProcess/removeMSTTeams_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>removeMSTTeams_serverProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/removeMSTTeams_serverProcess/process.js</process>
diff --git a/process/sendBulkMail_serverProcess/sendBulkMail_serverProcess.aod b/process/sendBulkMail_serverProcess/sendBulkMail_serverProcess.aod
index 645ed890444612e3470acf524ef90bc730725fca..8357bb2adf8a19f802111fd90d3c734932f8b2e6 100644
--- a/process/sendBulkMail_serverProcess/sendBulkMail_serverProcess.aod
+++ b/process/sendBulkMail_serverProcess/sendBulkMail_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>sendBulkMail_serverProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/sendBulkMail_serverProcess/documentation.adoc</documentation>
diff --git a/process/setMissingAddressLocations_serverProcess/setMissingAddressLocations_serverProcess.aod b/process/setMissingAddressLocations_serverProcess/setMissingAddressLocations_serverProcess.aod
index 3752f6718de29b5a4b07e3c29bae7416d6860164..23c67a18a2d9f489e3a183e8f76b1c1d782da02e 100644
--- a/process/setMissingAddressLocations_serverProcess/setMissingAddressLocations_serverProcess.aod
+++ b/process/setMissingAddressLocations_serverProcess/setMissingAddressLocations_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>setMissingAddressLocations_serverProcess</name>
<title>Set missing address locations</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/startWorkflowInstances_serverProcess/startWorkflowInstances_serverProcess.aod b/process/startWorkflowInstances_serverProcess/startWorkflowInstances_serverProcess.aod
index 5d5de80f53c69c20e9c3190e3d8eb99775217a65..e1cb70568a30aa232f833f0d1e8559c09a5d219c 100644
--- a/process/startWorkflowInstances_serverProcess/startWorkflowInstances_serverProcess.aod
+++ b/process/startWorkflowInstances_serverProcess/startWorkflowInstances_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>startWorkflowInstances_serverProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/startWorkflowInstances_serverProcess/process.js</process>
diff --git a/process/test_iCommRestriction/test_iCommRestriction.aod b/process/test_iCommRestriction/test_iCommRestriction.aod
index cc954a462d091f6b3efef2b7797b92a18ae0b2f8..6d894bcf6bee89031b4fa89d68bdef1b77076ec5 100644
--- a/process/test_iCommRestriction/test_iCommRestriction.aod
+++ b/process/test_iCommRestriction/test_iCommRestriction.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>test_iCommRestriction</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/test_iCommRestriction/process.js</process>
diff --git a/process/updateActivities_serverProzess/updateActivities_serverProzess.aod b/process/updateActivities_serverProzess/updateActivities_serverProzess.aod
index 51684eaceb296a2b5f75e7f1c82b373494b4e28e..8d14a4c15d8a8eae358f727c0b758fdf84d0f51a 100644
--- a/process/updateActivities_serverProzess/updateActivities_serverProzess.aod
+++ b/process/updateActivities_serverProzess/updateActivities_serverProzess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>updateActivities_serverProzess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/updateActivities_serverProzess/process.js</process>
diff --git a/process/updateAllAddressLocations_serverProcess/updateAllAddressLocations_serverProcess.aod b/process/updateAllAddressLocations_serverProcess/updateAllAddressLocations_serverProcess.aod
index e0b953cac1c1f40620c0510daec96d89a844955d..3b3864518417181d045df5dd820a80b48f875237 100644
--- a/process/updateAllAddressLocations_serverProcess/updateAllAddressLocations_serverProcess.aod
+++ b/process/updateAllAddressLocations_serverProcess/updateAllAddressLocations_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>updateAllAddressLocations_serverProcess</name>
<title>Set all address locations</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/updateClassifications_serverProcess/updateClassifications_serverProcess.aod b/process/updateClassifications_serverProcess/updateClassifications_serverProcess.aod
index 52e9c03b7cf5d4c0792dd5f4ea13a6676520a729..c3142850326968443c10f656f4ecf7468ebcdee2 100644
--- a/process/updateClassifications_serverProcess/updateClassifications_serverProcess.aod
+++ b/process/updateClassifications_serverProcess/updateClassifications_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>updateClassifications_serverProcess</name>
<title>Update all Classification entries in the system</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/process/workflowDeploy_rest/workflowDeploy_rest.aod b/process/workflowDeploy_rest/workflowDeploy_rest.aod
index 05c891a90280224cd574f42e6347203f67386f3a..ad6fb04bf2304ee5c01e7dd785ff274e146e82f7 100644
--- a/process/workflowDeploy_rest/workflowDeploy_rest.aod
+++ b/process/workflowDeploy_rest/workflowDeploy_rest.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>workflowDeploy_rest</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/workflowDeploy_rest/process.js</process>
diff --git a/process/workflowExtension_serverProcess/workflowExtension_serverProcess.aod b/process/workflowExtension_serverProcess/workflowExtension_serverProcess.aod
index d9ed92e0f4df987544d59237d139ec5c4d0a8458..195a4cd633e30d180b82eec95ea16e5be180a292 100644
--- a/process/workflowExtension_serverProcess/workflowExtension_serverProcess.aod
+++ b/process/workflowExtension_serverProcess/workflowExtension_serverProcess.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>workflowExtension_serverProcess</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/workflowExtension_serverProcess/process.js</process>
diff --git a/process/workflowLinkTracking_rest/workflowLinkTracking_rest.aod b/process/workflowLinkTracking_rest/workflowLinkTracking_rest.aod
index 9d33ad873277ea65215132f0999519ec2e699e08..c52adefed8b5466a9f677e271f2e094ecfd7070d 100644
--- a/process/workflowLinkTracking_rest/workflowLinkTracking_rest.aod
+++ b/process/workflowLinkTracking_rest/workflowLinkTracking_rest.aod
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>workflowLinkTracking_rest</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/workflowLinkTracking_rest/process.js</process>
<publishAsWebservice v="false" />
<style>REST</style>
- <loginTypeId>internal.none</loginTypeId>
+ <loginTypeId>
+ <element>internal.none</element>
+ </loginTypeId>
<restrictedRoles />
<alias>Data_alias</alias>
<variants>
diff --git a/process/workflowPrivileges_rest/workflowPrivileges_rest.aod b/process/workflowPrivileges_rest/workflowPrivileges_rest.aod
index 5a75e4758d9beb4122312853a53092986eb8b853..5ea1497835d807d18c23333b742ad6125d3777f0 100644
--- a/process/workflowPrivileges_rest/workflowPrivileges_rest.aod
+++ b/process/workflowPrivileges_rest/workflowPrivileges_rest.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>workflowPrivileges_rest</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/workflowPrivileges_rest/process.js</process>
diff --git a/process/workflowRoles_rest/workflowRoles_rest.aod b/process/workflowRoles_rest/workflowRoles_rest.aod
index 4f15d52de42e555e108da701ae778db1197ada7e..6cfb124a66132d6976ebf4201c34f5854d6abda2 100644
--- a/process/workflowRoles_rest/workflowRoles_rest.aod
+++ b/process/workflowRoles_rest/workflowRoles_rest.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>workflowRoles_rest</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/workflowRoles_rest/documentation.adoc</documentation>
diff --git a/process/workflowServiceTaskParams_rest/workflowServiceTaskParams_rest.aod b/process/workflowServiceTaskParams_rest/workflowServiceTaskParams_rest.aod
index 7922e7f73b3bc4dc4a9beddb7e1c984564411765..24c524d5bbe0a4c81636d114333f22a9f69043e8 100644
--- a/process/workflowServiceTaskParams_rest/workflowServiceTaskParams_rest.aod
+++ b/process/workflowServiceTaskParams_rest/workflowServiceTaskParams_rest.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>workflowServiceTaskParams_rest</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/workflowServiceTaskParams_rest/documentation.adoc</documentation>
diff --git a/process/workflowServiceTasks_rest/workflowServiceTasks_rest.aod b/process/workflowServiceTasks_rest/workflowServiceTasks_rest.aod
index ea3dfbea15a55987d24139a247e60142a9c41790..189d4377abed5818ead11c35ab8892788b3c4974 100644
--- a/process/workflowServiceTasks_rest/workflowServiceTasks_rest.aod
+++ b/process/workflowServiceTasks_rest/workflowServiceTasks_rest.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>workflowServiceTasks_rest</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/workflowServiceTasks_rest/documentation.adoc</documentation>
diff --git a/process/workflowSignal_rest/workflowSignal_rest.aod b/process/workflowSignal_rest/workflowSignal_rest.aod
index 3006dce1189bad2e90ffea71939fcd282ab4a693..db28e29d522c6089bc2bf21bea4c58d67da5f56f 100644
--- a/process/workflowSignal_rest/workflowSignal_rest.aod
+++ b/process/workflowSignal_rest/workflowSignal_rest.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>workflowSignal_rest</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/workflowSignal_rest/process.js</process>
diff --git a/process/workflowUsers_rest/workflowUsers_rest.aod b/process/workflowUsers_rest/workflowUsers_rest.aod
index 6669992f8a6350bc781118d4751bb12f8f679d05..ff6c8aa88c1d43861d49315a697ad537f3419a24 100644
--- a/process/workflowUsers_rest/workflowUsers_rest.aod
+++ b/process/workflowUsers_rest/workflowUsers_rest.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
<name>workflowUsers_rest</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/process/workflowUsers_rest/documentation.adoc</documentation>