diff --git a/.aditoprj/ignoredScanServiceTasks.json b/.aditoprj/ignoredScanServiceTasks.json
index 1ba3e77ba9398cb9b521fa6b87cd1427243e295f..55389c3975437d54ff7ea48078b39cda2f338d4b 100644
--- a/.aditoprj/ignoredScanServiceTasks.json
+++ b/.aditoprj/ignoredScanServiceTasks.json
@@ -24,6 +24,12 @@
"description": "There is no index for the column \"TESTING_CONTACT_ID\" in the table \"BULKMAIL\" [59]",
"groupName": "nb-tasklist-warning"
},
+ {
+ "target": "aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod",
+ "line": -1,
+ "description": "The table \"DATABASECHANGELOG\" has no primary key [65]",
+ "groupName": "nb-tasklist-warning"
+ },
{
"target": "aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod",
"line": -1,
diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index 94b3c6aab89bbcc9e3c5433f62e4fa30fa7bee5b..c476bb59ef66310a37a8475cfb85144ac7b3bc58 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!
-#Thu Dec 17 10:59:19 CET 2020
-version=6.2.1
+#Mon May 17 10:12:06 CEST 2021
+version=6.2.3
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
index 540e5ac07739f0524bb0296de3a9505762c3ee0e..a3ef4613451926ada644d4490e2b18bb421235b2 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
@@ -1,5 +1,7 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+
+ <include relativeToChangelogFile="true" file="struct/create_asys_audit.xml"/>
<include relativeToChangelogFile="true" file="struct/create_asys_aliasconfig.xml"/>
<include relativeToChangelogFile="true" file="struct/create_asys_binaries.xml"/>
<include relativeToChangelogFile="true" file="struct/create_asys_dashletconfigurations.xml"/>
@@ -29,5 +31,6 @@
<include relativeToChangelogFile="true" file="data/insert_asys_system.xml"/>
<include relativeToChangelogFile="true" file="data/insert_asys_permissionset.xml"/>
<include relativeToChangelogFile="true" file="data/insert_asys_permission.xml"/>
- <include relativeToChangelogFile="true" file="data/insert_asys_permissionaction.xml"/>
+ <include relativeToChangelogFile="true" file="data/insert_asys_permissionaction.xml"/>
+
</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_audit.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_audit.xml
new file mode 100644
index 0000000000000000000000000000000000000000..925f1cc139a3ab4128915d07d41d925f05aca4cd
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_audit.xml
@@ -0,0 +1,21 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+<changeSet author="m.schloder" id="Xcb1ff99-55bd-4ebc-8137-ec05b4cacbd7">
+ <createTable tableName="ASYS_AUDIT">
+ <column name="ACOLUMNNAME" type="VARCHAR(217)"/>
+ <column name="ALIAS" type="VARCHAR(255)"/>
+ <column name="ATABLENAME" type="VARCHAR(127)"/>
+ <column name="ATIMESTAMP" type="DATETIME"/>
+ <column name="AUSER" type="VARCHAR(255)"/>
+ <column name="DATASETID" type="VARCHAR(1023)"/>
+ <column name="DATASETNEWVALUE_BLOB" type="LONGBLOB"/>
+ <column name="DATASETNEWVALUE_CLOB" type="TEXT"/>
+ <column name="DATASETNEWVALUE_STRING" type="VARCHAR(1023)"/>
+ <column defaultValueComputed="CURRENT_TIMESTAMP" name="LOGTIME" type="TIMESTAMP" />
+ <column name="LOGTYPE" type="INT"/>
+ <column name="LOGWRITERUID" type="VARCHAR(127)"/>
+ <column name="SQLACTION" type="CHAR(1)"/>
+ </createTable>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/mailbridge/mailbridgeUser.xml b/.liquibase/_____SYSTEMALIAS/basic/mailbridge/mailbridgeUser.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a247f5de21821f3b34fdec902d5784cde5cdee48
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/mailbridge/mailbridgeUser.xml
@@ -0,0 +1,75 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
+ <changeSet author="s.pongratz" id="b8ccd980-c120-4938-99bc-deb728c6b6c3">
+ <insert tableName="ASYS_USERS">
+ <column name="ID" value="1e1771ef-4435-4b02-9e58-026d07eb3dcd"/>
+ <column name="DATE_NEW" valueDate="2021-04-30T13:03:38.877"/>
+ <column name="DATE_EDIT" valueDate="2021-04-30T13:09:41.313"/>
+ <column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
+ <column name="GROUPID" value="BASIC"/>
+ <column name="PROPKEY" value="lastModified"/>
+ <column name="PROPVAL" value="1619780981313"/>
+ <column name="PROPVAL_CLOB"/>
+ </insert>
+ <insert tableName="ASYS_USERS">
+ <column name="ID" value="25c3d371-8c2e-4f13-b315-9be499ca3e65"/>
+ <column name="DATE_NEW" valueDate="2021-04-30T13:03:38.877"/>
+ <column name="DATE_EDIT" valueDate="2021-04-30T13:03:38.877"/>
+ <column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
+ <column name="GROUPID" value="BASIC"/>
+ <column name="PROPKEY" value="name"/>
+ <column name="PROPVAL" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
+ <column name="PROPVAL_CLOB"/>
+ </insert>
+ <insert tableName="ASYS_USERS">
+ <column name="ID" value="b8d4548a-9528-4db9-a122-429b1df4968e"/>
+ <column name="DATE_NEW" valueDate="2021-04-30T13:03:38.877"/>
+ <column name="DATE_EDIT" valueDate="2021-04-30T13:09:34.112"/>
+ <column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
+ <column name="GROUPID" value="BASIC"/>
+ <column name="PROPKEY" value="title"/>
+ <column name="PROPVAL" value="mailbridge"/>
+ <column name="PROPVAL_CLOB"/>
+ </insert>
+ <insert tableName="ASYS_USERS">
+ <column name="ID" value="f634e205-4130-4e9e-8736-28fe41959de6"/>
+ <column name="DATE_NEW" valueDate="2021-04-30T13:09:21.362"/>
+ <column name="DATE_EDIT" valueDate="2021-04-30T13:09:21.362"/>
+ <column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
+ <column name="GROUPID" value="BASIC"/>
+ <column name="PROPKEY" value="email"/>
+ <column name="PROPVAL" value="mailbridge@domain.local"/>
+ <column name="PROPVAL_CLOB"/>
+ </insert>
+ <insert tableName="ASYS_USERS">
+ <column name="ID" value="33cc359d-6d02-454b-8fe3-15ef692a37a1"/>
+ <column name="DATE_NEW" valueDate="2021-04-30T13:09:21.369"/>
+ <column name="DATE_EDIT" valueDate="2021-04-30T13:09:21.369"/>
+ <column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
+ <column name="GROUPID" value="BASIC"/>
+ <column name="PROPKEY" value="isActive"/>
+ <column name="PROPVAL" value="true"/>
+ <column name="PROPVAL_CLOB"/>
+ </insert>
+ <insert tableName="ASYS_USERS">
+ <column name="ID" value="0a9f5363-2d0e-4591-95bd-62beeb952925"/>
+ <column name="DATE_NEW" valueDate="2021-04-30T13:09:41.315"/>
+ <column name="DATE_EDIT" valueDate="2021-04-30T13:09:41.315"/>
+ <column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
+ <column name="GROUPID" value="ROLE"/>
+ <column name="PROPKEY" value="roleNames"/>
+ <column name="PROPVAL" value="INTERNAL_TECHNICAL"/>
+ <column name="PROPVAL_CLOB"/>
+ </insert>
+ <insert tableName="ASYS_USERS">
+ <column name="ID" value="e65c5d62-bfb7-4b67-b7cc-65fe06fb7c81"/>
+ <column name="DATE_NEW" valueDate="2021-04-30T13:09:11.757"/>
+ <column name="DATE_EDIT" valueDate="2021-04-30T13:09:11.757"/>
+ <column name="NAME" value="_____USER_b9baa774-7239-4844-88f4-cddb2cdb3257"/>
+ <column name="GROUPID" value="BASIC"/>
+ <column name="PROPKEY" value="calendarID"/>
+ <column name="PROPVAL" value="mailbridge@domain.local"/>
+ <column name="PROPVAL_CLOB"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/changelog.xml b/.liquibase/_____SYSTEMALIAS/changelog.xml
index 0cff9f38ee81bb25310dd733eb038dc903af637e..b7d047b86d8cec85021361dcfe28cd2cc0796350 100644
--- a/.liquibase/_____SYSTEMALIAS/changelog.xml
+++ b/.liquibase/_____SYSTEMALIAS/changelog.xml
@@ -1,6 +1,7 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include relativeToChangelogFile="true" file="basic/init/init.xml"/>
+ <include relativeToChangelogFile="true" file="basic/mailbridge/mailbridgeUser.xml"/>
<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
diff --git a/aliasDefinition/WorkflowModeler/WorkflowModeler.aod b/aliasDefinition/WorkflowModeler/WorkflowModeler.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6f342ac951c9c34ed241236486bae07ca34cf783
--- /dev/null
+++ b/aliasDefinition/WorkflowModeler/WorkflowModeler.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aliasDefinition xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasDefinition/1.2.0">
+ <name>WorkflowModeler</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <datasourceType v="21" />
+</aliasDefinition>
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index cf7b453f0372f7c208eeff54b74d378215ab1cc8..3fee3be4df29a7e6f69bc3436b283fd321d6a173 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>360Degree_entity</name>
<title>360 Degree</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -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>
@@ -85,14 +77,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>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index d9d7007ec9227ddae16877a203d93ce5281bb21f..44ea0b63d5f5e157d0d3868aff38d1fcde1c7170 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ActivityLink_entity</name>
<title>Connection</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -40,14 +40,6 @@
<targetIdField>OBJECT_ROWID</targetIdField>
<documentation>%aditoprj%/entity/ActivityLink_entity/entityfields/links/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>148c98ea-a24b-453a-afe9-975555486b2c</name>
- <entityName>Activity_entity</entityName>
- <fieldName>Links</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ActivityId_param</name>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 968e15b45cc01648663f42fda0d233b1dddad81d..d14e21a69c13faf9dbe3468e915069072dda3374 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Activity_entity</name>
<title>Activity</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -80,20 +80,6 @@
<entityProvider>
<name>#PROVIDER</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>3ea70130-21b0-42ec-88e2-1a898059dcff</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>262fe53d-7358-40ff-8641-e08add14528a</name>
- <entityName>Object_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>ICON</name>
@@ -197,86 +183,6 @@
<name>LinkedObjects</name>
<documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>8ececf30-a3bc-4cd2-ad04-fb9f3cb9332d</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>549af7f6-3828-4c15-8357-72f0c6fc4f0c</name>
- <entityName>Contract_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>49a91b21-f24e-45c6-9b2c-5bb15d808d43</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6461d7f4-182f-4e5c-9453-49c145e15476</name>
- <entityName>Person_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>207920cd-b4b8-4f40-b6c4-6e25d4df9947</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b086fbf7-aa94-441f-a33c-e2ca8eda5dcd</name>
- <entityName>Order_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>00b4f354-5b82-4071-b70c-acab4780a2de</name>
- <entityName>Product_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9b416661-628d-4f8d-b8dc-9543cf5bbb1c</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4869a849-8717-48ec-9dbd-73df96992042</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>709bafbd-d258-4f1c-85e8-b7062ee0e42b</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4f51e380-7d34-4d6f-a10f-a9044ff671bb</name>
- <entityName>SerialLetter_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bfef6edf-e9c9-485b-afbe-8e175f6eda74</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>943c36a2-d378-44a1-b214-25e92244c8cb</name>
- <entityName>UniversalFileProcessor_entity</entityName>
- <fieldName>Activities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>OnlyInnate_param</name>
diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index 950fcd1f1dc1877ea33c1de0d3c20e92fd9e654a..c89f50125db5c7f010e527b361610cde83d867c9 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -14,28 +14,9 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
.and("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectId_param");
var rowId = vars.get("$param.RowId_param");
- if (vars.get("$param.ObjectId_param") == "Person")
- {
- //in the Person context, all activities linked to the person should be shown, so it is necessary to get all contactIds of that person
- var allPersonRelatedContactIds = newSelect("personContacts.CONTACTID")
- .from("CONTACT")
- .join("CONTACT", "CONTACT.PERSON_ID = personContacts.PERSON_ID", "personContacts")
- .where("CONTACT.CONTACTID", "$param.RowId_param")
- .arrayColumn();
-
- if (allPersonRelatedContactIds.length === 0)
- condition.noResult();
- else
- {
- activityLinkSubselect.and("ACTIVITYLINK.OBJECT_ROWID", allPersonRelatedContactIds, SqlBuilder.IN());
- condition.and(null, activityLinkSubselect, SqlBuilder.EXISTS());
- }
- }
- else
- {
- activityLinkSubselect.and("ACTIVITYLINK.OBJECT_ROWID", "$param.RowId_param");
- condition.and(null, activityLinkSubselect, SqlBuilder.EXISTS());
- }
+
+ activityLinkSubselect.and("ACTIVITYLINK.OBJECT_ROWID", "$param.RowId_param");
+ condition.and(null, activityLinkSubselect, SqlBuilder.EXISTS());
}
if (vars.exists("$param.ActivityIDs_param") && vars.get("$param.ActivityIDs_param"))
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index ed17a9345db928ee2a78d54a2ff245c449469b09..8c570720e66aa6925c4e3a0793fa763067eaf1a8 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AddressType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AddressType_entity/documentation.adoc</documentation>
@@ -22,14 +22,6 @@
<name>ByCategory</name>
<lookupIdfield>KEYID</lookupIdfield>
<documentation>%aditoprj%/entity/AddressType_entity/entityfields/bycategory/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>0956b1f3-8b67-4f82-b04a-70be88aff19f</name>
- <entityName>Address_entity</entityName>
- <fieldName>KeywordAddressTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>UsageFilter_param</name>
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index 8ae67be0937986e7c38ee54a2ac132b7b80d1d26..3534d6d9fb1b1ad1c164db7d2dac1983987b97c8 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AddressValidation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AddressValidation_entity/documentation.adoc</documentation>
@@ -17,14 +17,6 @@
<entityProvider>
<name>ZipValidaton</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/zipvalidaton/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>fcfcbebe-260a-4773-a874-9791b4887ae2</name>
- <entityName>Address_entity</entityName>
- <fieldName>ZipValidation</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Type_param</name>
@@ -76,14 +68,6 @@
<entityProvider>
<name>CityValidation</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/cityvalidation/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>27114db7-8562-43b2-87d8-fa605bbf2319</name>
- <entityName>Address_entity</entityName>
- <fieldName>CityValidation</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Type_param</name>
@@ -100,14 +84,6 @@
<entityProvider>
<name>FullAddressValidation</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/fulladdressvalidation/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>10f700b5-1ac6-4d50-bcb8-aae55714fb43</name>
- <entityName>Address_entity</entityName>
- <fieldName>FullAddressValidation</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Type_param</name>
@@ -136,14 +112,6 @@
<entityProvider>
<name>StreetValidation</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/streetvalidation/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>3211d147-0867-4fc1-8640-34a1b8fdcf18</name>
- <entityName>Address_entity</entityName>
- <fieldName>StreetValidation</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Type_param</name>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 320df4d9ebd700114e5e2eb57420bef95bc7089e..686d8185ca5631b2840fd118f4f98eb97201c4f3 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Address_entity</name>
<title>Address</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -95,14 +95,6 @@
<entityProvider>
<name>OrganisationAddresses</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Addresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactType_param</name>
@@ -133,26 +125,6 @@
<entityProvider>
<name>ContactAddresses</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
- <entityName>Person_entity</entityName>
- <fieldName>PersAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>aecd30a8-b80e-42c5-be09-3042b75a3fa2</name>
- <entityName>Contact_entity</entityName>
- <fieldName>ContactAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>03534109-04a7-4deb-b139-5c548aa2fd00</name>
- <entityName>CommunicationChannel_entity</entityName>
- <fieldName>Addresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactType_param</name>
@@ -189,14 +161,6 @@
<name>OrganisationAddressesByContact</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
<titlePlural>Company Addresses</titlePlural>
- <dependencies>
- <entityDependency>
- <name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
- <entityName>Person_entity</entityName>
- <fieldName>OrgAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactType_param</name>
@@ -234,26 +198,6 @@
<entityProvider>
<name>OrganisationAndContactAddresses</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>4d7e3b3a-abba-4429-9f1e-18e11788c0f2</name>
- <entityName>Person_entity</entityName>
- <fieldName>ContactAndOrganisationAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>daa41953-8e95-46f2-b08a-6c843ab87985</name>
- <entityName>Offer_entity</entityName>
- <fieldName>PossibleAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2f162626-bd99-4e2a-b9cf-e95864d9ed0e</name>
- <entityName>Order_entity</entityName>
- <fieldName>PossibleAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>DefaultAddressId_param</name>
@@ -462,20 +406,6 @@
<entityProvider>
<name>QuickEntryAdresses</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/quickentryadresses/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>d677a301-2038-4ccd-baa1-5f986e290564</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>Adresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>aa315b76-7573-4627-ae15-2e7414b8b34d</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>OrgAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>ReplaceStandardAddress_param</name>
diff --git a/entity/AdminViewRow_entity/AdminViewRow_entity.aod b/entity/AdminViewRow_entity/AdminViewRow_entity.aod
index 3310f1bc7a250aa6498e057dd5f132e0dd0c6e91..342ddfd282eaedc16823470fdbf30bca490693a0 100644
--- a/entity/AdminViewRow_entity/AdminViewRow_entity.aod
+++ b/entity/AdminViewRow_entity/AdminViewRow_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AdminViewRow_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AdminViewRow_entity/documentation.adoc</documentation>
@@ -27,14 +27,6 @@
<entityProvider>
<name>AdminViewRows</name>
<documentation>%aditoprj%/entity/AdminViewRow_entity/entityfields/adminviewrows/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>b5788fdf-1c82-45e2-8545-994c5e515476</name>
- <entityName>DefaultAdminView_entity</entityName>
- <fieldName>Rows</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CONTENTTYPE</name>
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index 7d49b0bd6a63ddb2bf1b1ebf8912ab1ec4e166c0..66b762cd1ecbee83fab890384129e6eba80d1a75 100644
--- a/entity/Analyses_entity/Analyses_entity.aod
+++ b/entity/Analyses_entity/Analyses_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Analyses_entity</name>
<title>Analyses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index f074dfa8dc592f164be35e53187aabf2766c7bdb..8426dd6b95dbcfbb8d000b2bbf8345cc22b45560 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AnyContact_entity</name>
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -11,110 +11,10 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>5d8b421e-a234-4d03-bfec-ed01f464a54c</name>
- <entityName>Contract_entity</entityName>
- <fieldName>AnyContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>94e4fa2c-7525-49f9-b933-353d200b829c</name>
- <entityName>Offer_entity</entityName>
- <fieldName>AnyContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f1f7d959-ecb5-4438-9762-fc11f1bc5334</name>
- <entityName>Order_entity</entityName>
- <fieldName>AnyContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b2895709-2ebf-46ec-a46d-6b2e9a4575a3</name>
- <entityName>BulkMailRecipient_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c6402198-278c-43e2-9b15-9be28270c83f</name>
- <entityName>LetterRecipient_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ae9040a2-1f2e-4105-aaed-eb3d067b2376</name>
- <entityName>DSGVOInfo_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>471b6e37-13ce-4e84-a797-82bccbe4e39a</name>
- <entityName>UnlinkedMailMappingLink_entity</entityName>
- <fieldName>AnyContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>aca9e52c-9138-4ef1-b039-1efeb3deb822</name>
- <entityName>BulkMailTesting_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bbd2bf84-7cad-4156-b736-32749949f97c</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>60518a9f-eaa5-4af8-8cd6-4276047f4371</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ea7c855e-dccd-4c05-9efb-a1303f37dab8</name>
- <entityName>CampaignParticipant_entity</entityName>
- <fieldName>AnyContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b3cf7b34-6ea4-411a-8123-34afd7e10cfc</name>
- <entityName>MailLog_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>578dbb91-ea76-40ec-9dbd-9acf462ceba7</name>
- <entityName>BulkMailTestRecipient_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>cb874ee2-e147-4311-bdf1-a94df537bb9e</name>
- <entityName>WeblinkClick_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>ContactsByIds</name>
<documentation>%aditoprj%/entity/AnyContact_entity/entityfields/contactsbyids/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>0206f7a8-fd58-47e8-8b7a-5ff4531e56fb</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>OrgAndPersDuplicates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ee4b75ff-e1fc-4dbe-a900-81a7a92a273e</name>
- <entityName>CampaignParticipant_entity</entityName>
- <fieldName>AnyContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -201,14 +101,6 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<entityProvider>
<name>OnlySameCompany</name>
<documentation>%aditoprj%/entity/AnyContact_entity/entityfields/onlysamecompany/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>28b19d6b-237c-4268-b6c6-323df408c94a</name>
- <entityName>Offer_entity</entityName>
- <fieldName>AnyContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index f049394bc23fffc92a1a735f41aa9bc86cba9d5f..fa6f725f684484833919424d17644c11b4ee417e 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AppointmentLink_entity</name>
<title>Connection</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -51,14 +51,6 @@
<targetIdField>OBJECTID</targetIdField>
<documentation>%aditoprj%/entity/AppointmentLink_entity/entityfields/links/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>3dde1745-18a1-4499-83d0-61e414086997</name>
- <entityName>Appointment_entity</entityName>
- <fieldName>AppointmentLinks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>AppointmentId_param</name>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index ebfd0f83c692dbda16668ec3f20a2da687b74c0e..c5080755c5409c0783408463a8c89bfc0110e749 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Appointment_entity</name>
<title>Appointment</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -205,26 +205,6 @@
<name>LinkedAppointments</name>
<documentation>%aditoprj%/entity/Appointment_entity/entityfields/linkedappointments/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>74dea3cd-a528-4616-b468-cd27f3f1a795</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedAppointments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>12b2a8cd-1b66-4123-b0a6-f1ca164bdfec</name>
- <entityName>Person_entity</entityName>
- <fieldName>Appointments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>17129bd7-1b1b-4090-9185-d6b3b83ffb40</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>LinkedAppointments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>LinkedAppointmentsFromDashlet_param</name>
diff --git a/entity/AroundLocation_entity/AroundLocation_entity.aod b/entity/AroundLocation_entity/AroundLocation_entity.aod
index 1ccc8984c6b21bc186fb84d00416543831fddeaa..2af99e89b5a197085e06ff606dbe59edeb8560ab 100644
--- a/entity/AroundLocation_entity/AroundLocation_entity.aod
+++ b/entity/AroundLocation_entity/AroundLocation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AroundLocation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AroundLocation_entity/documentation.adoc</documentation>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 040e3dfeaeef7181ad13197a1fae39c3d7fd22df..46767f5f58a0a82f759143a7cc2119410272ef4c 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AttributeRelation_entity</name>
<title>Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -35,68 +35,6 @@
<entityProvider>
<name>TreeProvider</name>
<documentation>%aditoprj%/entity/AttributeRelation_entity/entityfields/treeprovider/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f29d91fe-2537-486f-b9de-44065a7790d4</name>
- <entityName>Person_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>445c1bd7-4e72-4ab7-a5b1-cc77924eb562</name>
- <entityName>Product_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4498139f-067c-4cca-b122-d9bc9100c53d</name>
- <entityName>Activity_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
- <entityName>Contract_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3921c712-d15c-4941-b04d-44f4536dc404</name>
- <entityName>Employee_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>148faad1-78f6-4ff2-a4d5-9607d919adb9</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8ed8bae6-c69e-45ce-9fc9-5fb43587a47b</name>
- <entityName>Order_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>661f5b91-f71e-429e-a170-8bd18781bc69</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>80a034ee-c3fd-45e3-986c-d3854608c148</name>
- <entityName>Activity_entity</entityName>
- <fieldName>AttributeTreeIsTheme</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>GetTree_param</name>
@@ -167,90 +105,9 @@
<entityProvider>
<name>AttributeRelations</name>
<documentation>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelations/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>69560cc2-d92a-453c-9e64-fb712a538c4f</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>34f24d10-7312-4b03-8d6f-2918c8cb9eb8</name>
- <entityName>Person_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3cb1014d-a6c8-4b4a-83ba-a099d4488ab2</name>
- <entityName>Activity_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2662f513-6498-40c2-bed6-031087857e82</name>
- <entityName>Contract_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>be336d6c-c550-4ae5-9f78-0f2ee56a2a6c</name>
- <entityName>Employee_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8488da81-0f98-4c4b-811f-ccda64c8624b</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7df4a57a-646d-4b5a-802b-f1e2bf93d09b</name>
- <entityName>Order_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>40a4c698-d34f-4c5a-bee8-239ee9d71f20</name>
- <entityName>Product_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>99bc7ec8-195e-483f-923e-763c6f28a29c</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>fd90bd15-d9c2-4eb6-9e7f-7669fded02f6</name>
- <entityName>Competition_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e520143e-c72f-46e3-9c27-752471af51ae</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>AttributeConditions</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c66e5dbb-3d3c-424a-b816-31762eb72c1c</name>
- <entityName>Leadimport_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>92855510-92c8-4837-85d3-072396f5f7f6</name>
- <entityName>Contact_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>GetTree_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelations/children/gettree_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
</children>
@@ -377,14 +234,6 @@
</entityConsumer>
<entityProvider>
<name>FilterProvider</name>
- <dependencies>
- <entityDependency>
- <name>0560c6d0-8473-4050-9ca1-a935bbac2ef9</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>AttributesFilter</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>DisplaySimpleName_param</name>
diff --git a/entity/AttributeRelation_entity/entityfields/attributerelations/children/gettree_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/attributerelations/children/gettree_param/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 19cd75197be85fa49cad58cd153a5f9b7eca05f1..68385293582dd3fad372f7e7789b688f1d42f204 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AttributeUsage_entity</name>
<title>Usage</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -7,7 +7,6 @@
<siblings>
<element>Attribute_entity</element>
</siblings>
- <onValidation>%aditoprj%/entity/AttributeUsage_entity/onValidation.js</onValidation>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -38,14 +37,6 @@
<name>SpecificAttribute</name>
<documentation>%aditoprj%/entity/AttributeUsage_entity/entityfields/specificattribute/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>47ac9f95-8879-43fd-92a9-86079e735e58</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>AttributeUsages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>AttributeId_param</name>
diff --git a/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js b/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js
index 0a2f0bdb56a56e509e8977dfd6e93d0eb02994c3..38fd4fbc26dea0c1560f7152e9c69ada8b141f3e 100644
--- a/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js
+++ b/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js
@@ -3,7 +3,8 @@ import("system.vars");
import("system.translate");
import("Entity_lib");
-var maxCount = vars.get("local.value");
+var minCount = vars.getString("$field.MIN_COUNT");
+var maxCount = vars.get("$local.value");
if (maxCount)
{
@@ -12,4 +13,7 @@ if (maxCount)
result.string(translate.text("Maximal count must be one or higher"));
else if (maxCount != Math.floor(maxCount))
result.string(translate.text("Maximal count has to be a whole number"));
+ else if (minCount && minCount > maxCount)
+ result.string(translate.text("The minimal count can't be larger than the maximal count!"));
}
+
diff --git a/entity/AttributeUsage_entity/onValidation.js b/entity/AttributeUsage_entity/onValidation.js
deleted file mode 100644
index f35c9b28c229e58d70a79ab48c80cb2b0cb14bfc..0000000000000000000000000000000000000000
--- a/entity/AttributeUsage_entity/onValidation.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.translate");
-import("system.vars");
-import("system.result");
-
-var minCount = vars.getString("$field.MIN_COUNT");
-var maxCount = vars.getString("$field.MAX_COUNT");
-if (minCount != "" && maxCount != "" && minCount > maxCount)
- result.string(translate.text("The minimal count can't be larger than the maximal count!"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 52049d2bae1366fc8a27a2dbdc032bf69e57e1c8..4fb51c046e550c4b0ded4094d02ffcbae2188e5c 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Attribute_entity</name>
<title>Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -13,14 +13,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>42e6f528-8452-4262-97bd-68e8cbe99c74</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>ATTRIBUTE_NAME</name>
@@ -131,32 +123,6 @@
<name>SpecificAttribute</name>
<lookupIdfield>UID</lookupIdfield>
<documentation>%aditoprj%/entity/Attribute_entity/entityfields/specificattribute/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>ba3b4d47-7385-49df-bf61-54c99f5b2c81</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6bc87a7f-02f1-4cab-8c98-b89b626b59bd</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>ProjectTypeAttribute</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>26b85665-7914-45c4-b611-081ffe9502a4</name>
- <entityName>Employee_entity</entityName>
- <fieldName>Departments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f31eceb3-2fcc-4298-8c5d-1076433e2c2a</name>
- <entityName>PermissionCalendar_entity</entityName>
- <fieldName>Departments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -328,7 +294,7 @@
<onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:FILE_TREE_SMALL</iconId>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js</stateProcess>
@@ -350,14 +316,6 @@
</entityActionField>
<entityProvider>
<name>ThemeProvider</name>
- <dependencies>
- <entityDependency>
- <name>6e314038-62de-4f0c-b89a-92f029c10933</name>
- <entityName>Activity_entity</entityName>
- <fieldName>ActivityAtrributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>AttributeCount_param</name>
@@ -392,14 +350,6 @@
<sortingField>SORTING</sortingField>
<documentation>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/documentation.adoc</documentation>
<titlePlural>Child Attributes</titlePlural>
- <dependencies>
- <entityDependency>
- <name>80023321-1954-483f-a4be-b7207557c068</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>ChildAttributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ChildId_param</name>
@@ -478,14 +428,6 @@
</entityProvider>
<entityProvider>
<name>SpecificFilterAttributes</name>
- <dependencies>
- <entityDependency>
- <name>9b2b5f2e-229d-4a10-a54f-cbf77aafe512</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>SpecificFilterAttributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>DisplaySimpleName_param</name>
diff --git a/entity/AuditLogHistory_entity/AuditLogHistory_entity.aod b/entity/AuditLogHistory_entity/AuditLogHistory_entity.aod
index 4425b01ed72db74d1573848afc1b9473d5e3368a..e094807eb85da3bb7793033896583fb725108837 100644
--- a/entity/AuditLogHistory_entity/AuditLogHistory_entity.aod
+++ b/entity/AuditLogHistory_entity/AuditLogHistory_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>AuditLogHistory_entity</name>
<title>Audit Log</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
index e7f67f8f1e2cfa915f71c98dd05e7dbe3620ea36..63b472319fa68c5290688ac1587d01af22ded26b 100644
--- a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
+++ b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>BulkMailAddRecipients_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMailAddRecipients_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index ef0e59521989a72d08ea5fec6e909a2ac15861ba..3257dcb0779635192ed5000254ba9bd2f19e2639 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>BulkMailRecipient_entity</name>
<title>Recipient</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -39,14 +39,6 @@
<targetContextField>TARGETCONTEXT</targetContextField>
<targetIdField>CONTACT_ID</targetIdField>
<documentation>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/bulkmailrecipients/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>575e04ed-14aa-456c-8236-0bd284b1315f</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>Recipients</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>BulkMailId_param</name>
diff --git a/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/onActionProcess.js b/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/onActionProcess.js
index db090bed7fe1e8f31f659c42f7936638a44050f5..6759a0538060f2485b14c7a15d014401e8bb9f19 100644
--- a/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/onActionProcess.js
+++ b/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/onActionProcess.js
@@ -2,12 +2,13 @@ import("Contact_lib");
import("system.neon");
import("Sql_lib");
import("KeywordRegistry_basic");
+import("MarketingCondition_lib");
var recipientIds = newSelect("BULKMAILRECIPIENTID")
.from("BULKMAILRECIPIENT")
.join("CONTACT", newWhere()
.and("BULKMAILRECIPIENT.CONTACT_ID = CONTACT.CONTACTID")
- .and(ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$mail())))
+ .and(new CommunicationSettingsCondition().emails().rejected().existSettings().buildCondition()))
.whereIfSet("BULKMAILRECIPIENT.BULKMAIL_ID", "$param.BulkMailId_param")
.arrayColumn();
diff --git a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
index 8449b088e741ea936c249395c17838dee4cd4995..3f31aadc563b07317559410f6ec6cff86b77d7c4 100644
--- a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
+++ b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>BulkMailStatusChart_entity</name>
<title>Recipient status</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -31,14 +31,6 @@
<entityProvider>
<name>RecipientStatusChart</name>
<documentation>%aditoprj%/entity/BulkMailStatusChart_entity/entityfields/recipientstatuschart/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>e2d96467-ec53-424b-b78c-c97c2db2bb8a</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>RecipientStatusChart</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/BulkMailTestRecipient_entity/BulkMailTestRecipient_entity.aod b/entity/BulkMailTestRecipient_entity/BulkMailTestRecipient_entity.aod
index 8181a5415a373706ce729488e80b5629e3b604e7..cfea263cd5b51d9d8363f1b49fbd1c88ebcdf04a 100644
--- a/entity/BulkMailTestRecipient_entity/BulkMailTestRecipient_entity.aod
+++ b/entity/BulkMailTestRecipient_entity/BulkMailTestRecipient_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>BulkMailTestRecipient_entity</name>
<title>Test Recipient</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -38,14 +38,6 @@
</entityField>
<entityProvider>
<name>BulkMailTestRecipients</name>
- <dependencies>
- <entityDependency>
- <name>bf4102ef-e33c-4bdc-b62d-844f466f8617</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>BulkMailTestRecipients</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>Contacts</name>
diff --git a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
index e4d9fa98c6c7fdc68f8b3bafe53331ff672686f6..567fc93585a9c0bb5f3d743e85454f092b1d2164 100644
--- a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
+++ b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>BulkMailTesting_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMailTesting_entity/documentation.adoc</documentation>
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index c7e6b94645dc0d668cc1fadfa90a9a20140afdf3..5057ec60639c2a4468fd37d9da1f15ec156d5167 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>BulkMail_entity</name>
<title>Bulk Mail</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -15,14 +15,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>4ef3e311-d2b2-45bf-8f82-7f9ae7e107a9</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Bulkmails</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>BULKMAILID</name>
@@ -256,14 +248,6 @@
<entityProvider>
<name>BulkMailsNotSent</name>
<documentation>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmailsnotsent/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>16cdf326-0b43-4d72-bf19-21434e047e85</name>
- <entityName>BulkMailAddRecipients_entity</entityName>
- <fieldName>BulkMails</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>BulkMailStatus_param</name>
@@ -387,7 +371,7 @@
<name>INTEREST_ID</name>
<title>Interest</title>
<consumer>Interests</consumer>
- <displayValueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/interests_id/displayValueProcess.js</displayValueProcess>
+ <displayValueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/interest_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>Interests</name>
diff --git a/entity/BulkMail_entity/entityfields/interests_id/displayValueProcess.js b/entity/BulkMail_entity/entityfields/interest_id/displayValueProcess.js
similarity index 100%
rename from entity/BulkMail_entity/entityfields/interests_id/displayValueProcess.js
rename to entity/BulkMail_entity/entityfields/interest_id/displayValueProcess.js
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 76ea4711ebda2c2dfbaa5585ed538ad0583f06d3..f867fcdc4097bd543af7e7698418c8c9ae9fd68a 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>CampaignAddParticipants_entity</name>
<title>Add participants to Campaign</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -38,7 +38,6 @@
<mandatory v="true" />
<state>EDITABLE</state>
<displayValueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValueChange.js</onValueChange>
<onValidation>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValidation.js</onValidation>
</entityField>
<entityField>
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValueChange.js b/entity/CampaignAddParticipants_entity/entityfields/campaignstep_id/onValueChange.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index 432e1d4f798b4c2928c0e37cc9b506016699886f..5bd52372fc9092d7c687468678d14cc533dee974 100644
--- a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
+++ b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>CampaignAnalysis_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignAnalysis_entity/documentation.adoc</documentation>
@@ -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>
diff --git a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
index 58a579ab19e9eb374abf7a186b1d33602d0b5407..07c1ff71b49728c347e49070a488a4496078b7e1 100644
--- a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
+++ b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>CampaignCostChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignCostChart_entity/documentation.adoc</documentation>
@@ -34,14 +34,6 @@
<entityProvider>
<name>CostChart</name>
<documentation>%aditoprj%/entity/CampaignCostChart_entity/entityfields/costchart/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>e519262b-ff42-4c26-9d28-4d9566eafcdc</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignCostsChart</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index 9016cfd74c6a4c08c3db2342593a2499338aaba3..e7262dec3c778502423d0504d3883c71b20b440a 100644
--- a/entity/CampaignCost_entity/CampaignCost_entity.aod
+++ b/entity/CampaignCost_entity/CampaignCost_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>CampaignCost_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignCost_entity/documentation.adoc</documentation>
@@ -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>
@@ -111,20 +103,6 @@
<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>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignStepCosts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>CampaignStepId_param</name>
diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
index 5e514a302a5165452ac0cb7ee1c1b4fd1448a141..f33503df3822931e371d355c60e76cb1cff04518 100644
--- a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
+++ b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>CampaignParticipantChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/CampaignParticipantChart_entity/documentation.adoc</documentation>
@@ -17,14 +17,6 @@
<entityProvider>
<name>ParticipantChart</name>
<documentation>%aditoprj%/entity/CampaignParticipantChart_entity/entityfields/participantchart/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>59e7c7ff-a649-4efe-89dd-8fdb7967261b</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignParticipantsChart</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 3466c72ea7263175fbc96f5b59d15e44b6e13336..b32ed04cf46fd53a43f0bdd72acdf1c67b9e2731 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>CampaignParticipant_entity</name>
<title>Participant</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -21,20 +21,6 @@
<name>CampaignParticipantsProvider</name>
<documentation>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignparticipantsprovider/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>f28945cd-4613-4dfa-91f7-a7d9d64cef58</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignParticipants</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7ad08378-b36f-4512-8891-db727c6ddcd7</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignParticipantsConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
diff --git a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
index 33c4b451adff6a01240d01795313d03eda9a0dac..b36112d302c6b7f1ebf1f853393f752060e4a4a8 100644
--- a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
+++ b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>CampaignPlanning_entity</name>
<title>Campaign Planning</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index d9410b850932e600100722bd78a93da2c73b709c..c090c20d4ce316c83921200df4a54073f2135724 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>CampaignStep_entity</name>
<title>Campaign Step</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -20,20 +20,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>13f82959-7e04-449f-a657-c34f6b97f3be</name>
- <entityName>Object_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ae4ec215-b2a0-4b19-b4f5-ca2410439421</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CAMPAIGNSTEPID</name>
@@ -132,44 +118,6 @@
<name>CampaignSteps</name>
<documentation>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignsteps/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>421e6cc2-f874-4834-b022-fe1b253d50af</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7f1c046b-0e8f-429e-a0a6-3322382c61d4</name>
- <entityName>CampaignParticipant_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>eedc7b17-af98-4ffb-b527-97835cf8f903</name>
- <entityName>CampaignAddParticipants_entity</entityName>
- <fieldName>CampaignStepConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ad4ee503-95b9-4add-a0ef-e833db008349</name>
- <entityName>CampaignCost_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3fde1e51-cc4c-4727-b4e7-fd30bed1ee04</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignStepsReadonly</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>db1a63f3-753b-423d-9ab9-db3d03315dc6</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignStepsConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>campaignId_param</name>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index a7d5b31ea8b7b7d5f57bfe49ba6b3aafdef8a982..7e0c6abd260e50c2900bb4da742fbf585ee67fe4 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Campaign_entity</name>
<title>Campaign</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -46,20 +46,6 @@
</entityActionGroup>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>8db36fa6-e799-488c-882f-1141f781c9dc</name>
- <entityName>Object_entity</entityName>
- <fieldName>Campaigns</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ccbac0b6-9708-4afe-9676-1c6aa913463c</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Campaigns</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CAMPAIGNID</name>
@@ -170,38 +156,6 @@
<name>Campaigns</name>
<documentation>%aditoprj%/entity/Campaign_entity/entityfields/campaigns/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7cb37ad1-a0a9-41bc-9a9e-7207317cd812</name>
- <entityName>CampaignParticipant_entity</entityName>
- <fieldName>CampaignsConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>918b744c-4bd5-4ae0-9a09-5ecf1927b8f6</name>
- <entityName>CampaignAddParticipants_entity</entityName>
- <fieldName>CampaignConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>d238b02c-75e7-4cf4-b90c-bb36d41ae90f</name>
- <entityName>CampaignCost_entity</entityName>
- <fieldName>Campaigns</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>92ec68f6-2ff5-4f15-9001-6297a6d5790d</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3cc06d94-0274-49be-8d1b-7a5f2a3a689e</name>
- <entityName>Person_entity</entityName>
- <fieldName>Campaigns</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>CampaignParticipants</name>
diff --git a/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod b/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod
index e8509f21372a4aa38500c5264870ceeb330a1e44..d338522fd916a7f3cdba56ca7c02c4dcebd5b9e5 100644
--- a/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod
+++ b/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ChecklistEntryValue_entity</name>
<title>Checklist entries</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -58,20 +58,6 @@
<entityProvider>
<name>ChecklistEntryValues</name>
<titlePlural>Checklist entries</titlePlural>
- <dependencies>
- <entityDependency>
- <name>7eae9b1e-cea7-4688-898a-754dba82eac7</name>
- <entityName>ChecklistEntry_entity</entityName>
- <fieldName>ChecklistEntryValues</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>d4bddebc-b38b-46dc-8bb8-5ffa4fbdf627</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>ChecklistEntryValues</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
@@ -85,7 +71,7 @@
<name>setCompleted</name>
<onActionProcess>%aditoprj%/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/children/setcompleted/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>NEON:MQL</iconId>
<titleProcess>%aditoprj%/entity/ChecklistEntryValue_entity/entityfields/setchecklistentrycompleted/children/setcompleted/titleProcess.js</titleProcess>
</entityActionField>
diff --git a/entity/ChecklistEntry_entity/ChecklistEntry_entity.aod b/entity/ChecklistEntry_entity/ChecklistEntry_entity.aod
index d484cdac8c4b5700221c38e0fcff424c2615bd85..bbc1bc5a7bf7a97678f2639a3d5b8788c2842f34 100644
--- a/entity/ChecklistEntry_entity/ChecklistEntry_entity.aod
+++ b/entity/ChecklistEntry_entity/ChecklistEntry_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ChecklistEntry_entity</name>
<title>Checklist entries</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -52,20 +52,6 @@
</entityField>
<entityProvider>
<name>ChecklistEntries</name>
- <dependencies>
- <entityDependency>
- <name>84d5df6b-1aff-4ab2-88a5-fd3b591916ce</name>
- <entityName>Checklist_entity</entityName>
- <fieldName>ChecklistEntries</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9134e842-dac3-4f09-9e03-f71827b15fcf</name>
- <entityName>SalesprojectPhaseDefinition_entity</entityName>
- <fieldName>ChecklistEntries</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CHECKLIST_ID</name>
diff --git a/entity/Checklist_entity/Checklist_entity.aod b/entity/Checklist_entity/Checklist_entity.aod
index 5addd3e3f03439f55e3a892ba55ca4c86552b2d3..fab6c2cd44a9a57f68bb543ed3e3e9f1989d13ec 100644
--- a/entity/Checklist_entity/Checklist_entity.aod
+++ b/entity/Checklist_entity/Checklist_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Checklist_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>NEON:MQC</icon>
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index b5da465e7f2fe2b3bf84cedd8d80d22a9e991a62..264b4d4233d334aba1e1cad403bb530adb8fa557 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ClassificationAdmin_entity</name>
<title>Classification</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
index 81876c26e624810fd02f57d640df8fbc10bcc132..2ade3b1f9769f8a6a7f4186dd483bc7cc2a158b1 100644
--- a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
+++ b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ClassificationGrading_entity</name>
<title>Grading</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -30,14 +30,6 @@
<entityProvider>
<name>ClassificationGradings</name>
<documentation>%aditoprj%/entity/ClassificationGrading_entity/entityfields/classificationgradings/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>e0c6b86e-dcc1-43e1-9581-2b10c5c3d0cd</name>
- <entityName>ClassificationGroup_entity</entityName>
- <fieldName>ClassificationGradings</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ClassificationTypeId_param</name>
diff --git a/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod b/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
index 68724063ba34834853391bc581552e49765003cb..82f3b1f94c0b96e18502caae219c2ea4f3ed31b9 100644
--- a/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
+++ b/entity/ClassificationGroup_entity/ClassificationGroup_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ClassificationGroup_entity</name>
<title>Classification</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index e90b0af702c203f25071d8a982bdc4e2d4a927d0..55ab29ac71f190b584f6ab2bd5acbfedbabd506a 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ClassificationScore_entity</name>
<title>Possible Value</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index 749feeedc36f37bc816ada37def0bd46b14aabaf..8284348cbdf37deead1514999be24c60ebbf2c9a 100644
--- a/entity/ClassificationType_entity/ClassificationType_entity.aod
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ClassificationType_entity</name>
<title>Indicator</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -9,14 +9,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>908ca339-4dca-41c6-a32b-472617e1742e</name>
- <entityName>ClassificationGroup_entity</entityName>
- <fieldName>ClassificationGroups</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CLASSIFICATIONTYPEID</name>
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index e12475949f9f1680936642c87819779ca78616db..086574ccbc525b4f8066a4b49a5c35ace1bb1b11 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Classification_entity</name>
<title>Classification</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -42,20 +42,6 @@
<entityProvider>
<name>Classifications</name>
<documentation>%aditoprj%/entity/Classification_entity/entityfields/classifications/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>6274acfa-3dbf-4a9b-8926-2a2d1ff80d6d</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Classifications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ed17d4ca-1bdd-45b2-8a38-d7a73b1669e7</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Classifications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CLASSIFICATIONTYPEID</name>
diff --git a/entity/CommRestriction_Entity/CommRestriction_Entity.aod b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
index c685eb6e0ca3b9b24ddb01a5f44edd9bc6ba3389..d7cc3907cb56979a3e108b0b136c292a37d4c3ef 100644
--- a/entity/CommRestriction_Entity/CommRestriction_Entity.aod
+++ b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>CommRestriction_Entity</name>
<title>Advertising ban</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/CommunicationChannel_entity/CommunicationChannel_entity.aod b/entity/CommunicationChannel_entity/CommunicationChannel_entity.aod
index 1ad20c2a04f2e19d21325dbc1628c55e6589771b..76d1239d442f3e976babdcdab7e70d1d9e6a4bf8 100644
--- a/entity/CommunicationChannel_entity/CommunicationChannel_entity.aod
+++ b/entity/CommunicationChannel_entity/CommunicationChannel_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>CommunicationChannel_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityFields>
@@ -49,14 +49,6 @@
<entityProvider>
<name>ContactCommunicationChannels</name>
<targetConsumerProcess>%aditoprj%/entity/CommunicationChannel_entity/entityfields/contactcommunicationchannels/targetConsumerProcess.js</targetConsumerProcess>
- <dependencies>
- <entityDependency>
- <name>a1ac784e-a932-48a5-9aa5-285f8c9ad483</name>
- <entityName>CommunicationSettings_entity</entityName>
- <fieldName>CommunicationChannels</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>CommunicationChannelType_param</name>
diff --git a/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod b/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
index 3c3d5fcfcec9ea062aa7822673fa8ec2743e9341..cfa279a1e8bbf1102d6d88912f029d8d85f6ef06 100644
--- a/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
+++ b/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>CommunicationSettings_entity</name>
<title>Communication Settings</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -18,20 +18,6 @@
</entityProvider>
<entityProvider>
<name>SettingsForContact</name>
- <dependencies>
- <entityDependency>
- <name>811c8c4c-20f8-4e20-9ae3-9aa7ae5e1dc0</name>
- <entityName>Person_entity</entityName>
- <fieldName>ContactCommunicationSettings</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f94ce98a-46e1-4666-a7ef-2685baa3fcae</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>ContactCommunicationSettings</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>COMMUNICATIONSETTINGSID</name>
@@ -173,7 +159,7 @@
</entityParameter>
<entityParameter>
<name>CommunicationCategory_param</name>
- <valueProcess>%aditoprj%/entity/CommunicationSettings_entity/entityfields/communicationchannels/children/communicationmedium_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/CommunicationSettings_entity/entityfields/communicationchannels/children/communicationcategory_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -261,7 +247,7 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>MEDIUM.displayValue</name>
- <expression>%aditoprj%/entity/CommunicationSettings_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js</expression>
+ <expression>%aditoprj%/entity/CommunicationSettings_entity/recordcontainers/db/recordfieldmappings/medium.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.displayValue</name>
diff --git a/entity/CommunicationSettings_entity/entityfields/communicationchannels/children/communicationmedium_param/valueProcess.js b/entity/CommunicationSettings_entity/entityfields/communicationchannels/children/communicationcategory_param/valueProcess.js
similarity index 100%
rename from entity/CommunicationSettings_entity/entityfields/communicationchannels/children/communicationmedium_param/valueProcess.js
rename to entity/CommunicationSettings_entity/entityfields/communicationchannels/children/communicationcategory_param/valueProcess.js
diff --git a/entity/CommunicationSettings_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js b/entity/CommunicationSettings_entity/recordcontainers/db/recordfieldmappings/medium.displayvalue/expression.js
similarity index 100%
rename from entity/CommunicationSettings_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js
rename to entity/CommunicationSettings_entity/recordcontainers/db/recordfieldmappings/medium.displayvalue/expression.js
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index d05064079162def233cf42c06700e32a33ee3914..237914cda02baf58e0aec615e1cbb426de7f8bfc 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Communication_entity</name>
<title>Communication</title>
<description>former Comm</description>
@@ -65,38 +65,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>AllCommunications</name>
<documentation>%aditoprj%/entity/Communication_entity/entityfields/allcommunications/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>070b2457-3766-4c8a-b43f-a2bf7c9ef638</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Communications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>22dd8c4d-2081-4547-adbd-929868f23069</name>
- <entityName>Person_entity</entityName>
- <fieldName>Communications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a22c32e2-6d76-4e79-8c71-251ee381b22e</name>
- <entityName>Contact_entity</entityName>
- <fieldName>Communications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>cbf1d4ab-b3c3-4571-907e-687d1b931134</name>
- <entityName>DSGVO_entity</entityName>
- <fieldName>Communications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8266f568-f15d-42c5-8ba3-5254fed7fd99</name>
- <entityName>CommunicationChannel_entity</entityName>
- <fieldName>Communications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>CommCategory_param</name>
@@ -123,20 +91,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>PhoneCommunications</name>
<documentation>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7382242a-aa18-4a31-ab77-69a79f2b97b8</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>PhoneCommunications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0eed17a6-443e-4469-a53b-3ce81440d7d0</name>
- <entityName>Person_entity</entityName>
- <fieldName>PhoneCommunications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>CommCategory_param</name>
@@ -165,32 +119,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>EmailCommunications</name>
<documentation>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>ecfbf518-fe92-4661-8ebe-e2d3c8d259e1</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>EmailCommunications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f8cc4865-ab08-4540-bd02-2b2c92946c84</name>
- <entityName>Person_entity</entityName>
- <fieldName>EmailCommunications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b5ebddec-002b-40a5-a760-cedb78e94cfb</name>
- <entityName>Email_entity</entityName>
- <fieldName>EmailAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>eccb5046-7490-4059-903f-40b7d42ebfda</name>
- <entityName>BulkMailRecipient_entity</entityName>
- <fieldName>EmailAdresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>CommCategory_param</name>
@@ -272,14 +200,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityProvider>
<name>QuickEntryCommunications</name>
<documentation>%aditoprj%/entity/Communication_entity/entityfields/quickentrycommunications/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>85bc11c4-7226-4b3e-82cb-947dfb05a972</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>Communications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>AdditionalContactIds_param</name>
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index 7c7f311b945078d8803fe0682ce7979c6a7c3eae..1fe54675aa10cb72973ac960741e10c8df5772c8 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Competition_entity</name>
<title>Competition</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -270,14 +270,6 @@
<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>
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 76d2877c06a3cab9ccd4c6805e41709ab6115b5f..7918197fb38dbffc8367cdd5f9bab3fd14ab0a21 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Contact_entity</name>
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -17,14 +17,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>ccbf2270-c30c-458e-8a99-bf0cdcc89689</name>
- <entityName>Object_entity</entityName>
- <fieldName>Persons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CONTACTID</name>
@@ -87,14 +79,6 @@
<name>PersonRelated</name>
<targetContextField>targetContext</targetContextField>
<targetIdField>CONTACTID</targetIdField>
- <dependencies>
- <entityDependency>
- <name>14975dad-907c-4f8c-bd39-243508ede721</name>
- <entityName>PrivatePerson_entity</entityName>
- <fieldName>Persons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>OwnContactId_param</name>
@@ -164,14 +148,6 @@
<targetContextField>targetContext</targetContextField>
<targetIdField>CONTACTID</targetIdField>
<titlePlural>Other Contactroles</titlePlural>
- <dependencies>
- <entityDependency>
- <name>34cc85f4-5555-4631-94fc-f3ad35b7ce7e</name>
- <entityName>Person_entity</entityName>
- <fieldName>OtherContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>PersonId_param</name>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 96796bb96d331a2252b3414e454833e28b1c5732..6d18b16f96f93824f71f228cbbfcf1eb0909da37 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Context_entity</name>
<title>Private person</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -11,14 +11,6 @@
<entityProvider>
<name>#PROVIDER</name>
<recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>37559258-24f1-4c8c-b462-23ddf8de4e1e</name>
- <entityName>AppointmentLink_entity</entityName>
- <fieldName>Context</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
@@ -30,32 +22,6 @@
</entityField>
<entityProvider>
<name>Context</name>
- <dependencies>
- <entityDependency>
- <name>dab09827-2eeb-403d-a070-ba805d2640ee</name>
- <entityName>ObjectRelationType_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>209539e0-15ad-47eb-9175-a3aaa5af13fc</name>
- <entityName>Forecast_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8183e19e-c8cc-45d8-9763-417eaeffb940</name>
- <entityName>Competition_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4543a0ae-7bd2-4c70-8eaf-d4f32e014173</name>
- <entityName>Member_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>InvertBlacklist_param</name>
@@ -74,14 +40,6 @@
</entityParameter>
<entityProvider>
<name>ActivityLinkable</name>
- <dependencies>
- <entityDependency>
- <name>de50f67e-5ed0-46aa-b007-8c086cf5fea5</name>
- <entityName>ActivityLink_entity</entityName>
- <fieldName>Context</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -92,14 +50,6 @@
</entityProvider>
<entityProvider>
<name>TaskLinkable</name>
- <dependencies>
- <entityDependency>
- <name>ff8925da-b69a-46dd-8fe2-d6707da8808e</name>
- <entityName>TaskLink_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Blacklist_param</name>
@@ -116,67 +66,9 @@
</entityParameter>
<entityProvider>
<name>Exclusive</name>
- <dependencies>
- <entityDependency>
- <name>2fb3e0df-0372-4ba4-acde-210432517ee8</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>66a69b09-d02a-4de6-a2dd-d11ce1467e01</name>
- <entityName>Order_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b48df8c7-9d56-40f2-8269-b749afc92af5</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9ad799f1-6303-4119-9bea-8e559850541b</name>
- <entityName>AttributeUsage_entity</entityName>
- <fieldName>Context</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>59cdaa2b-41c3-4b04-bcf3-7a5bc0843361</name>
- <entityName>WorkflowStartConfig_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>591679c2-8fd3-4d05-9ef3-b648373785f7</name>
- <entityName>WorkflowSignal_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f69007c7-d495-42d2-9a12-6426c24771a4</name>
- <entityName>Observation_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>ContextTemplatePlaceOfUse</name>
- <dependencies>
- <entityDependency>
- <name>423a7a33-02f4-4975-94fd-fa0c21278e3b</name>
- <entityName>DocumentTemplatePlaceOfUse_entity</entityName>
- <fieldName>ContextDocumentTemplatePlaceOfUse</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>26628738-c954-4bf5-8c1f-cbc008d73056</name>
- <entityName>ExportTemplatePlaceOfUse_entity</entityName>
- <fieldName>ContextExportTemplatePlaceOfUse</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>InvertBlacklist_param</name>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 17188557992b6635707670714e196db76e18d033..65416c1c51760e0852b8a9bc26881b2c37213c02 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Contract_entity</name>
<title>Contract</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -125,20 +125,6 @@
<name>Contracts</name>
<documentation>%aditoprj%/entity/Contract_entity/entityfields/contracts/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>6d7c7166-84b4-4da2-9a48-cc1e390ac987</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Contracts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3698fe59-fd02-427b-8c95-a90c7d8036e5</name>
- <entityName>Person_entity</entityName>
- <fieldName>Contracts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -201,20 +187,6 @@
<entityProvider>
<name>#PROVIDER</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7d8f586a-3ee0-47e8-b328-3b624cf4abfa</name>
- <entityName>Object_entity</entityName>
- <fieldName>Contracts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9b6c0b15-b252-49bf-a5b5-f7f74f984a9c</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Contracts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CONTACT_ORG_ID</name>
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index dd854efc611530e48d5e2dd0b2442754701db8fc..1b89d6d86e1aa5af1b8baec1c7ba1ede4f8286e2 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Countries_Entity</name>
<title>Countries</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -16,20 +16,6 @@
<name>ISO2Name</name>
<lookupIdfield>ISO2</lookupIdfield>
<documentation>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
- <entityName>Address_entity</entityName>
- <fieldName>Countries</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8e8d1ace-3cbb-4ed7-b029-f486805605ef</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Countries</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Key_param</name>
diff --git a/entity/CovidCasesData_entity/CovidCasesData_entity.aod b/entity/CovidCasesData_entity/CovidCasesData_entity.aod
index dd76a30e26d1c5389a4466df97dad0954cccdd69..f06f4c4eddb742ea94c252214a29ef9f4160d30f 100644
--- a/entity/CovidCasesData_entity/CovidCasesData_entity.aod
+++ b/entity/CovidCasesData_entity/CovidCasesData_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>CovidCasesData_entity</name>
<description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/DSGVOConfigurationAttribute_entity/DSGVOConfigurationAttribute_entity.aod b/entity/DSGVOConfigurationAttribute_entity/DSGVOConfigurationAttribute_entity.aod
index b9124ce356f046cabb41c785bba831062c024234..51a8dfdf877d62359a7519082af3ef1771bd4b2b 100644
--- a/entity/DSGVOConfigurationAttribute_entity/DSGVOConfigurationAttribute_entity.aod
+++ b/entity/DSGVOConfigurationAttribute_entity/DSGVOConfigurationAttribute_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DSGVOConfigurationAttribute_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DSGVOConfigurationAttribute_entity/documentation.adoc</documentation>
@@ -31,14 +31,6 @@
</entityField>
<entityProvider>
<name>DSGVOAttributeConfig</name>
- <dependencies>
- <entityDependency>
- <name>96e9f7e0-1f47-47d5-beee-0e28b3e203e1</name>
- <entityName>DSGVOConfiguration_entity</entityName>
- <fieldName>DSGVOConfigurationAttributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityActionGroup>
<name>FilterActions</name>
@@ -50,7 +42,7 @@
<title>change DSGVO Relevance</title>
<onActionProcess>%aditoprj%/entity/DSGVOConfigurationAttribute_entity/entityfields/filteractions/children/changedsgvorelevance/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
</entityActionField>
</children>
</entityActionGroup>
diff --git a/entity/DSGVOConfiguration_entity/DSGVOConfiguration_entity.aod b/entity/DSGVOConfiguration_entity/DSGVOConfiguration_entity.aod
index 5336dde6e7664ffbc2df7cb8f90be75f87ac4239..1c47b5724dc3c8f7237c539f8296e3c30159ce20 100644
--- a/entity/DSGVOConfiguration_entity/DSGVOConfiguration_entity.aod
+++ b/entity/DSGVOConfiguration_entity/DSGVOConfiguration_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DSGVOConfiguration_entity</name>
<title>DSGVO Configuration</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -102,7 +102,7 @@
<title>Open Contacts</title>
<onActionProcess>%aditoprj%/entity/DSGVOConfiguration_entity/entityfields/opencontacts/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
- <isSelectionAction v="false" />
+ <selectionType>UNBOUND</selectionType>
<iconId>VAADIN:USERS</iconId>
</entityActionField>
<entityConsumer>
diff --git a/entity/DSGVODeleteFlag_entity/DSGVODeleteFlag_entity.aod b/entity/DSGVODeleteFlag_entity/DSGVODeleteFlag_entity.aod
index 2689a96d7cdbfef9a422fdc07b7c5f5012c8fb47..e34d12654bb418fb3469e8cacf2f20859af55ed6 100644
--- a/entity/DSGVODeleteFlag_entity/DSGVODeleteFlag_entity.aod
+++ b/entity/DSGVODeleteFlag_entity/DSGVODeleteFlag_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DSGVODeleteFlag_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DSGVODeleteFlag_entity/documentation.adoc</documentation>
@@ -44,14 +44,6 @@
</entityField>
<entityProvider>
<name>DSGVODeleteFlags</name>
- <dependencies>
- <entityDependency>
- <name>94915ca8-aca8-457a-ac12-05408ba8ab37</name>
- <entityName>Person_entity</entityName>
- <fieldName>DSGVODeleteFlags</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>ContactId_param</name>
diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
index 674803b125b89af582baac331f6db7261ae087f6..215011e99f00fa3dd29bc2e9cc731a7771bffb26 100644
--- a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
+++ b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DSGVOInfo_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DSGVOInfo_entity/documentation.adoc</documentation>
diff --git a/entity/DSGVOReport_entity/DSGVOReport_entity.aod b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
index b3482dff7d057f512eef04d6dfe882eba55cfe24..df5b97c20fe7874e0a508873ee90f74eb14b6e71 100644
--- a/entity/DSGVOReport_entity/DSGVOReport_entity.aod
+++ b/entity/DSGVOReport_entity/DSGVOReport_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DSGVOReport_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DSGVOReport_entity/documentation.adoc</documentation>
diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index 1e6d35b7292ed57e384ff29bf2687f5bf70387fd..58c2e8479495c7e71e3580084e7b520d5f4438e2 100644
--- a/entity/DSGVO_entity/DSGVO_entity.aod
+++ b/entity/DSGVO_entity/DSGVO_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DSGVO_entity</name>
<title>Data Privacy</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -18,14 +18,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>848916ba-482b-4e53-ac22-48ee6fbf2b64</name>
- <entityName>Person_entity</entityName>
- <fieldName>DSGVOEntries</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
@@ -176,7 +168,7 @@
<onActionProcess>%aditoprj%/entity/DSGVO_entity/entityfields/dsgvoactions/children/anonymperson/onActionProcess.js</onActionProcess>
<actionOrder v="0" />
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:ASTERISK</iconId>
<state>INVISIBLE</state>
</entityActionField>
diff --git a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
index a5e20a92430010b0dc20174dabb6df69d5fbe5c2..75ad6975d070c255295d1e8469372a6cfd11cf50 100644
--- a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
+++ b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DefaultAdminView_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DefaultAdminView_entity/documentation.adoc</documentation>
diff --git a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
index 858fe5c982aebdceca1d11bf68ab048984c8b6f2..fc6a33e2c950d08639f13789b31f1da0f784acdc 100644
--- a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
+++ b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DescriptionTranslation_entity</name>
<title>Description</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -64,14 +64,6 @@
</entityParameter>
<entityProvider>
<name>DescriptionTranslations</name>
- <dependencies>
- <entityDependency>
- <name>72298519-6028-4d4b-9ef6-3227fb065bb8</name>
- <entityName>Product_entity</entityName>
- <fieldName>DescriptionTranslations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/DistrictContact_entity/DistrictContact_entity.aod b/entity/DistrictContact_entity/DistrictContact_entity.aod
index a8f9c248146913e119e15a9e5eafd0f9eaa113da..49da7262c12ca4cc54951a216148a333d740a940 100644
--- a/entity/DistrictContact_entity/DistrictContact_entity.aod
+++ b/entity/DistrictContact_entity/DistrictContact_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DistrictContact_entity</name>
<title>District Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -164,20 +164,6 @@
</entityConsumer>
<entityProvider>
<name>DistrictContacts</name>
- <dependencies>
- <entityDependency>
- <name>6a15b92f-e0b6-459d-a106-615dcfac3dbd</name>
- <entityName>District_entity</entityName>
- <fieldName>DistrictContactUIDs</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e33ae6f8-0a21-406c-950a-ab60f27026b3</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>DistrictContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>DistrictId_param</name>
@@ -202,7 +188,7 @@
<name>setActive</name>
<title>Set active</title>
<onActionProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/setstatus/children/setactive/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:THUMBS_UP</iconId>
<tooltip>Set status to active</tooltip>
</entityActionField>
@@ -210,7 +196,7 @@
<name>setInactive</name>
<title>Set inactive</title>
<onActionProcess>%aditoprj%/entity/DistrictContact_entity/entityfields/setstatus/children/setinactive/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:THUMBS_DOWN</iconId>
<tooltip>Set status to inactive</tooltip>
</entityActionField>
diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index 199213fe56c0a805961dce132a36b4a23269795f..8cf24770c4954fe246be69d6d537c610f0246817 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DistrictResponsible_entity</name>
<title>District Responsible</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -63,14 +63,6 @@
<name>DistrictResponsibles</name>
<documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/districtresponsibles/documentation.adoc</documentation>
<titlePlural>Responsibles</titlePlural>
- <dependencies>
- <entityDependency>
- <name>ae1dcbbe-b302-44df-ab4c-f7937d197cd5</name>
- <entityName>District_entity</entityName>
- <fieldName>DistrictResponsibleUIDs</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>DistrictId_param</name>
@@ -124,20 +116,6 @@
<targetContextField>targetContext</targetContextField>
<targetIdField>EMPLOYEE_CONTACT_ID</targetIdField>
<documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/organisationresponsibles/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>9c2fe0da-9456-44ef-ac6c-28ac234b35f7</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>DistrictResponsibles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2b3318a3-4925-4aa8-bf6e-bc5489549327</name>
- <entityName>Person_entity</entityName>
- <fieldName>DistrictResponsibles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>DistrictId_param</name>
@@ -250,14 +228,6 @@
<entityProvider>
<name>DistrictResponsibleAdvisers</name>
<lookupIdfield>EMPLOYEE_CONTACT_ID</lookupIdfield>
- <dependencies>
- <entityDependency>
- <name>ac067a2d-e313-44b7-b219-f834ef4a7629</name>
- <entityName>DistrictContact_entity</entityName>
- <fieldName>Advisers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
</entityFields>
<recordContainers>
diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
index a195aacda5cdca59724adce2e23bd420598082f2..66c1873901ec47942b117e46ddd71905aabe4264 100644
--- a/entity/District_entity/District_entity.aod
+++ b/entity/District_entity/District_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>District_entity</name>
<title>District definition</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -84,14 +84,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>
@@ -226,14 +218,6 @@
<entityProvider>
<name>ValidParentDistricts</name>
<documentation>%aditoprj%/entity/District_entity/entityfields/validparentdistricts/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>8b0738a4-e4cd-4f9e-8df1-f499046c81bf</name>
- <entityName>District_entity</entityName>
- <fieldName>ParentDistricts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>DistrictsByContactId_param</name>
@@ -285,14 +269,6 @@
</entityActionGroup>
<entityProvider>
<name>DistrictContacts</name>
- <dependencies>
- <entityDependency>
- <name>d94c353f-c66d-489c-934b-72ca154ba37a</name>
- <entityName>DistrictContact_entity</entityName>
- <fieldName>Districts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>DistrictsByContactId_param</name>
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index 843d06ed290041280f020427f11738ff3dbe06d9..f113a88dd1d4953783869d6ed0748ad6e1d9d928 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DocumentTemplateLink_entity</name>
<title>Attachment</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -69,14 +69,6 @@
<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>
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
index 4ac6764a9d7f53074eb326f85cd32142258de9d6..e8e7b3f14a3f708c88dc66926e7f1baee2a65cf0 100644
--- a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
+++ b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DocumentTemplatePlaceOfUse_entity</name>
<title>Documenttemplate Place Of Use</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -48,14 +48,6 @@
<entityProvider>
<name>DocumentTemplatePlaceOfUse</name>
<documentation>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>bc05b556-ecca-478c-9a92-b77e4d98d6f3</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplatePlaceOfUse</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>DocumentTemplatePlaceOfUse_param</name>
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index cd4ef60ae543ee6cb2407d59bf510f368cb64f66..245ea52fe1173ad92b2cf87fec7e2a810745f209 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DocumentTemplateTypeCategory_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/documentation.adoc</documentation>
@@ -32,14 +32,6 @@
<lookupIdfield>KEYID</lookupIdfield>
<documentation>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/entityfields/bycategory/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>5eb6b17c-8c13-48df-84d5-a949b7d21cf3</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateTypeCategory</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>usageFilter_param</name>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 30e957717bd688d4b60b8b624272000b4935b5a3..59d3e3d3a79dcc35163280358c4eb6a06246b895 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DocumentTemplate_entity</name>
<title>Document Template</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -16,20 +16,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>5cc2e566-309c-4b47-84f3-52376e919b9b</name>
- <entityName>Email_entity</entityName>
- <fieldName>DocumentTemplates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>aa0b6a21-d458-4723-b1d8-526324024662</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>DocumentTemplates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>DATE_EDIT</name>
@@ -196,14 +182,6 @@
<documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attachments/documentation.adoc</documentation>
<titlePlural>Attachments</titlePlural>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>856e3435-a173-4cf5-8e81-3f884f8238d3</name>
- <entityName>DocumentTemplateLink_entity</entityName>
- <fieldName>Attachments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>Links</name>
@@ -234,50 +212,6 @@
<entityProvider>
<name>DocumentTemplateProvider</name>
<documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>9c10883d-eb73-4587-b758-693a66367a4c</name>
- <entityName>Offer_entity</entityName>
- <fieldName>DocumentTemplateTexHeader</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>67f64ed9-bc92-41ba-a040-671a12b7a5f3</name>
- <entityName>Offer_entity</entityName>
- <fieldName>DocumentTemplateTexFooter</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>57f408e3-aeb7-4006-a20d-287dae1f0922</name>
- <entityName>Letter_entity</entityName>
- <fieldName>DocumentTemplates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>233d356c-c81b-41e6-8489-440ca8c81dfa</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>Templates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>196500d7-0b87-4f99-94f8-2e4966e38104</name>
- <entityName>SerialLetter_entity</entityName>
- <fieldName>Templates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>93242043-ddc2-414e-84c8-610342b0bd85</name>
- <entityName>Order_entity</entityName>
- <fieldName>DocumentTemplateTexHeader</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>62dc5f05-4203-40b3-9d34-cbbefc8264ae</name>
- <entityName>Order_entity</entityName>
- <fieldName>DocumentTemplateTexFooter</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ComingFrom_param</name>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 59a71017299588752f9f8091e7c54f78059ce7cc..e0f413cd2ffd2a3818b17ec680c34b16ce528adf 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Document_entity</name>
<title>Document</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -14,14 +14,6 @@
<entityProvider>
<name>#PROVIDER</name>
<recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>6bbed1fb-7f22-420d-988e-7f9413c0b294</name>
- <entityName>Task_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>NAME</name>
@@ -128,104 +120,6 @@
<name>Documents</name>
<documentation>%aditoprj%/entity/Document_entity/entityfields/documents/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>1eae1907-53ea-4d6f-bcf1-772052365020</name>
- <entityName>Activity_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e4f23cab-a238-4123-8f96-1e09b9da3cb7</name>
- <entityName>Contract_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8867e012-ed4e-4c34-9c1f-402acf910190</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>af4d109a-9265-4119-926e-b1fef4b3a2b3</name>
- <entityName>Order_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>92765669-c236-44c1-bacf-6d1aef7c1433</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0d8ec167-6db1-4a8b-b1d5-8cba3f050bca</name>
- <entityName>Person_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>31a82406-7a61-49d9-b75b-731040614ecb</name>
- <entityName>Product_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>35ebe1f6-b2a2-4659-8b50-afdbe37269de</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>abd400df-a5a4-4750-b3a4-0476b2721161</name>
- <entityName>Employee_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e326d4f9-40fd-42c8-88d6-0c5cefc6fa71</name>
- <entityName>Task_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7a20bd0f-9b1f-4a2b-a823-dbd4220613ca</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6ba908f0-e75f-4304-be79-18ed65fa609e</name>
- <entityName>Leadimport_entity</entityName>
- <fieldName>DocumentC</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>cea7ef62-e3fb-43af-8a11-952d809e8242</name>
- <entityName>LeadLog_entity</entityName>
- <fieldName>LogDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2e6fcf27-ee98-4f7d-a99d-7ce02774076b</name>
- <entityName>UserhelpResources_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b7b14281-6e78-4005-ad5b-14dffc4091f5</name>
- <entityName>District_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e6553781-e306-4335-a929-2c2a8ad8270f</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>AssignmentName_param</name>
@@ -250,50 +144,6 @@
<entityProvider>
<name>MainDocuments</name>
<recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>87d738a5-5d5e-425e-b013-007371475a38</name>
- <entityName>Activity_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>457fd01e-4197-4fca-8079-e2025295f89c</name>
- <entityName>Contract_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ff2d676c-7dd0-47ad-b7f2-ce35b0546e9f</name>
- <entityName>Offer_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>75c1875c-5cb6-4cae-8bc7-82c45a2934e5</name>
- <entityName>Order_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8366d11d-4c46-4410-b255-6d196229a534</name>
- <entityName>Product_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>dfd2ed28-212f-4135-8f0c-7772f17b6ee6</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>056f943d-2ad2-4359-9825-7b445f0267ff</name>
- <entityName>SupportTicket_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Keyword_param</name>
@@ -330,14 +180,6 @@
<entityProvider>
<name>SingleDocument</name>
<titlePlural>Document</titlePlural>
- <dependencies>
- <entityDependency>
- <name>91f87622-d0e8-43c6-99a0-5f9cebf79aaf</name>
- <entityName>SerialLetter_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>AssignmentName_param</name>
@@ -376,7 +218,7 @@
<onActionProcess>%aditoprj%/entity/Document_entity/entityfields/document_actions/children/openfileaction/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<isSaveAction v="false" />
<iconId>VAADIN:FOLDER_OPEN</iconId>
<state>AUTO</state>
@@ -387,7 +229,7 @@
<title>Download</title>
<onActionProcess>%aditoprj%/entity/Document_entity/entityfields/document_actions/children/downloadfilesaction/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:DOWNLOAD</iconId>
<state>EDITABLE</state>
</entityActionField>
@@ -397,7 +239,7 @@
<name>openSingleFileAction</name>
<title>${ACTION_DO_OPEN}</title>
<onActionProcess>%aditoprj%/entity/Document_entity/entityfields/opensinglefileaction/onActionProcess.js</onActionProcess>
- <isSelectionAction v="false" />
+ <selectionType>UNBOUND</selectionType>
<iconId>VAADIN:FOLDER_OPEN</iconId>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Document_entity/entityfields/opensinglefileaction/stateProcess.js</stateProcess>
diff --git a/entity/DuplicateOrganisation_entity/DuplicateOrganisation_entity.aod b/entity/DuplicateOrganisation_entity/DuplicateOrganisation_entity.aod
index e651b0227e3d342c20dea0aa3be489279800051e..bc20fd9bae6482a9cc37ed0359e09d93cad030a4 100644
--- a/entity/DuplicateOrganisation_entity/DuplicateOrganisation_entity.aod
+++ b/entity/DuplicateOrganisation_entity/DuplicateOrganisation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DuplicateOrganisation_entity</name>
<title>Duplicate</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -15,14 +15,6 @@
<name>#PROVIDER</name>
<targetContextField>targetContext</targetContextField>
<targetIdField>CONTACTID</targetIdField>
- <dependencies>
- <entityDependency>
- <name>a666bb24-2875-481a-879e-86b8e8517c1e</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Duplicates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -56,7 +48,7 @@
<title>${IGNORE_DUPLICATE}</title>
<onActionProcess>%aditoprj%/entity/DuplicateOrganisation_entity/entityfields/filteractions/children/ignoreduplicates/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:CLOSE</iconId>
<titleProcess>%aditoprj%/entity/DuplicateOrganisation_entity/entityfields/filteractions/children/ignoreduplicates/titleProcess.js</titleProcess>
</entityActionField>
@@ -64,14 +56,14 @@
<name>mergeselectedintocurrent</name>
<title>Integrate selected into current contact</title>
<onActionProcess>%aditoprj%/entity/DuplicateOrganisation_entity/entityfields/filteractions/children/mergeselectedintocurrent/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>NEON:IMPORT</iconId>
</entityActionField>
<entityActionField>
<name>mergecurrentintoselected</name>
<title>Integrate current into selected contact</title>
<onActionProcess>%aditoprj%/entity/DuplicateOrganisation_entity/entityfields/filteractions/children/mergecurrentintoselected/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>NEON:EXPORT</iconId>
</entityActionField>
</children>
diff --git a/entity/DuplicatePerson_entity/DuplicatePerson_entity.aod b/entity/DuplicatePerson_entity/DuplicatePerson_entity.aod
index 76bf7dd0ac61df8cf73e52f42f4473244b9f2d2a..09b341ca2b19374f703ac6008f1189d21904f091 100644
--- a/entity/DuplicatePerson_entity/DuplicatePerson_entity.aod
+++ b/entity/DuplicatePerson_entity/DuplicatePerson_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DuplicatePerson_entity</name>
<title>Duplicate</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -15,20 +15,6 @@
<name>#PROVIDER</name>
<targetContextField>parentContext</targetContextField>
<targetIdField>CONTACTID</targetIdField>
- <dependencies>
- <entityDependency>
- <name>7f8210c4-644f-4c45-a571-e232582f8d34</name>
- <entityName>Person_entity</entityName>
- <fieldName>Duplicates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>fd3253c7-f3f8-483f-8f49-6192f4e75979</name>
- <entityName>Person_entity</entityName>
- <fieldName>Duplicates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
@@ -48,7 +34,7 @@
<title>${IGNORE_DUPLICATE}</title>
<onActionProcess>%aditoprj%/entity/DuplicatePerson_entity/entityfields/filteractions/children/ignoreduplicates/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:CLOSE</iconId>
<titleProcess>%aditoprj%/entity/DuplicatePerson_entity/entityfields/filteractions/children/ignoreduplicates/titleProcess.js</titleProcess>
</entityActionField>
@@ -56,14 +42,14 @@
<name>mergeselectedintocurrent</name>
<title>Integrate selected into current contact</title>
<onActionProcess>%aditoprj%/entity/DuplicatePerson_entity/entityfields/filteractions/children/mergeselectedintocurrent/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>NEON:IMPORT</iconId>
</entityActionField>
<entityActionField>
<name>mergecurrentintoselected</name>
<title>Integrate current into selected contact</title>
<onActionProcess>%aditoprj%/entity/DuplicatePerson_entity/entityfields/filteractions/children/mergecurrentintoselected/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>NEON:EXPORT</iconId>
</entityActionField>
</children>
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index b94abcf3580c347872603d09949c5acf1e2a1f4e..2be26b094c838a7ca8d136ff7dbf35a491e48aa8 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>DuplicateScanner_entity</name>
<title>Duplicate Configuration</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -73,7 +73,7 @@
<title>Rebuild selected entries</title>
<onActionProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/filteractions/children/rebuild/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:CALC</iconId>
<tooltip>Rebuild all duplicates from the selected scanners</tooltip>
</entityActionField>
@@ -81,7 +81,7 @@
<name>viewDuplicates</name>
<title>View duplicates</title>
<onActionProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/filteractions/children/viewduplicates/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:TABLE</iconId>
<tooltip>View all duplicates from this scanner</tooltip>
</entityActionField>
@@ -97,6 +97,7 @@
<name>DBRecordContainer</name>
<onDBInsert>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js</onDBUpdate>
+ <onDBDelete>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBDelete.js</onDBDelete>
<alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 852de0f302412a156749687e8310926281b57465..bd561c52e2dd4dd40cd496fb8e680db3111c9433 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Email_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Email_entity/documentation.adoc</documentation>
@@ -7,14 +7,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>e7abc276-7adc-4928-8f5c-33d8ab6247e8</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Emails</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index 74475d9d45b11c221626176f114da280cd1c5fc4..6fb10f3d02565e19cd37628b7f3ce17bca88818f 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>EmployeeRole_entity</name>
<title>Role</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -26,14 +26,6 @@
<name>EmployeeRoles</name>
<targetContextField>TARGETCONTEXT</targetContextField>
<targetIdField>UID</targetIdField>
- <dependencies>
- <entityDependency>
- <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
- <entityName>Employee_entity</entityName>
- <fieldName>EmployeeRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>UserTitle_param</name>
diff --git a/entity/EmployeeToken_entity/EmployeeToken_entity.aod b/entity/EmployeeToken_entity/EmployeeToken_entity.aod
index 8f90eef25a348dc6043c261fb4611151ace8809e..7388aea9e48570a651b875896dc57cf53b3c787f 100644
--- a/entity/EmployeeToken_entity/EmployeeToken_entity.aod
+++ b/entity/EmployeeToken_entity/EmployeeToken_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>EmployeeToken_entity</name>
<title>User token</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -56,14 +56,6 @@
</entityField>
<entityProvider>
<name>EmployeeTokenProvider</name>
- <dependencies>
- <entityDependency>
- <name>08c3e88c-5119-477e-8374-3f89bbc4ded0</name>
- <entityName>Employee_entity</entityName>
- <fieldName>EmployeeTokens</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>employeeId_param</name>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index d5182766d6b8c6d1efd6963ce26fb9a64761077a..7d17b6b50c75771b55e83b9354cd0e843c011a0a 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Employee_entity</name>
<title>Employee</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -230,92 +230,6 @@
<name>Employees</name>
<lookupIdfield>CONTACT_ID</lookupIdfield>
<filterVariablesProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/filterVariablesProcess.js</filterVariablesProcess>
- <dependencies>
- <entityDependency>
- <name>0ca415b9-a940-424e-bee8-05c007b20659</name>
- <entityName>Activity_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>73f93f34-bfe9-48fd-b9ce-7f8ba46014c9</name>
- <entityName>Timetracking_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>02bacafb-433c-497d-8561-96c426da61e9</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>Employee</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>fefc05d2-6087-4600-bc77-80804654809e</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>1affaf42-1889-42d8-802a-730a83b79cc4</name>
- <entityName>Task_entity</entityName>
- <fieldName>ContactEditors</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>24d41887-29f4-4a3d-9a0b-063adb6603dc</name>
- <entityName>Task_entity</entityName>
- <fieldName>ContactRequestors</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6a502317-8b81-4bea-803f-003f990513df</name>
- <entityName>CommRestriction_Entity</entityName>
- <fieldName>EmployeeInvolved</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>773cd8d0-c4e2-4e2e-b910-a1f4e4b87801</name>
- <entityName>UnlinkedMailMappingWrapper_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4f377eaf-bd24-4347-99fc-c6c8ab4355be</name>
- <entityName>Leadimport_entity</entityName>
- <fieldName>Leadimport_Empl</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7e6bff46-4047-49da-a5ef-40510a8255a2</name>
- <entityName>VisitRecommendation_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>14d61385-28fb-40b2-a31a-a5764a8da2f0</name>
- <entityName>VisitPlanEmployeeWeek_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9c38e9ef-6f90-4e57-af45-d82539c57a0e</name>
- <entityName>Planning_entity</entityName>
- <fieldName>Responsible</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b49eecba-062b-4658-a3b9-574982536fb1</name>
- <entityName>PlanningChangeStatusAndResponsible_entity</entityName>
- <fieldName>Responsibles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>d1736052-573f-4774-b90b-0f8a81083cb6</name>
- <entityName>PlanningAddToOrganisations_entity</entityName>
- <fieldName>Responsible</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>OnlyActives_param</name>
@@ -363,38 +277,10 @@
</entityField>
<entityProvider>
<name>EmployeesByUserId</name>
- <dependencies>
- <entityDependency>
- <name>1d000ca2-f27e-47d2-95e2-ee14771c4ced</name>
- <entityName>WorkflowTask_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c83ebe7a-5a3b-49ed-b40c-d667bb72f268</name>
- <entityName>Observation_entity</entityName>
- <fieldName>Users</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>EmployeesByShortUserId</name>
<lookupIdfield>SHORT_UID</lookupIdfield>
- <dependencies>
- <entityDependency>
- <name>8b02831c-e831-4314-8ea3-d913c3394db2</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4dad4b91-52ae-4263-9587-3b45101444fd</name>
- <entityName>PermissionCalendar_entity</entityName>
- <fieldName>User</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>PHONE_ADDRESS</name>
diff --git a/entity/EwsSyncAddContacts_entity/EwsSyncAddContacts_entity.aod b/entity/EwsSyncAddContacts_entity/EwsSyncAddContacts_entity.aod
index 332169d840fba95e4b9a7507ede82835e4fda87e..09e4da1fcdbb91f665c805be7d4625bfa6f051f6 100644
--- a/entity/EwsSyncAddContacts_entity/EwsSyncAddContacts_entity.aod
+++ b/entity/EwsSyncAddContacts_entity/EwsSyncAddContacts_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>EwsSyncAddContacts_entity</name>
<title>add contact to ewssync</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
index dc20a3f5bb9bec0c61d420246445af1ee6a8d848..63fc56aa972f5dafb6c28368cc40acb5f6ffc94e 100644
--- a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
+++ b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ExportTemplateField_entity</name>
<title>Export Template Field</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -33,14 +33,6 @@
<entityProvider>
<name>ExportTemplateFields</name>
<documentation>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>b111615c-cde3-46b7-b229-46cc2db004fd</name>
- <entityName>ExportTemplate_entity</entityName>
- <fieldName>ExportTemplateFields</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>ExportTemplateField_param</name>
diff --git a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
index 7689336446e654e8fe6101f83224fe07f7d6728c..19bccd43d84655e55b77e4cc29c5d962b962cc03 100644
--- a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
+++ b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ExportTemplatePlaceOfUse_entity</name>
<title>Place of Use</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -55,14 +55,6 @@
<entityProvider>
<name>ExportTemplatePlaceOfUser</name>
<documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>c60a238a-51f0-4538-8c53-6921481ddd4c</name>
- <entityName>ExportTemplate_entity</entityName>
- <fieldName>ExportTemplateplaceOfUseCon</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ExportTemplatePlaceOfUse_param</name>
diff --git a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
index f68f881f9ad028080e6c7a3d2e1bff49295b9e88..fe3b83665d57d5431171e6f10703afd1591da446 100644
--- a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
+++ b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ExportTemplateSelection_entity</name>
<title>Exporttempalte Selection</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
index 8fbadb06e1dd4ca130d3f21172629c2c4031a2db..fdfa7fc493ec71eb6c1095d054e1c35bd72ae8d6 100644
--- a/entity/ExportTemplate_entity/ExportTemplate_entity.aod
+++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ExportTemplate_entity</name>
<title>Export Template</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -112,14 +112,6 @@
<name>ExportTemplateIDs</name>
<documentation>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateids/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>1b692618-b800-47ae-a48c-3d4164d68401</name>
- <entityName>ExportTemplateSelection_entity</entityName>
- <fieldName>ExportTemplateComsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ExportTemplateIDs_param</name>
diff --git a/entity/Favorite_entity/Favorite_entity.aod b/entity/Favorite_entity/Favorite_entity.aod
index 9ce8f7b4045ccc69f83b71c3922e47957267050d..264567968f5bf32ed4fa11ebd44e6c504360ddc3 100644
--- a/entity/Favorite_entity/Favorite_entity.aod
+++ b/entity/Favorite_entity/Favorite_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Favorite_entity</name>
<title>Favorite</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index 9182cdc2c8fcf6e928dc89de0a768396901706ed..126a8bbcf9eef434e5fb2991405d498bb985f3cd 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Forecast_entity</name>
<title>${FORECAST_ENGLISH}</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -103,14 +103,6 @@
<entityProvider>
<name>Links</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>42f3a486-1fcd-46b7-8282-e55b1c7ac965</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Forecasts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>ObjectRowId_param</name>
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 17f5aa15fef8b6f6797172f4e04def1e4c823e99..a778a5b5d809a7245c8a73fc831b76fdbfa9e4f6 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Gender_keyword</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Gender_keyword/documentation.adoc</documentation>
@@ -14,14 +14,6 @@
</entityField>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>ede7d623-3709-4d22-85fa-30214e2293e2</name>
- <entityName>Person_entity</entityName>
- <fieldName>Genders</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/ImportField_Entity/ImportField_Entity.aod b/entity/ImportField_Entity/ImportField_Entity.aod
index fb47af9cfe9e5cc16060f6155577916e6a0fd57b..360410fe7562e1fc3e51431638d131c53c1be207 100644
--- a/entity/ImportField_Entity/ImportField_Entity.aod
+++ b/entity/ImportField_Entity/ImportField_Entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ImportField_Entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ImportField_Entity/documentation.adoc</documentation>
@@ -60,14 +60,6 @@
<name>LeadImportIds</name>
<documentation>%aditoprj%/entity/ImportField_Entity/entityfields/leadimportids/documentation.adoc</documentation>
<titlePlural>Import Fields</titlePlural>
- <dependencies>
- <entityDependency>
- <name>49a27c65-90d8-4ac0-8a62-0fac1ace7124</name>
- <entityName>Leadimport_entity</entityName>
- <fieldName>ImportFieldID</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>LeadImportID</name>
diff --git a/entity/IndexSearchEntity/IndexSearchEntity.aod b/entity/IndexSearchEntity/IndexSearchEntity.aod
index 4cd16dc36dd3f05e50987feed06cd763385031cf..c2737a2c883ce43be972fde1834072b200b4e82d 100644
--- a/entity/IndexSearchEntity/IndexSearchEntity.aod
+++ b/entity/IndexSearchEntity/IndexSearchEntity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>IndexSearchEntity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/IndexSearchEntity/documentation.adoc</documentation>
diff --git a/entity/InterestLink_entity/InterestLink_entity.aod b/entity/InterestLink_entity/InterestLink_entity.aod
index 7f4c396f063b7d9e1f693af97fc79b101abbd226..6b13ef837bd71b412f22b21d446cc468373b757b 100644
--- a/entity/InterestLink_entity/InterestLink_entity.aod
+++ b/entity/InterestLink_entity/InterestLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>InterestLink_entity</name>
<title>Interest</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -62,14 +62,6 @@
</entityParameter>
<entityProvider>
<name>InterestsForContact</name>
- <dependencies>
- <entityDependency>
- <name>97de1501-3646-475b-bf3c-2fec20843ee4</name>
- <entityName>Person_entity</entityName>
- <fieldName>InterestLinks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>DESCRIPTION</name>
diff --git a/entity/Interest_entity/Interest_entity.aod b/entity/Interest_entity/Interest_entity.aod
index f2485ca1f25930f9712a6e510a4c5ee0dd1769bc..4dbed8e6bffb1e652677678218207d5df5eea875 100644
--- a/entity/Interest_entity/Interest_entity.aod
+++ b/entity/Interest_entity/Interest_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Interest_entity</name>
<title>Interest</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -11,20 +11,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>a7f69959-a663-4089-828f-71cdc461262b</name>
- <entityName>InterestLink_entity</entityName>
- <fieldName>Interests</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3b09958b-0175-47fa-9528-2d5570c21162</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>Interests</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index c21c9e8558f3698e9184b5f1fad67a257dcfc2cc..ce371ea313fea915b1ded9be74c9f606230d10ff 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>KeywordAttributeRelation_entity</name>
<title>Keyword Attribute Values</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -51,20 +51,6 @@
<name>AttributesForKeywordEntry</name>
<titlePlural></titlePlural>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>490d12c0-6ace-42e5-89e1-d40b25322161</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>KeywordAttributeRelations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e6e2abfd-b504-47ff-bdb3-5927aaf9df5c</name>
- <entityName>DSGVOConfiguration_entity</entityName>
- <fieldName>ConfigKeywordAttributeRelation</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>KeywordEntryId_param</name>
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index f323e21738e421a8a016ff2f8baccc78f185722e..af75707b37e8fd809282db52e9207947603068c7 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>KeywordAttribute_entity</name>
<title>Keyword Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -34,20 +34,6 @@
<entityProvider>
<name>SpecificContainerKeyword</name>
<documentation>%aditoprj%/entity/KeywordAttribute_entity/entityfields/specificcontainerkeyword/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>1d11c064-1cf2-4f08-b842-9fa941ad3157</name>
- <entityName>KeywordAttributeRelation_entity</entityName>
- <fieldName>KeywordAttributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>684a3e60-00ad-4d46-8c98-6559e485a729</name>
- <entityName>CommRestriction_Entity</entityName>
- <fieldName>MediumKeywordAttribute</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>ContainerName_param</name>
diff --git a/entity/KeywordCategory_entity/KeywordCategory_entity.aod b/entity/KeywordCategory_entity/KeywordCategory_entity.aod
index fb84b88df68c8861fce153afa44801416d21431f..c4cfe16844da693e7633e4d0e8352a23b5eadcee 100644
--- a/entity/KeywordCategory_entity/KeywordCategory_entity.aod
+++ b/entity/KeywordCategory_entity/KeywordCategory_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>KeywordCategory_entity</name>
<title>Keyword Category</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -47,14 +47,6 @@
<name>AllKeywordCategoryProvider</name>
<lookupIdfield>AB_KEYWORD_CATEGORYID</lookupIdfield>
<sortingField>NAME</sortingField>
- <dependencies>
- <entityDependency>
- <name>d93010a7-5c20-4144-8efb-8eb43c69b7b1</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>KeywordCategoryConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>OrderedByNameFieldKeywordsConsumer</name>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 148a373040cd117345be41d95f1641dc582d1d15..43a8ea7d421dac915a8e2706c817ec767f2b3078 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>KeywordEntry_entity</name>
<title>Keyword Entry</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -18,26 +18,6 @@
<name>#PROVIDER</name>
<lookupIdfield>KEYID</lookupIdfield>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>ce10e4d3-7799-4473-a681-a3c6d9f93b02</name>
- <entityName>Notification_entity</entityName>
- <fieldName>StateKeywords</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0015f4fa-9f54-4d99-8e23-92e36a614d7a</name>
- <entityName>Notification_entity</entityName>
- <fieldName>PrioKeywords</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>01b9bba5-3b65-4db0-b466-1e41061feb1a</name>
- <entityName>Observation_entity</entityName>
- <fieldName>PrioKeywords</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CONTAINER</name>
@@ -102,661 +82,6 @@
<lookupIdfield>KEYID</lookupIdfield>
<documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/documentation.adoc</documentation>
<recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>4b1d1def-36d3-45e9-9ed5-eaef12d1ec82</name>
- <entityName>Activity_entity</entityName>
- <fieldName>KeywordDirections</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>42219987-4eff-4429-a22c-93e8a9c55c45</name>
- <entityName>Contract_entity</entityName>
- <fieldName>ContractPayments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2712e2b3-f17f-4a9c-9752-2383f62eb2b8</name>
- <entityName>Contract_entity</entityName>
- <fieldName>ContractStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bd68f269-457c-487d-a1b2-e045d98f74b7</name>
- <entityName>Contract_entity</entityName>
- <fieldName>ContractTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b88b5cc8-c29e-4110-b86e-d1d0050460e5</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordCurrencies</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>57c746ee-a8c0-484a-8c73-6301609b76b1</name>
- <entityName>Order_entity</entityName>
- <fieldName>KeywordCurrencies</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bf014596-954b-4c7d-9304-8283c9bcc7ae</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>KeywordCurrencies</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f5dcbf08-3765-4a9d-8b42-cb1219c87f57</name>
- <entityName>Offeritem_entity</entityName>
- <fieldName>KeywordProductGroupcodes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>53bcaa07-94eb-4e81-9e9e-c5748156dad5</name>
- <entityName>Orderitem_entity</entityName>
- <fieldName>KeywordProductGroupcodes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c404b010-1634-4160-adca-7edf1535ee26</name>
- <entityName>Product_entity</entityName>
- <fieldName>KeywordProductGroupcodes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3575fdd7-3dd6-4318-b0d2-32d1df821076</name>
- <entityName>Forecast_entity</entityName>
- <fieldName>KeywordProductGroupcodes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>5a21cbe2-4eb0-4968-80fa-b98a64599230</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordOfferStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8696e561-b263-4c7c-b753-c5da44b48055</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordOrganisationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0d54d283-f158-4b91-8f6d-026954ed9c50</name>
- <entityName>Person_entity</entityName>
- <fieldName>KeywordGenders</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8d28f08b-675d-4bcf-9318-a508d45ca69e</name>
- <entityName>Task_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b069ef7d-07a0-460c-a8e7-cde5861c96c2</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>KeywordPricelists</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7f134ef1-cff5-4cf4-9d2a-e288c7904c28</name>
- <entityName>Offeritem_entity</entityName>
- <fieldName>KeywordQuantityUnits</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c3c3b430-a14f-46b4-909a-9b53cef35413</name>
- <entityName>Orderitem_entity</entityName>
- <fieldName>KeywordQuantityUnits</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a1983efd-92f9-4a6b-8805-d2977fcde0c8</name>
- <entityName>Product_entity</entityName>
- <fieldName>KeywordQuantityUnits</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>356e23f9-eb05-4e18-b0b5-cbc7c8716dba</name>
- <entityName>SalesprojectSource_entity</entityName>
- <fieldName>KeywordSources</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>36a72192-902f-431b-8f43-0bef311678f7</name>
- <entityName>Order_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e2041dea-8647-49e9-aacf-4481b75b76ff</name>
- <entityName>Stock_entity</entityName>
- <fieldName>KeywordWarehouses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>403c40a4-f747-4e47-ad60-07334724d6fb</name>
- <entityName>KeywordAttribute_entity</entityName>
- <fieldName>KeywordAttributeTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>078bbd52-87fa-44cc-9902-04af935b5fbc</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>KeywordAttributeTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a44375e9-917c-4db8-9aa8-de0625caf78f</name>
- <entityName>Activity_entity</entityName>
- <fieldName>KeywordCategories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>fa831dac-3287-422a-8f28-504fc525876a</name>
- <entityName>Communication_entity</entityName>
- <fieldName>KeywordMediums</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>04b28ce6-a144-4c19-ac2d-4cfbc3568700</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordPricePolitics</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f024df05-2faf-4447-9eed-ae31b329d542</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordPricePolitics</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>60840c28-9875-4e3e-8099-5ca208d58bbe</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordWeaknesses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>854148e2-2532-4562-b393-832819e8d462</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordStrenghts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>613d5861-0494-45f9-a839-a705347a68da</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordWeaknesses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>119d79d0-9e04-4dd0-80bb-0bc32eaae775</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordStrenghts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6e2d164c-1ac7-4ed0-ad8f-7bfda1328493</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>1053a90d-574a-4ca2-b41d-42b513db0fd2</name>
- <entityName>Task_entity</entityName>
- <fieldName>KeywordPriorities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bf9f7a07-dfb9-44d0-8f9b-d3814053683e</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ef8b9397-6292-42de-806e-5aaf3e3db5f3</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>KeywordWonLost</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>5d9e0e48-ece8-4b8e-ab72-beef77b5dcc3</name>
- <entityName>Task_entity</entityName>
- <fieldName>KeywordProgress</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>36aa04c1-5361-4e40-a036-0546db596973</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordDeliveryTerm</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7e12cbd6-3a2c-4bd8-bc66-5001c282b690</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordPaymentTerm</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7945545b-f1e6-446d-84c3-ef68486652f4</name>
- <entityName>Contact_entity</entityName>
- <fieldName>KeywordContactStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>740a9696-d394-48ea-bcbf-a5484a093bde</name>
- <entityName>SalesprojectMilestone_entity</entityName>
- <fieldName>Keywords</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b5c39776-509e-4758-8d05-a64eac4e7f38</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>13d739cb-2b97-44a0-bed0-b6868b0e579e</name>
- <entityName>CampaignCost_entity</entityName>
- <fieldName>KeywordCampaignManagementCostCategory</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3a81e886-0d83-47f0-9ec7-c864ffc57cda</name>
- <entityName>Classification_entity</entityName>
- <fieldName>KeywordClassificationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>995646a8-ccec-4962-8c81-05a54903c433</name>
- <entityName>CommRestriction_Entity</entityName>
- <fieldName>CommRestrictionMedium</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>eb7c17de-3057-45c5-96c0-f863551cc049</name>
- <entityName>BulkMailRecipient_entity</entityName>
- <fieldName>StatusKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3ab18dc8-b702-49d9-9cbc-4b8d8ffaea2e</name>
- <entityName>DSGVO_entity</entityName>
- <fieldName>KeywordDSGVOPurpose</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>86501073-4e62-42ef-ba15-e9f6a2eb3495</name>
- <entityName>DSGVO_entity</entityName>
- <fieldName>KeywordDSGVOStatuoritysource</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ae2c4712-5513-4c0d-911a-532f50483c76</name>
- <entityName>DSGVO_entity</entityName>
- <fieldName>KeywordDSGVOType</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>44f84932-2a27-4e11-833b-def950c064d9</name>
- <entityName>SupportTicket_entity</entityName>
- <fieldName>KeywordTickettype</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>10ba6c44-779c-4ba8-9277-e9583af03ed5</name>
- <entityName>SupportTicket_entity</entityName>
- <fieldName>KeywordTaskState</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e1b87370-aa15-4540-99c1-7bd63f0f3263</name>
- <entityName>SupportTicket_entity</entityName>
- <fieldName>KeywordTaskPriority</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>d8c587cc-47db-4e08-a6ac-92ec1d91acb5</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>StatusKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>41fd8fd4-7285-4493-9a56-cc0c44353057</name>
- <entityName>DSGVOInfo_entity</entityName>
- <fieldName>KeywordDeadline</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>1cbfe51f-43c3-4e99-895f-673097915249</name>
- <entityName>DSGVOInfo_entity</entityName>
- <fieldName>KeywordTransmission</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>718da6a7-229b-4075-a8ff-b0458c770e7b</name>
- <entityName>DSGVOInfo_entity</entityName>
- <fieldName>KeywordGuarantee</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2443c7e3-9e66-41dc-99c7-3283e9315000</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>KeywordCurrency</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2694515c-eda4-44aa-9826-d430aa8a8089</name>
- <entityName>Order_entity</entityName>
- <fieldName>KeywordOrderTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>72ae7a5c-acc9-4e59-8110-f5b544f47f15</name>
- <entityName>Order_entity</entityName>
- <fieldName>KeywordDunningLevels</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ea9260e9-b5e8-457c-ae84-45c4692348ce</name>
- <entityName>Order_entity</entityName>
- <fieldName>KeywordPaymentTerms</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>5d296f68-0a8f-429c-b630-e3ca88874945</name>
- <entityName>Order_entity</entityName>
- <fieldName>KeywordDeliveryTerms</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b4238087-6333-453a-a501-760732c68f5d</name>
- <entityName>SerialLetter_entity</entityName>
- <fieldName>StatusKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>613f86de-26bb-458d-a1b7-31b0e06ec3dc</name>
- <entityName>ImportField_Entity</entityName>
- <fieldName>KeywordImportFields</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>157be5ff-0568-4029-8295-cfb05fb2fafc</name>
- <entityName>Lead_entity</entityName>
- <fieldName>KeywordDupStatus</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>5016fdbc-c41b-4d4d-bb3c-bd29b9625db5</name>
- <entityName>Leadimport_entity</entityName>
- <fieldName>KeywordImportStatus</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>24b11c85-618a-494b-980b-a94b56523b78</name>
- <entityName>WorkflowStartConfig_entity</entityName>
- <fieldName>TriggerKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b25f4a3e-706b-43f5-b4d4-44249e8fa125</name>
- <entityName>CampaignPlanning_entity</entityName>
- <fieldName>CampaignStatusKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>66c64130-1997-4565-854e-94802b46dc96</name>
- <entityName>WorkflowSignal_entity</entityName>
- <fieldName>TriggerKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>38c8a85b-3bea-44cf-b57e-23eba340adb4</name>
- <entityName>ExportTemplatePlaceOfUse_entity</entityName>
- <fieldName>ContextExportTemplatePlaceOfUse</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f21760f5-e138-4924-b3ee-3881afbda5d9</name>
- <entityName>DocumentTemplatePlaceOfUse_entity</entityName>
- <fieldName>ContextDocumentTemplatePlaceOfUse</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8c5b1d49-f0b5-4a7c-9bff-02165996e11b</name>
- <entityName>PermissionCalendar_entity</entityName>
- <fieldName>KeywordPermissionCalendarTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7c05378a-c50f-4f94-bd18-e256baf86e31</name>
- <entityName>WorkflowInstanceHistory_entity</entityName>
- <fieldName>ActivityTypeKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6ac610a4-64a0-4396-8901-80711850129a</name>
- <entityName>VisitPlanEntry_entity</entityName>
- <fieldName>KeywordVisitPlanEntryStatus</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>eec28bd6-7631-4653-9335-511f0298f8b6</name>
- <entityName>VisitRecommendation_entity</entityName>
- <fieldName>KeywordVisitRecommendationPriority</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>40c6ff94-05b4-4477-8067-55494e180657</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>KeywordCampaignType</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f8974482-093a-482a-be44-5e1d4029bb23</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>KeywordEventType</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>54410e7f-e5e6-4dd1-8f60-7864ed907aed</name>
- <entityName>WorkflowDefinition_entity</entityName>
- <fieldName>CategoryKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>d1769b5e-db2a-445b-bb79-c72ac757038b</name>
- <entityName>LeadimportMappingAssistant_entity</entityName>
- <fieldName>KeywordImportFields</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2823f5a0-2b1d-41f4-abf1-3e7b332fa176</name>
- <entityName>VisitRecommendation_entity</entityName>
- <fieldName>KeywordVisitRecommendationSource</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>10ced13f-78ae-4e99-a315-82f1f7389029</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>KeywordStepMedium</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f2719502-19e8-4a24-8f3f-e4aa4dd77e70</name>
- <entityName>VisitPlanEntry_entity</entityName>
- <fieldName>KeywordVisitPlanEntryStatusAppointment</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>edde64f8-8f71-4fa3-a807-b6b3af971446</name>
- <entityName>DistrictContact_entity</entityName>
- <fieldName>KeywordContactStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>146dc4e4-7e99-48da-9572-09f2a57ea7f6</name>
- <entityName>DistrictContact_entity</entityName>
- <fieldName>KeywordAdviserRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>223e4198-157d-43b5-b31e-417eb6ebf39c</name>
- <entityName>DistrictContact_entity</entityName>
- <fieldName>KeywordDistrictOrigin</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6f8ca40b-52bc-461f-8b97-083e1509c6fb</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>AdviserStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>146306af-cb4e-4d60-8298-f298770e7efb</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>AdviserRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>eb5684f7-200a-401c-ac73-cc905a4d3f06</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordPhases</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>414ad662-727b-4e9f-9e86-0659d92ec60d</name>
- <entityName>DuplicatePerson_entity</entityName>
- <fieldName>KeywordContactStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0f8f9bfc-379c-4f05-8364-8270e718fe9a</name>
- <entityName>DuplicateOrganisation_entity</entityName>
- <fieldName>KeywordContactStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b78c0dd7-a35c-4d9b-9a23-1a20e7e41464</name>
- <entityName>DuplicateOrganisation_entity</entityName>
- <fieldName>KeywordOrganisationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>98608b12-9927-4197-adfe-1398a388bcb0</name>
- <entityName>WebtrackingTag_entity</entityName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8cfca9b8-3128-4e31-bb77-358d500c4b9a</name>
- <entityName>Weblink_entity</entityName>
- <fieldName>KeywordLinkType</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7a7e6cc4-3e5b-4a2b-8ed9-1e84436cac15</name>
- <entityName>WeblinkTag_entity</entityName>
- <fieldName>KeywordLinkTags</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f85bfcbc-627a-4746-acc1-e228b56ab122</name>
- <entityName>CommunicationSettings_entity</entityName>
- <fieldName>StatusKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>d6fe81c3-fadc-444d-8962-53c64b8ecd33</name>
- <entityName>CommunicationSettings_entity</entityName>
- <fieldName>MediumKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>81b5b8f4-74a7-42fe-84d1-05211ddcd221</name>
- <entityName>CommunicationSettings_entity</entityName>
- <fieldName>ChannelTypeKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>23da94c2-910f-4b89-a92e-0826e00fe293</name>
- <entityName>Interest_entity</entityName>
- <fieldName>StatusKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9afcf60e-4854-45bb-a9f9-924926be7b25</name>
- <entityName>InterestLink_entity</entityName>
- <fieldName>StatusKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a4d04777-82dc-4384-a4a5-c6a4a71e7a65</name>
- <entityName>CommunicationBlacklist_entity</entityName>
- <fieldName>BlacklistTypeKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bf774c79-2902-4fdb-a8d2-8a157294bc27</name>
- <entityName>Planning_entity</entityName>
- <fieldName>KeywordKinds</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3a570fef-552b-4d94-b010-33a7ffee7a96</name>
- <entityName>Planning_entity</entityName>
- <fieldName>KeywordStatus</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>5dc1bb58-75cb-4214-b6f5-065e8de26779</name>
- <entityName>Planning_entity</entityName>
- <fieldName>KeywordGroupcode</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>49358965-6e83-4279-82a8-babf257c3b5f</name>
- <entityName>PlanningAddToOrganisations_entity</entityName>
- <fieldName>KeywordStatus</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f7aa1856-6896-4531-8b15-d3c5504172fb</name>
- <entityName>PlanningAddToOrganisations_entity</entityName>
- <fieldName>KeywordGroupcode</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>12a0dd2c-57f2-4277-b25c-9f824b82308d</name>
- <entityName>PlanningChangeStatusAndResponsible_entity</entityName>
- <fieldName>KeywordStatus</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>050100cf-7f48-4951-a1dc-343927e0a2af</name>
- <entityName>SalesprojectPhaseDefinition_entity</entityName>
- <fieldName>KeywordProbabilitySalesproject</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6c34847b-56b1-4486-a31a-2279b15dfff0</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>KeywordProbabilitySalesproject</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9b82186e-f230-4af9-b77e-72b750c68d27</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordProbabilityOffer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>48d817dc-e0fd-4d4b-bb48-3567a570105d</name>
- <entityName>Weblink_entity</entityName>
- <fieldName>KeywordActionTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>OnlyActives_param</name>
@@ -854,32 +179,6 @@
<lookupIdfield>AB_KEYWORD_ENTRYID</lookupIdfield>
<sortingField>SORTING</sortingField>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>f677c429-246a-4550-afc7-73dac953bfbf</name>
- <entityName>KeywordCategory_entity</entityName>
- <fieldName>OrderedBySortingFieldKeywordsConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>815a5b03-64ec-4480-8a2b-f02077386158</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordContactStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>51a15faf-a4a8-45be-8aae-416e6288439f</name>
- <entityName>DSGVODeleteFlag_entity</entityName>
- <fieldName>DSGVOReasonKeywords</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a96898c5-5af2-4e91-84b0-ed079bbfbe06</name>
- <entityName>Person_entity</entityName>
- <fieldName>KeywordContactStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContainerName_param</name>
@@ -891,14 +190,6 @@
<name>OrderedByNameFieldKeywords</name>
<lookupIdfield>AB_KEYWORD_ENTRYID</lookupIdfield>
<recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>63218865-e3ef-4fb6-9f0a-3fef321ce30c</name>
- <entityName>KeywordCategory_entity</entityName>
- <fieldName>OrderedByNameFieldKeywordsConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContainerName_param</name>
diff --git a/entity/KnowledgeDiscussion_entity/KnowledgeDiscussion_entity.aod b/entity/KnowledgeDiscussion_entity/KnowledgeDiscussion_entity.aod
index ae567dde14c71703c4a112adbdf38ecc24896957..9c3cceddc40f0d8c6d7250e4aaff85841f39e144 100644
--- a/entity/KnowledgeDiscussion_entity/KnowledgeDiscussion_entity.aod
+++ b/entity/KnowledgeDiscussion_entity/KnowledgeDiscussion_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>KnowledgeDiscussion_entity</name>
<title>Discussion</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -81,14 +81,6 @@
<entityProvider>
<name>ByKnowledgeId</name>
<documentation>%aditoprj%/entity/KnowledgeDiscussion_entity/entityfields/byknowledgeid/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>fbacb136-2690-495a-82c5-b6ab1576d3f9</name>
- <entityName>KnowledgeManagement_entity</entityName>
- <fieldName>DiscussionsByKnowledgeId</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>KnowledgeId_param</name>
@@ -103,7 +95,7 @@
<title>Reply</title>
<onActionProcess>%aditoprj%/entity/KnowledgeDiscussion_entity/entityfields/edit_actiongroup/children/addanswer_action/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:COMMENT_O</iconId>
<tooltip>Adds an answer to the selected discussion</tooltip>
</entityActionField>
@@ -112,7 +104,7 @@
<title>Toggle status</title>
<onActionProcess>%aditoprj%/entity/KnowledgeDiscussion_entity/entityfields/edit_actiongroup/children/togglediscussionstatus_action/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:LOCK</iconId>
<tooltip>Toggles the status of selected discussion between open and closed</tooltip>
</entityActionField>
diff --git a/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod b/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod
index 6b817307e82b88644ccaf5957c72db7d0606a134..06a1067217c2574a3cfef2167bd7beedd87a33e0 100644
--- a/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod
+++ b/entity/KnowledgeLink_entity/KnowledgeLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>KnowledgeLink_entity</name>
<title>Link</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -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>
@@ -89,14 +89,6 @@
<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/KnowledgeManagementTagList_entity/KnowledgeManagementTagList_entity.aod b/entity/KnowledgeManagementTagList_entity/KnowledgeManagementTagList_entity.aod
index ce3999d283e928e1d8f13079bf2738c3a5aba3ed..98a8aab49e515de34861d26f6de5e26ee7d7d857 100644
--- a/entity/KnowledgeManagementTagList_entity/KnowledgeManagementTagList_entity.aod
+++ b/entity/KnowledgeManagementTagList_entity/KnowledgeManagementTagList_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>KnowledgeManagementTagList_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KnowledgeManagementTagList_entity/documentation.adoc</documentation>
@@ -18,14 +18,6 @@
<entityProvider>
<name>CompleteList</name>
<documentation>%aditoprj%/entity/KnowledgeManagementTagList_entity/entityfields/completelist/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>85925baa-5edc-4908-804e-f7ec4c5a2a0c</name>
- <entityName>KnowledgeManagementTags_entity</entityName>
- <fieldName>CompleteTagList</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/KnowledgeManagementTags_entity/KnowledgeManagementTags_entity.aod b/entity/KnowledgeManagementTags_entity/KnowledgeManagementTags_entity.aod
index 3047fb341eae892c2ca271f2fd24f24aec096ac1..f80e360b29cbf45de0b149da9354531fd590b668 100644
--- a/entity/KnowledgeManagementTags_entity/KnowledgeManagementTags_entity.aod
+++ b/entity/KnowledgeManagementTags_entity/KnowledgeManagementTags_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>KnowledgeManagementTags_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KnowledgeManagementTags_entity/documentation.adoc</documentation>
@@ -15,14 +15,6 @@
<entityProvider>
<name>ByKnowledgeManagementId</name>
<documentation>%aditoprj%/entity/KnowledgeManagementTags_entity/entityfields/byknowledgemanagementid/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>8d86a61b-0fe3-44c4-a512-e044c990fded</name>
- <entityName>KnowledgeManagement_entity</entityName>
- <fieldName>TagsByKnowledgeId</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>KnowledgeManagementId_param</name>
diff --git a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
index 515e42af17febbd4d13609e2a22f09130c244ea4..67a9351abb04151d93cc71ec10085ce55be35d74 100644
--- a/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
+++ b/entity/KnowledgeManagement_entity/KnowledgeManagement_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>KnowledgeManagement_entity</name>
<title>Knowledge</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -132,14 +132,6 @@
<entityProvider>
<name>Provider</name>
<documentation>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/provider/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>20c983b0-4575-4bd3-83ce-477458ece62d</name>
- <entityName>Product_entity</entityName>
- <fieldName>KnowledgeManagements</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>PersonContacts</name>
@@ -203,7 +195,7 @@
<title>send as mail</title>
<onActionProcess>%aditoprj%/entity/KnowledgeManagement_entity/entityfields/openentryasmail/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:ENVELOPE</iconId>
<state>INVISIBLE</state>
</entityActionField>
diff --git a/entity/KnowledgeNewsFeed_entity/KnowledgeNewsFeed_entity.aod b/entity/KnowledgeNewsFeed_entity/KnowledgeNewsFeed_entity.aod
index 044c654b107b2bcf87397e6bb3559dd3b6848081..645f4066b12f8f6109a3c0cb29a0cd555a3d51ca 100644
--- a/entity/KnowledgeNewsFeed_entity/KnowledgeNewsFeed_entity.aod
+++ b/entity/KnowledgeNewsFeed_entity/KnowledgeNewsFeed_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>KnowledgeNewsFeed_entity</name>
<title>Feed</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/KnowledgeRole_entity/KnowledgeRole_entity.aod b/entity/KnowledgeRole_entity/KnowledgeRole_entity.aod
index a3aa8d298eaa34a733a08787263629302027f518..9c72617379c57469ec35a615d600f95308cb0c0a 100644
--- a/entity/KnowledgeRole_entity/KnowledgeRole_entity.aod
+++ b/entity/KnowledgeRole_entity/KnowledgeRole_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>KnowledgeRole_entity</name>
<title>Knowledge Role</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -35,14 +35,6 @@
<documentation>%aditoprj%/entity/KnowledgeRole_entity/entityfields/knowledgerole/documentation.adoc</documentation>
<titlePlural>KnowledgeRoles</titlePlural>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>404bd92c-6222-4b58-95b4-d7f657b62c82</name>
- <entityName>KnowledgeManagement_entity</entityName>
- <fieldName>KnowledgeRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>KNOWLEDGEROLEID</name>
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 84fea3b199336bf18913f8a69c0211add91721c7..e8c4852d6f3389ea0d83cdb95a0272fcd0452ffe 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Language_entity</name>
<title>Language</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -33,68 +33,6 @@
<lookupIdfield>ISO3</lookupIdfield>
<documentation>%aditoprj%/entity/Language_entity/entityfields/iso3name/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>471b099a-03ab-4c49-8372-729b1e789ecc</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3429b46c-03e1-458a-9b60-0b6d2a560ce1</name>
- <entityName>Order_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>d2ae2b80-941f-42c5-89a4-67269d9a0411</name>
- <entityName>Person_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f0fd487b-6d1e-4247-8539-4b0912b003f8</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>030ac1ae-5f5b-4815-b9f4-1121b7c881ad</name>
- <entityName>Contact_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>156f3abb-eef3-41a0-8bfa-aa888fe587df</name>
- <entityName>Salutation_entity</entityName>
- <fieldName>KeywordLanguages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>12f3a19a-259e-46ba-bc31-aa776c3d324c</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6eb7101e-690f-4f55-a780-7b7129071fd1</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>809a6f10-7cdc-4dd8-a2bb-c6bc8085dd26</name>
- <entityName>ExportTemplate_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9ee48241-5d40-46e9-83ec-a1dc55fdb7d5</name>
- <entityName>District_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ExcludedIds_param</name>
@@ -106,14 +44,6 @@
<name>ISO3NameFiltered</name>
<lookupIdfield>ISO3</lookupIdfield>
<documentation>%aditoprj%/entity/Language_entity/entityfields/iso3namefiltered/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>2df9d0ed-c26b-4166-9667-786a55146e05</name>
- <entityName>DescriptionTranslation_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ExcludedIds_param</name>
diff --git a/entity/LeadLog_entity/LeadLog_entity.aod b/entity/LeadLog_entity/LeadLog_entity.aod
index 6ebe0432210ce13bf1eda860c5496b14cbfa87e1..823aabceeaeae291ec1de724cc79600929ac2d6c 100644
--- a/entity/LeadLog_entity/LeadLog_entity.aod
+++ b/entity/LeadLog_entity/LeadLog_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>LeadLog_entity</name>
<description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -43,14 +43,6 @@
<entityProvider>
<name>LeadLogP</name>
<titlePlural>Import logs</titlePlural>
- <dependencies>
- <entityDependency>
- <name>eaecc675-2fc3-4e10-8c3c-f8173444d329</name>
- <entityName>Leadimport_entity</entityName>
- <fieldName>LeadLogC</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>LeadImportId</name>
diff --git a/entity/LeadTemp_entity/LeadTemp_entity.aod b/entity/LeadTemp_entity/LeadTemp_entity.aod
index b8ae307bfe5693e730a607c25c2f74d9f6cbce4d..b4780474887a5f8d344c4abbc72fff46d5e64876 100644
--- a/entity/LeadTemp_entity/LeadTemp_entity.aod
+++ b/entity/LeadTemp_entity/LeadTemp_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>LeadTemp_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/LeadTemp_entity/documentation.adoc</documentation>
@@ -151,14 +151,6 @@
<entityProvider>
<name>LeadTempP</name>
<titlePlural>Import Data</titlePlural>
- <dependencies>
- <entityDependency>
- <name>1728cc52-9368-4a39-9702-c905d3594738</name>
- <entityName>Leadimport_entity</entityName>
- <fieldName>LeadTempC</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>LeadImportId</name>
diff --git a/entity/Lead_entity/Lead_entity.aod b/entity/Lead_entity/Lead_entity.aod
index dd2b1c8875313da3a241831f7b0ef16ce97f72c4..d30008faf23207c0dc529439969492841ff2925f 100644
--- a/entity/Lead_entity/Lead_entity.aod
+++ b/entity/Lead_entity/Lead_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Lead_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Lead_entity/documentation.adoc</documentation>
@@ -52,14 +52,6 @@
<targetContextField>person_context</targetContextField>
<targetIdField>LEAD_PERSCONTACT</targetIdField>
<titlePlural>Transfered data</titlePlural>
- <dependencies>
- <entityDependency>
- <name>71d298e2-79b9-43f0-9c8c-ee0a1a71cea4</name>
- <entityName>Leadimport_entity</entityName>
- <fieldName>LeadC</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>LeadImportId</name>
diff --git a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
index 1d52cd2f81549670b246a953ec4836f1cc769230..470ed88432d205fa3e4b2ced73079ffaa1f82f09 100644
--- a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
+++ b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>LeadimportMappingAssistant_entity</name>
<title>Mapping</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -55,14 +55,6 @@
<entityProvider>
<name>LeadimportMapping</name>
<documentation>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/leadimportmapping/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>89a94a8b-9447-47a6-94c7-240e25aff7a8</name>
- <entityName>Leadimport_entity</entityName>
- <fieldName>LeadimportMappings</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>Leadimport_ID_param</name>
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index 6dd8755383e13bf7bbebf6c77c00bf0e3f0688dc..3bece6cbcfb27e1950f1f379dbd38417ecaa8ffd 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Leadimport_entity</name>
<title>Lead Import</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -42,14 +42,6 @@
</entityActionGroup>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>451f0237-27f9-4018-a165-9bb4857d6565</name>
- <entityName>Object_entity</entityName>
- <fieldName>Leadimports</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>NAME</name>
@@ -99,7 +91,7 @@
<onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/transferdata/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="false" />
- <isSelectionAction v="false" />
+ <selectionType>UNBOUND</selectionType>
<iconId>VAADIN:INBOX</iconId>
<stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/transferdata/stateProcess.js</stateProcess>
</entityActionField>
@@ -173,14 +165,6 @@
<entityProvider>
<name>ImportField</name>
<documentation>%aditoprj%/entity/Leadimport_entity/entityfields/importfield/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>ae9f958f-b816-4826-8579-9f01362e0596</name>
- <entityName>ImportField_Entity</entityName>
- <fieldName>LeadImportC</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>ImportFieldID</name>
diff --git a/entity/LetterRecipient_entity/LetterRecipient_entity.aod b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
index c69902cd77d808ef4787a6f2e0ec3de07a9494e9..2672cecc140933313a57a6104b1ab7af0db9c4bb 100644
--- a/entity/LetterRecipient_entity/LetterRecipient_entity.aod
+++ b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>LetterRecipient_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/LetterRecipient_entity/documentation.adoc</documentation>
@@ -28,14 +28,6 @@
<lookupIdfield>LETTERRECIPIENTID</lookupIdfield>
<targetContextField>TARGETCONTEXT</targetContextField>
<targetIdField>CONTACT_ID</targetIdField>
- <dependencies>
- <entityDependency>
- <name>f8e19c87-d226-4712-b431-2b56324dacb8</name>
- <entityName>SerialLetter_entity</entityName>
- <fieldName>Recipients</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>SerialLetterId_param</name>
@@ -79,7 +71,7 @@
<name>downloadLetterForSelection</name>
<onActionProcess>%aditoprj%/entity/LetterRecipient_entity/entityfields/recipientactions/children/downloadletterforselection/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:DOWNLOAD_ALT</iconId>
<tooltipProcess>%aditoprj%/entity/LetterRecipient_entity/entityfields/recipientactions/children/downloadletterforselection/tooltipProcess.js</tooltipProcess>
</entityActionField>
diff --git a/entity/LetterRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/onActionProcess.js b/entity/LetterRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/onActionProcess.js
index 8b54190ef14b5fc4f16d0af6c67e4e84d8773602..21b3e80d49548da9a8276548790b5c7e81fefc27 100644
--- a/entity/LetterRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/onActionProcess.js
+++ b/entity/LetterRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/onActionProcess.js
@@ -2,13 +2,14 @@ import("Contact_lib");
import("system.neon");
import("Sql_lib");
import("KeywordRegistry_basic");
+import("MarketingCondition_lib");
var recipientIds = new SqlBuilder()
.select("LETTERRECIPIENTID")
.from("LETTERRECIPIENT")
.join("CONTACT",
newWhere("LETTERRECIPIENT.CONTACT_ID = CONTACT.CONTACTID")
- .and(ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$letter())))
+ .and(new CommunicationSettingsCondition().address().rejected().existSettings().buildCondition()))
.whereIfSet("LETTERRECIPIENT.SERIALLETTER_ID", "$param.SerialLetterId_param")
.arrayColumn();
diff --git a/entity/LetterRecipient_entity/recordcontainers/db/recordfieldmappings/hascommrestriction.value/expression.js b/entity/LetterRecipient_entity/recordcontainers/db/recordfieldmappings/hascommrestriction.value/expression.js
index c4cd2c2544b5f45d0c4c2a7604c40204f18a2867..7377540477a297626079e8dd215c1a66f4fb6b1f 100644
--- a/entity/LetterRecipient_entity/recordcontainers/db/recordfieldmappings/hascommrestriction.value/expression.js
+++ b/entity/LetterRecipient_entity/recordcontainers/db/recordfieldmappings/hascommrestriction.value/expression.js
@@ -3,7 +3,10 @@ import("KeywordRegistry_basic");
import("Contact_lib");
import("system.db");
import("system.result");
+import("MarketingCondition_lib");
-var commRestrictionCond = ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$letter()).build();
-var sql = "case when (" + SqlUtils.translateStatementWithQuotes(commRestrictionCond) + ") then 'true' else 'false' end";
+var sql = SqlBuilder.caseWhen(new CommunicationSettingsCondition().address().rejected().existSettings().buildCondition())
+ .thenString("true")
+ .elseString("false")
+ .build();
result.string(sql);
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index 1cd209bbe24e5d306cd48ea4ee0b2fe208fad318..8d06b2a2c21234c506eb4576631b93a53453ee02 100644
--- a/entity/Letter_entity/Letter_entity.aod
+++ b/entity/Letter_entity/Letter_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Letter_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Letter_entity/documentation.adoc</documentation>
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index 059c91250db6c8663797945a0a537cc699c7307e..5337d8f6ea078d4bc6c10a58e6489a3860f876c5 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>LogHistory_entity</name>
<title>Log</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -39,92 +39,6 @@
<entityProvider>
<name>LogHistoryProvider</name>
<documentation>%aditoprj%/entity/LogHistory_entity/entityfields/loghistoryprovider/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
- <entityName>Person_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>093a40d9-9f20-4c2f-8b43-3eed39b6bede</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>58532bc9-e789-403d-91a5-832ac40d6a6e</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6caadcde-8fda-40cb-97e0-ae507beab9d7</name>
- <entityName>Offer_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f49eacab-f62c-4354-88eb-359cc92c2d44</name>
- <entityName>Order_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>de473d92-dbd3-4300-8887-163c997fcd62</name>
- <entityName>Contract_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>1c941565-b8ca-4805-a9d6-d49eb26a9801</name>
- <entityName>Product_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6d14d6dd-ce6e-464f-9132-3e10c1116246</name>
- <entityName>Task_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c7d97e89-6363-4ad3-8132-b5aeb7a0c98e</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>deef9cab-515b-423c-87df-1a57b3ee1ff2</name>
- <entityName>SerialLetter_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>dd4e11e2-696c-4066-88f7-1f81b06e565a</name>
- <entityName>Leadimport_entity</entityName>
- <fieldName>LogHistoryC</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3426c963-c46f-48a1-96e8-8176b5b093c4</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>fd46379e-f1be-4a9e-9914-4f3f81d96ad5</name>
- <entityName>District_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e97b5f2d-d2e0-4539-96e9-e3f96107ffaa</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>tablenames_param</name>
diff --git a/entity/MSTTeamLink_entity/MSTTeamLink_entity.aod b/entity/MSTTeamLink_entity/MSTTeamLink_entity.aod
index 3660a3783e7130d2d9c515823b0bf6dd58b9628f..799395a268157c689401283deaa3e9bc06aaaa05 100644
--- a/entity/MSTTeamLink_entity/MSTTeamLink_entity.aod
+++ b/entity/MSTTeamLink_entity/MSTTeamLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>MSTTeamLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTTeamLink_entity/documentation.adoc</documentation>
diff --git a/entity/MSTTeamMember_entity/MSTTeamMember_entity.aod b/entity/MSTTeamMember_entity/MSTTeamMember_entity.aod
index 3c692264449930b67d31618a638c5c7aeb10245f..afae0bf21456527fb0dc3bc68f8adb543dcd85fe 100644
--- a/entity/MSTTeamMember_entity/MSTTeamMember_entity.aod
+++ b/entity/MSTTeamMember_entity/MSTTeamMember_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>MSTTeamMember_entity</name>
<title>Member</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -10,12 +10,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>335d30c4-7beb-4dcb-8a0f-de85108530a9</name>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CONTACT_ID</name>
@@ -70,14 +64,6 @@
<entityProvider>
<name>MembersOfTeam</name>
<documentation>%aditoprj%/entity/MSTTeamMember_entity/entityfields/membersofteam/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>37854fde-c4ae-4f56-82df-14385717f82e</name>
- <entityName>MSTTeam_entity</entityName>
- <fieldName>TeamMembers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>ObjectRowId_param</name>
diff --git a/entity/MSTTeam_entity/MSTTeam_entity.aod b/entity/MSTTeam_entity/MSTTeam_entity.aod
index 16929c27f7d6349825f5f3cfb85851fb493da0b5..d210c614240826ec1ce967ccbc49475f9bca0e22 100644
--- a/entity/MSTTeam_entity/MSTTeam_entity.aod
+++ b/entity/MSTTeam_entity/MSTTeam_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>MSTTeam_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTTeam_entity/documentation.adoc</documentation>
@@ -104,14 +104,6 @@
<name>TeamsByIdAndName</name>
<lookupIdfield>TEAMID_AND_NAME</lookupIdfield>
<documentation>%aditoprj%/entity/MSTTeam_entity/entityfields/teamsbyidandname/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>e48136a2-5f66-4399-903a-cd1363fa30c6</name>
- <entityName>MSTTeamLink_entity</entityName>
- <fieldName>Teams</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>UseCache_param</name>
diff --git a/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod b/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
index 5a3b3cc6b813e48b8674a6acb8e1000a42f4f4a6..cd48a813bf263d150a7f6eba7d19fed0ff9cc38f 100644
--- a/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
+++ b/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>MSTeamsActivityImport_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTeamsActivityImport_entity/documentation.adoc</documentation>
diff --git a/entity/MSTeamsChannel_entity/MSTeamsChannel_entity.aod b/entity/MSTeamsChannel_entity/MSTeamsChannel_entity.aod
index 88467d44647314dcfe53fa5d31f47142bf79944d..f61de16eed00b99c9a5b9b6aefa844bba212004d 100644
--- a/entity/MSTeamsChannel_entity/MSTeamsChannel_entity.aod
+++ b/entity/MSTeamsChannel_entity/MSTeamsChannel_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>MSTeamsChannel_entity</name>
<title>Channel</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -22,20 +22,6 @@
<entityProvider>
<name>ChannelsForTeam</name>
<documentation>%aditoprj%/entity/MSTeamsChannel_entity/entityfields/channelsforteam/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>a784ee43-b2ef-4d55-a092-9c7f822905fa</name>
- <entityName>MSTeamsActivityImport_entity</entityName>
- <fieldName>Channels</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c2b60ab3-3edd-4571-b9aa-766826f561fd</name>
- <entityName>MSTTeam_entity</entityName>
- <fieldName>Channels</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>TeamId_param</name>
@@ -46,14 +32,6 @@
<name>ChannelsByName</name>
<lookupIdfield>CHANNELNAME</lookupIdfield>
<documentation>%aditoprj%/entity/MSTeamsChannel_entity/entityfields/channelsbyname/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>3dfb5be2-d956-4e8a-9aec-4c80b81e0527</name>
- <entityName>MSTeamsDocument_entity</entityName>
- <fieldName>Channels</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod b/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod
index 6ba0493ae1f7e53e1929d69f92b7ba88a086e031..07c7f724cd85d1961540f848750302b1b62a21ad 100644
--- a/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod
+++ b/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>MSTeamsDocument_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTeamsDocument_entity/documentation.adoc</documentation>
diff --git a/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod b/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
index eb9b4954def6f93d5f51650148618ae46813bae6..f5052112279071f8c8927dd0542f6d45f19b942a 100644
--- a/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
+++ b/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>MSTeamsMessage_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MSTeamsMessage_entity/documentation.adoc</documentation>
@@ -25,18 +25,6 @@
<name>Messages</name>
<documentation>%aditoprj%/entity/MSTeamsMessage_entity/entityfields/messages/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>89048e4d-32bc-4531-9b45-b0c0d9de82b1</name>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c79dc4f8-df40-47ba-9baa-b6a64c00f46c</name>
- <entityName>MSTeamsActivityImport_entity</entityName>
- <fieldName>Messages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
diff --git a/entity/MailLog_entity/MailLog_entity.aod b/entity/MailLog_entity/MailLog_entity.aod
index 37a6fcbb87d0ffe78e25a1818ff8b9d15ba206af..431f9c0c316beb11581af1068a2414a2643814a2 100644
--- a/entity/MailLog_entity/MailLog_entity.aod
+++ b/entity/MailLog_entity/MailLog_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>MailLog_entity</name>
<title>Maillog</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -78,14 +78,6 @@
</entityParameter>
<entityProvider>
<name>MailLogs</name>
- <dependencies>
- <entityDependency>
- <name>f089388e-d3b7-49b5-bcb6-69de2229b1d3</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>MailLogs</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -108,7 +100,7 @@
<onActionProcess>%aditoprj%/entity/MailLog_entity/entityfields/recipientactions/children/downloademl/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="true" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
</entityActionField>
</children>
</entityActionGroup>
@@ -181,7 +173,6 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>BCC_EMAIL.value</name>
- <recordfield>MAIL_LOG.BCC_EMAIL</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.displayValue</name>
diff --git a/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod b/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod
index 272d727e2b88e8dba72f92d5d0cfc8fbb446b988..1cc1dc569cc5cb86c7d03a8ab16528fdff12e050 100644
--- a/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod
+++ b/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>MarketingWorkflowLauncher_entity</name>
<title>Marketing workflow</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/MemberRoles_entity/MemberRoles_entity.aod b/entity/MemberRoles_entity/MemberRoles_entity.aod
index 969210f822a52c5972b08f8f8c7512f2f5e18b10..39185cc9c1da38f3c2f91b7b3777e6aecf7ad2c4 100644
--- a/entity/MemberRoles_entity/MemberRoles_entity.aod
+++ b/entity/MemberRoles_entity/MemberRoles_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>MemberRoles_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/MemberRoles_entity/documentation.adoc</documentation>
@@ -21,14 +21,6 @@
<entityProvider>
<name>ByCategory</name>
<lookupIdfield>KEYID</lookupIdfield>
- <dependencies>
- <entityDependency>
- <name>94956ddd-5ad8-47a9-8709-cf66da8e497d</name>
- <entityName>Member_entity</entityName>
- <fieldName>KeywordMemberRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>UsageFilter_param</name>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 1db580cf75752e04b8a82ba431f103da3b9ce518..97b8ff6f214851a906f1b612b6a4ab69cf5e482e 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Member_entity</name>
<title>${SALESPROJECT_MEMBER}</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -185,14 +185,6 @@
<targetContextField>TARGETCONTEXT</targetContextField>
<targetIdField>CONTACT_ID</targetIdField>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>efeb191c-dd03-46e1-b176-c4e0c2f75fc5</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>MemberConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>ICON</name>
@@ -226,7 +218,7 @@
<name>createTeam</name>
<title>Create Team</title>
<onActionProcess>%aditoprj%/entity/Member_entity/entityfields/msteamsactiongroup/children/createteam/onActionProcess.js</onActionProcess>
- <isSelectionAction v="false" />
+ <selectionType>UNBOUND</selectionType>
<iconId>NEON:PLUS</iconId>
<state>EDITABLE</state>
<stateProcess>%aditoprj%/entity/Member_entity/entityfields/msteamsactiongroup/children/createteam/stateProcess.js</stateProcess>
@@ -278,14 +270,6 @@
<entityProvider>
<name>TeamMemberProvider</name>
<lookupIdfield>CONTACT_ID</lookupIdfield>
- <dependencies>
- <entityDependency>
- <name>373a0c5c-dff5-4a6d-9a1f-68d7b73804ce</name>
- <entityName>MSTTeamMember_entity</entityName>
- <fieldName>ProjectMembers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>MSTTeamId_param</name>
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index f799c2ef9b653646252b369d8a81e6996a4471a9..c380d83ddbdc22a178ddbe7f1bbcaa147e1e0ece 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ModuleTree_entity</name>
<title>History</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -26,26 +26,6 @@
<targetContextField>TYPE</targetContextField>
<targetIdField>ROW_ID</targetIdField>
<recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7da88ffb-4292-4fe2-88e2-dda2dc4aa625</name>
- <entityName>Task_entity</entityName>
- <fieldName>ModuleTrees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>70e2ea81-1e08-47a6-ac89-3164bdbd9e02</name>
- <entityName>Activity_entity</entityName>
- <fieldName>ModuleTrees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3132e321-3b6a-4828-b600-01897ae83646</name>
- <entityName>SupportTicket_entity</entityName>
- <fieldName>ModuleTrees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContextName_param</name>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index a6d76f43b45ddca29ebe511c0aaba259817c1e1e..494d9bcb8bb3bb1e0d9a3be80e0a0db20de09761 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Notification_entity</name>
<title>Notifications</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -98,7 +98,7 @@
<title>Archive</title>
<description></description>
<onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:ARCHIVE</iconId>
<tooltip></tooltip>
<tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archive/tooltipProcess.js</tooltipProcess>
@@ -108,7 +108,7 @@
<title>set Read</title>
<description></description>
<onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:OPEN_BOOK</iconId>
<tooltip></tooltip>
<tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js</tooltipProcess>
@@ -118,7 +118,7 @@
<title>set New</title>
<description></description>
<onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:BOOK</iconId>
<tooltip></tooltip>
<tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/tooltipProcess.js</tooltipProcess>
diff --git a/entity/ObjectProxy_entity/ObjectProxy_entity.aod b/entity/ObjectProxy_entity/ObjectProxy_entity.aod
index 71ef1a617e9be009da686d4da8c5d16f587760b3..de754623cf36e1b09bf1034ab63637df6592e614 100644
--- a/entity/ObjectProxy_entity/ObjectProxy_entity.aod
+++ b/entity/ObjectProxy_entity/ObjectProxy_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ObjectProxy_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ObjectProxy_entity/documentation.adoc</documentation>
@@ -19,32 +19,6 @@
<name>FilteredObjects</name>
<targetConsumerProcess>%aditoprj%/entity/ObjectProxy_entity/entityfields/filteredobjects/targetConsumerProcess.js</targetConsumerProcess>
<documentation>%aditoprj%/entity/ObjectProxy_entity/entityfields/filteredobjects/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>92e21c48-19aa-402c-b75f-96cad75d8a14</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2aab6429-6fd4-4745-b3ad-8c31862feb0d</name>
- <entityName>WorkflowTask_entity</entityName>
- <fieldName>LinkedObject</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ccc805b6-14ea-457c-956d-8c025e178936</name>
- <entityName>Observation_entity</entityName>
- <fieldName>ObjectProxyConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9d75842d-0f91-4ddf-bd94-d8f092f17224</name>
- <entityName>KnowledgeLink_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>Filter_param</name>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 3ed24f67b2903c81146143771493d99ded25fb2c..09c648f8e1aec8811f74c4f8b570bfbfbcd47d17 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ObjectRelationType_entity</name>
<title>Relation Type</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -30,14 +30,6 @@
</entityParameter>
<entityProvider>
<name>ObjectRelationTypes</name>
- <dependencies>
- <entityDependency>
- <name>81f4567a-fc89-49fc-be86-77600cb66305</name>
- <entityName>ObjectTree_entity</entityName>
- <fieldName>ObjectRelationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>OnlyFirstSide_param</name>
@@ -145,7 +137,7 @@
<title>Delete all usage</title>
<onActionProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/removeactiongroup/children/removeusage/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>NEON:TRASH</iconId>
</entityActionField>
</children>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 462a0a7c1575adc31562f0b6d1ce1965be3f8a34..0da39a07ebb8d5c54df0f7d2ee79529a4714e960 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ObjectTree_entity</name>
<title>Object relation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -19,20 +19,6 @@
<targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>TARGET_ID</targetIdField>
<documentation>%aditoprj%/entity/ObjectTree_entity/entityfields/treeprovider/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>ObjectTrees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>423acf79-e2c5-46e4-9fb5-7b1a7078d4f4</name>
- <entityName>Person_entity</entityName>
- <fieldName>ObjectTrees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Uid_param</name>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 860935ef74c48b42e5dc6379fd4c7b76d3c8fac1..6aba8ccb6be6887bd1cc524a12613d8e02f39848 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Object_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
@@ -27,44 +27,6 @@
<targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/allobjects/targetConsumerProcess.js</targetConsumerProcess>
<documentation>%aditoprj%/entity/Object_entity/entityfields/allobjects/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>445b79b3-e826-40d1-b6c2-46d62daf0818</name>
- <entityName>TaskLink_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0a2aa5c9-1ba2-41bd-b5f4-3a761efbcf2e</name>
- <entityName>ActivityLink_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>564d43e8-a7d6-44a5-82a0-3443129d568c</name>
- <entityName>AppointmentLink_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>40bf3a74-2335-4925-9490-1404fa7c81f6</name>
- <entityName>Forecast_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8834387f-acf8-4d9f-80ec-45425622a3dd</name>
- <entityName>Competition_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>349f13ea-8b4c-4cc0-987c-ae1717855bc1</name>
- <entityName>Member_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ObjectType_param</name>
@@ -185,26 +147,6 @@
<entityProvider>
<name>FilteredObjects</name>
<targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/filteredobjects/targetConsumerProcess.js</targetConsumerProcess>
- <dependencies>
- <entityDependency>
- <name>e644a709-cc8f-425e-bef2-9c51eea9bbe9</name>
- <entityName>ObjectTree_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e93b8c8f-2575-4669-9e45-48d8382444ab</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6a7a34e0-22ae-4bd7-b762-84a332a0a937</name>
- <entityName>Order_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ExcludedObjectIds_param</name>
diff --git a/entity/ObservationMultiple_entity/ObservationMultiple_entity.aod b/entity/ObservationMultiple_entity/ObservationMultiple_entity.aod
index 2f9186f4f69144ae457fa6dcadbc871057f6643f..e60da1f9ce8ba8443d124ff9fc15ad0f3e6d1712 100644
--- a/entity/ObservationMultiple_entity/ObservationMultiple_entity.aod
+++ b/entity/ObservationMultiple_entity/ObservationMultiple_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>ObservationMultiple_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/ObservationMultiple_entity/documentation.adoc</documentation>
@@ -109,7 +109,6 @@
<children>
<entityParameter>
<name>Blacklist_param</name>
- <valueProcess>%aditoprj%/entity/ObservationMultiple_entity/entityfields/contexts/children/blacklist_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>InvertBlacklist_param</name>
diff --git a/entity/ObservationMultiple_entity/entityfields/contexts/children/blacklist_param/valueProcess.js b/entity/ObservationMultiple_entity/entityfields/contexts/children/blacklist_param/valueProcess.js
deleted file mode 100644
index c40747f7e7256dd47edf175310a55a6b7293c3a3..0000000000000000000000000000000000000000
--- a/entity/ObservationMultiple_entity/entityfields/contexts/children/blacklist_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("Observation_lib");
-import("system.vars");
-import("system.result");
-
-result.object(Observation.getContextFields(vars.get("$field.OBSERVATION_ID")));
\ No newline at end of file
diff --git a/entity/Observation_entity/Observation_entity.aod b/entity/Observation_entity/Observation_entity.aod
index 56b10c9389cc18e4ed0b4746638d4101a50874d1..e69c04a5bb10203a45c74ee574f84a18567d3231 100644
--- a/entity/Observation_entity/Observation_entity.aod
+++ b/entity/Observation_entity/Observation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Observation_entity</name>
<title>Observation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -205,7 +205,7 @@
<name>addDependency</name>
<title>Add Dependency</title>
<onActionProcess>%aditoprj%/entity/Observation_entity/entityfields/filteractions/children/adddependency/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<stateProcess>%aditoprj%/entity/Observation_entity/entityfields/filteractions/children/adddependency/stateProcess.js</stateProcess>
</entityActionField>
</children>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 366ab837e4a18e3389668292f3833b4f8649d8fb..de9acec82189efcfea075993420736b72dd9932f 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Offer_entity</name>
<title>Offer</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -20,20 +20,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>f909c251-16c1-49e2-9b43-6d5f834137c6</name>
- <entityName>Object_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b34efdc3-f405-4fe6-b9c6-ed79f8f10155</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CURRENCY</name>
@@ -376,26 +362,6 @@
</entityConsumer>
<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>
@@ -711,14 +677,6 @@
<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>
@@ -1106,7 +1064,7 @@
<name>startWorkflow</name>
<title>Start workflow</title>
<onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/startworkflow/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:PLAY</iconId>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/startworkflow/stateProcess.js</stateProcess>
</entityActionField>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index d8cfad37c1414399ff010ec3dd1724b82b24c47c..f6360e58a26d1723764e7a5743546bc307f4c78d 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Offeritem_entity</name>
<title>Offeritem</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -74,7 +74,6 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/price/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
@@ -169,14 +168,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>
diff --git a/entity/Offeritem_entity/entityfields/price/valueProcess.js b/entity/Offeritem_entity/entityfields/price/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index ee6027f697bb10bf67ac23b37c331c5e2cc02ed8..52f23b22af4c514748e990d5ec4e339cee9df71c 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Order_entity</name>
<title>Receipt</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -17,32 +17,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>95e7ab85-0af9-46ea-a50a-7719833acd2a</name>
- <entityName>Object_entity</entityName>
- <fieldName>Orders</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>683107cc-2908-4930-8581-d3636f9ec196</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Orders</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bfc738ad-8af3-4d2b-9ed5-b3ca2212bb9e</name>
- <entityName>Person_entity</entityName>
- <fieldName>Orders</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b9cdee36-bfa3-4682-9a1d-26996dd6a5c2</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Orders</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CURRENCY</name>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 054bfac329c06b0fd0e546eb3176521adecb0b49..6c64a71bd8933f478df1a83f0b104929ca9f4c7e 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Orderitem_entity</name>
<title>Orderitem</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -141,20 +141,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>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index d851c8dec53bebe5cea879c60586c91464788af6..0e41e000d34f890458d7d18448576d2295aac488 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Organisation_entity</name>
<title>Company</title>
<description>former Org</description>
@@ -51,7 +51,7 @@
<entityField>
<name>NAME</name>
<title>Name</title>
- <contentType>LONG_TEXT</contentType>
+ <contentType>TEXT</contentType>
<mandatory v="true" />
</entityField>
<entityField>
@@ -137,80 +137,6 @@
<name>Organisations</name>
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisations/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>85aa363e-d8ba-4df5-8422-bf7aff86a4f8</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2eb60a6e-575c-4579-9278-5868ffe4bc75</name>
- <entityName>Product_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>be92b8cc-2cba-409c-b139-2b7cc8b567e6</name>
- <entityName>DSGVOInfo_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>308bf57b-0e80-48a7-be13-8cf0d5005118</name>
- <entityName>VisitPlanEntry_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>cbb5b03c-8c47-4aff-8f95-172216d2eff6</name>
- <entityName>VisitRecommendation_entity</entityName>
- <fieldName>OrganisationConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>36d6824f-8f2f-4207-9dde-60f0b8f08815</name>
- <entityName>District_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b64b29e6-59c5-4250-9bc7-b08c85976e7e</name>
- <entityName>DistrictContact_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6a81a15e-2015-48d6-9f69-0a032b4d5507</name>
- <entityName>CampaignParticipant_entity</entityName>
- <fieldName>OrganisationConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>fa1b6124-1e00-4fa0-8c04-debc19f58d95</name>
- <entityName>DuplicatePerson_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>640a8509-1972-4dc5-980e-68832f1c03c5</name>
- <entityName>Planning_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3ceb7668-285a-4169-b71a-b64edc206b34</name>
- <entityName>OrganisationsMultiEdit_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>75b4de32-4fd6-4223-80f5-908aeb533577</name>
- <entityName>Turnover_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>WithPrivate_param</name>
@@ -331,38 +257,6 @@
</entityConsumer>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>1a472ca0-4d27-453c-8de5-a046b86f22fb</name>
- <entityName>Object_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c79dd08b-8f62-4514-836b-2e176460000c</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>OrganisationConditions</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>49db6b8b-c27d-4e52-b456-ad48405cc246</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6a11ffa0-a226-436a-9831-4dc02380e715</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>271c43f9-8807-4439-9ab4-906fbf019475</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>OrganisationConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>Documents</name>
@@ -658,26 +552,6 @@
<entityProvider>
<name>WithPersonIdFilter</name>
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/withpersonidfilter/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>5a456b04-f0ca-4a45-9c1f-bdfdf074434a</name>
- <entityName>Contact_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a80c3db0-29db-433c-8f7c-4ebf6639ad6d</name>
- <entityName>Person_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>748a3083-89c2-41b4-a233-3fd5364396e9</name>
- <entityName>Competition_entity</entityName>
- <fieldName>Organisation</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
@@ -728,20 +602,6 @@
<entityProvider>
<name>WithAttribute</name>
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/withattribute/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>10480df2-f0b6-4cb6-8bfb-4a468b994996</name>
- <entityName>Competition_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f368be61-1a15-449f-b37c-b1343069412c</name>
- <entityName>Product_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>AttributeId_param</name>
@@ -1022,14 +882,6 @@
<name>OrganisationsViaIndex</name>
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/organisationsviaindex/documentation.adoc</documentation>
<recordContainer>index</recordContainer>
- <dependencies>
- <entityDependency>
- <name>e60b8983-166d-4280-a1a5-f990ad77eeb9</name>
- <entityName>AroundLocation_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
@@ -1283,7 +1135,7 @@
<title>Add to Campaign</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="false" />
+ <selectionType>UNBOUND</selectionType>
<iconId>NEON:GROUP_APPOINTMENT</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js</stateProcess>
<tooltip>Add the selection to a campaign</tooltip>
@@ -1331,7 +1183,7 @@
<title>Create planning</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addplanningtoorganisations/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="false" />
+ <selectionType>UNBOUND</selectionType>
<iconId>VAADIN:MONEY</iconId>
</entityActionField>
</children>
@@ -1390,7 +1242,7 @@
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/openaroundlocation/documentation.adoc</documentation>
<title>Radius Search</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openaroundlocation/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:LOCATION_ARROW_CIRCLE_O</iconId>
<state>DISABLED</state>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/openaroundlocation/stateProcess.js</stateProcess>
diff --git a/entity/OrganisationsMultiEdit_entity/OrganisationsMultiEdit_entity.aod b/entity/OrganisationsMultiEdit_entity/OrganisationsMultiEdit_entity.aod
index e423affb316335725d90383e14ea11ee28bc6c9f..2ba2c4ea5fffa163031ef5ed32650d9d4f15843c 100644
--- a/entity/OrganisationsMultiEdit_entity/OrganisationsMultiEdit_entity.aod
+++ b/entity/OrganisationsMultiEdit_entity/OrganisationsMultiEdit_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>OrganisationsMultiEdit_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/OrganisationsMultiEdit_entity/documentation.adoc</documentation>
@@ -7,14 +7,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>ce007a14-f543-4959-81d6-145590e12a72</name>
- <entityName>PlanningAddToOrganisations_entity</entityName>
- <fieldName>Organisations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/PermissionAction_entity/PermissionAction_entity.aod b/entity/PermissionAction_entity/PermissionAction_entity.aod
index 88bf81393497716ef1aff171175fafd687c31d4a..63f9c0c639b2a8b731d9ae85b1df09d993bad720 100644
--- a/entity/PermissionAction_entity/PermissionAction_entity.aod
+++ b/entity/PermissionAction_entity/PermissionAction_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>PermissionAction_entity</name>
<title>Action</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -23,14 +23,6 @@
<entityProvider>
<name>PermissionActions</name>
<recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>c92e552c-6d88-4fe1-918f-1a9a71ea28ad</name>
- <entityName>PermissionDetail_entity</entityName>
- <fieldName>PermissionActions</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>PermissionDetails</name>
diff --git a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
index c21dd398145e59c0b1391486cfd18f2540199db6..71412a63c277e5c84b4a457d6482e5e69441d0c7 100644
--- a/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+++ b/entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>PermissionCalendar_entity</name>
<title>Calendar Permission</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -95,7 +95,7 @@
<onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactions/children/receivenewuserpermissiondealeraction/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="false" />
- <isSelectionAction v="false" />
+ <selectionType>UNBOUND</selectionType>
<iconId>VAADIN:USER</iconId>
<state>AUTO</state>
<tooltip></tooltip>
@@ -113,20 +113,6 @@
<entityProvider>
<name>Permissions</name>
<titlePluralProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissions/titlePluralProcess.js</titlePluralProcess>
- <dependencies>
- <entityDependency>
- <name>5bf53339-4c8d-4285-8af2-2aead61d3e38</name>
- <entityName>Employee_entity</entityName>
- <fieldName>MyPermission</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>890d8d97-2ff5-425b-9987-0adbd90e608e</name>
- <entityName>Employee_entity</entityName>
- <fieldName>TheirPermissions</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>PermissionProcurer_param</name>
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index 9fc1e645aeb101610c4a37985388a857ac79896a..37e1d2cb8c9de829dd024f85d82c3f4177da9763 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>PermissionDetail_entity</name>
<title>Permission Detail</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -88,26 +88,6 @@
<entityProvider>
<name>Permissions</name>
<recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>b1a6483c-e7b1-4eb7-aa22-d0e9d0ef0b49</name>
- <entityName>Role_entity</entityName>
- <fieldName>TheirPermissions</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>cc0e9a4d-5d82-4407-bc4e-698dcfae5c86</name>
- <entityName>PermissionMetaData_entity</entityName>
- <fieldName>PermissionDetails</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>62a56e76-d049-4c53-a439-79261a8058e1</name>
- <entityName>PermissionAction_entity</entityName>
- <fieldName>PermissionDetails</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>RoleName_param</name>
@@ -196,7 +176,6 @@
</entityParameter>
<entityParameter>
<name>Field_param</name>
- <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/permissionactions/children/fieldtype_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>EntityTitle_param</name>
diff --git a/entity/PermissionDetail_entity/entityfields/permissionactions/children/fieldtype_param/valueProcess.js b/entity/PermissionDetail_entity/entityfields/permissionactions/children/fieldtype_param/valueProcess.js
deleted file mode 100644
index 52bd0deb2169ccfd1f5d531869b4e2fe4304d298..0000000000000000000000000000000000000000
--- a/entity/PermissionDetail_entity/entityfields/permissionactions/children/fieldtype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.FIELD"));
\ No newline at end of file
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index c611be5a933d6bf1bae16636842e63a4bbf2ae4e..f18de305ef76fec75cb578c506f50285e4be2b75 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>PermissionMetaData_entity</name>
<title>Permission</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -32,14 +32,6 @@
<entityProvider>
<name>MetaData</name>
<recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>3b2c9421-5ff0-49a3-99f0-6790f17bd76c</name>
- <entityName>PermissionDetail_entity</entityName>
- <fieldName>MetaData</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>EntityName_param</name>
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index 16c9910812240e9439516b2d3daa4d37ca83f36c..10bcfbb8d783c2d4ecad6df05a0a4f9ca741f711 100644
--- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod
+++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>PermissionOverview_entity</name>
<title>Permission Overview</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -60,20 +60,6 @@
<entityProvider>
<name>PermissionOverviews</name>
<recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>b9f4df41-74e9-41d2-bfe6-1427ae7c8c36</name>
- <entityName>Role_entity</entityName>
- <fieldName>PermissionOverviews</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ac8eb318-8d26-43a0-9463-e1c3741c7710</name>
- <entityName>PermissionMetaData_entity</entityName>
- <fieldName>PermissionOverviews</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>RoleName_param</name>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 1426af8122b324117a06abacfc727d9d6882f1b5..140a64eb357e66448cc28d54984188507d28f9bb 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Person_entity</name>
<title>Contact</title>
<description>former Pers</description>
@@ -142,14 +142,6 @@
<name>OrganisationRelated</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/organisationrelated/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>41952879-c2f0-411f-8ca1-36c38914a629</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Contact</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -290,32 +282,6 @@
</entityConsumer>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>ec66d6b0-a1fa-40a1-9612-34775d3e89a9</name>
- <entityName>Object_entity</entityName>
- <fieldName>Persons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a8f2893b-fce7-4a55-97d4-f19ec83f9bdb</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Persons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4baa56bc-f570-4c19-81b9-4ed9ba7f0cfb</name>
- <entityName>VisitRecommendation_entity</entityName>
- <fieldName>PersonConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>befbfd87-c065-4a4b-9d1e-8de8fba87302</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>PersonConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>LANGUAGE</name>
@@ -376,20 +342,6 @@
<name>Contact</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/contact/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>f925c8e6-b096-4093-bd39-c9cd30a6a71a</name>
- <entityName>Lead_entity</entityName>
- <fieldName>ContactId</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9c5ade71-e56c-4684-95f1-151a47175797</name>
- <entityName>CampaignParticipant_entity</entityName>
- <fieldName>PersonConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>OrgId_param</name>
@@ -729,32 +681,6 @@
<entityProvider>
<name>Contacts</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/contacts/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>c98da62f-d6b2-4ddb-9101-92e9a60abdfb</name>
- <entityName>VisitPlanEmployeeWeek_entity</entityName>
- <fieldName>Persons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f56b1378-138d-4f88-b9df-274adce9f90c</name>
- <entityName>VisitPlanEntry_entity</entityName>
- <fieldName>Persons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6854e035-f459-41b2-84f8-9f5cca5dbe80</name>
- <entityName>DistrictResponsible_entity</entityName>
- <fieldName>Persons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>fe217f3a-edb1-4972-b8f6-c8b517a34a48</name>
- <entityName>DSGVOConfiguration_entity</entityName>
- <fieldName>Persons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -960,14 +886,6 @@
<name>QuickEntryContacts</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/quickentrycontacts/documentation.adoc</documentation>
<titlePlural>Additional Contacts</titlePlural>
- <dependencies>
- <entityDependency>
- <name>6d137850-63ba-4be0-9ca5-1464e71d4f77</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -1018,14 +936,6 @@
<entityProvider>
<name>IdFilteredActiveContacts</name>
<documentation>%aditoprj%/entity/Person_entity/entityfields/idfilteredactivecontacts/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>511f3e4c-7493-4a31-a136-0ba80ba2ec85</name>
- <entityName>Member_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ExcludedContactIds_param</name>
@@ -1110,14 +1020,6 @@
</entityConsumer>
<entityProvider>
<name>ebdb88f5-f030-426c-b261-9f3828d19356</name>
- <dependencies>
- <entityDependency>
- <name>511f3e4c-7493-4a31-a136-0ba80ba2ec85</name>
- <entityName>Member_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>Orders</name>
@@ -1192,7 +1094,7 @@
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="false" />
- <isSelectionAction v="false" />
+ <selectionType>UNBOUND</selectionType>
<iconId>NEON:GROUP_APPOINTMENT</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js</stateProcess>
<tooltip>Add the selection to a campaign</tooltip>
diff --git a/entity/PlanningAddToOrganisations_entity/PlanningAddToOrganisations_entity.aod b/entity/PlanningAddToOrganisations_entity/PlanningAddToOrganisations_entity.aod
index c6e7d28790268007293d698ed1ed73275e0d1341..c26311d3b6f225aad5a2a320faf5897412efd373 100644
--- a/entity/PlanningAddToOrganisations_entity/PlanningAddToOrganisations_entity.aod
+++ b/entity/PlanningAddToOrganisations_entity/PlanningAddToOrganisations_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>PlanningAddToOrganisations_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PlanningAddToOrganisations_entity/documentation.adoc</documentation>
diff --git a/entity/PlanningChangeStatusAndResponsible_entity/PlanningChangeStatusAndResponsible_entity.aod b/entity/PlanningChangeStatusAndResponsible_entity/PlanningChangeStatusAndResponsible_entity.aod
index 9810a9260ea975aaf566713047ef9db3ba016093..462141c2bfdd33d6f9987c9fb8b9c23d37d70295 100644
--- a/entity/PlanningChangeStatusAndResponsible_entity/PlanningChangeStatusAndResponsible_entity.aod
+++ b/entity/PlanningChangeStatusAndResponsible_entity/PlanningChangeStatusAndResponsible_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>PlanningChangeStatusAndResponsible_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/PlanningChangeStatusAndResponsible_entity/documentation.adoc</documentation>
diff --git a/entity/Planning_entity/Planning_entity.aod b/entity/Planning_entity/Planning_entity.aod
index d398750ab2f311e3ff30b101d4c691a9c11af698..3590d75c3ba3df99c0ab8604205510803ef39af3 100644
--- a/entity/Planning_entity/Planning_entity.aod
+++ b/entity/Planning_entity/Planning_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Planning_entity</name>
<title>Planning</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -108,26 +108,6 @@
</entityField>
<entityProvider>
<name>Plannings</name>
- <dependencies>
- <entityDependency>
- <name>73fab37a-74bc-452d-a1ec-ea1c53204468</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Plannings</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9ddd5d69-72df-46f7-b42a-f08f08a2c8cd</name>
- <entityName>PlanningAddToOrganisations_entity</entityName>
- <fieldName>PlanningsAlreadyExists</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c022c816-85eb-4112-95fe-7cbcab96e128</name>
- <entityName>PlanningAddToOrganisations_entity</entityName>
- <fieldName>PlanningsNew</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>ContactId_param</name>
@@ -195,7 +175,7 @@
<title>Change responsible</title>
<onActionProcess>%aditoprj%/entity/Planning_entity/entityfields/filterviewactions/children/changeresponsible/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:USER</iconId>
</entityActionField>
<entityActionField>
@@ -203,7 +183,7 @@
<title>Change status</title>
<onActionProcess>%aditoprj%/entity/Planning_entity/entityfields/filterviewactions/children/changestatus/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:CHECK_SQUARE_O</iconId>
</entityActionField>
</children>
diff --git a/entity/PrivatePerson_entity/PrivatePerson_entity.aod b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
index 67d65775c2f3ffe527aa14ef30497695aa3f7316..9ab398fbfae79b4e6ee63e96d6f936aa610bf062 100644
--- a/entity/PrivatePerson_entity/PrivatePerson_entity.aod
+++ b/entity/PrivatePerson_entity/PrivatePerson_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>PrivatePerson_entity</name>
<title>Private person</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -9,14 +9,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>805b77bd-2728-4979-9503-95760ebb6b49</name>
- <entityName>Object_entity</entityName>
- <fieldName>PrivatePersons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>PERSONID</name>
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 56050bde20f8453297db4f0728dc93d0f8c05734..a011d4d458c4e1fcc00eb9b9b6180ea1c09e483c 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Prod2prod_entity</name>
<title>Parts list</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -60,14 +60,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>
@@ -94,7 +86,7 @@
<name>insert</name>
<title>New child product</title>
<onActionProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/alter/children/insert/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:FILE_TREE_SMALL</iconId>
</entityActionField>
</children>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 6f96ef2d65fdb460ad70eb12e1f4b1a086ed1b9d..5c2b560db2635387908b47f0d0ee3953d844b353 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Product_entity</name>
<title>Product</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -172,32 +172,6 @@
<entityProvider>
<name>#PROVIDER</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>edd8a3af-d168-4a3b-871d-39db964c700b</name>
- <entityName>Offeritem_entity</entityName>
- <fieldName>Products</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e4ba4c26-a777-4560-ab68-311ffae76e2f</name>
- <entityName>Orderitem_entity</entityName>
- <fieldName>Products</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>760f179a-f37e-4bdf-af8f-d8935e86db0f</name>
- <entityName>Object_entity</entityName>
- <fieldName>Products</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6d0654ed-35f1-4de4-9cec-ad25f7ad43b6</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Products</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>ProductLinks</name>
@@ -352,32 +326,6 @@
</entityParameter>
<entityProvider>
<name>Products</name>
- <dependencies>
- <entityDependency>
- <name>1b12e8ef-74ba-4294-bd2b-9d4afa80798c</name>
- <entityName>Prod2prod_entity</entityName>
- <fieldName>Products</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0129066d-805c-4522-b1bc-9bbbc9588629</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Products</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>19171308-e523-438a-994c-9d6e7b58ee04</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Products</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>acbbb19a-16e6-4220-8997-4a79db85100a</name>
- <entityName>Order_entity</entityName>
- <fieldName>Products</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ExcludedProducts_param</name>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index d886179ed2215e5441f060fdf457548a9b4774fa..7281523593909679196a4c4ec765b483d63c76be 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Productprice_entity</name>
<title>Prices</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -149,26 +149,6 @@
<name>Productprices</name>
<titlePluralProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprices/titlePluralProcess.js</titlePluralProcess>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>d5f4c7c4-cd21-4075-bd56-c479672dc09a</name>
- <entityName>Product_entity</entityName>
- <fieldName>Productprices</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4efc927f-7441-480c-aaaa-36347e2e60c5</name>
- <entityName>Person_entity</entityName>
- <fieldName>Pricelists</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>dc9e2360-1769-41ec-b4ec-1a4c67013ef8</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Productprices</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index 943a7dd66a10c27ff2da1ee6672abfb865f83bf7..1811b49d9dd28dce1aeb65237e9b10c791f80300 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>QuickEntry_entity</name>
<title>Quick entry</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -17,7 +17,7 @@
<entityField>
<name>ORGANISATION_NAME</name>
<title>Company</title>
- <contentType>LONG_TEXT</contentType>
+ <contentType>TEXT</contentType>
<mandatoryProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/organisation_name/mandatoryProcess.js</mandatoryProcess>
</entityField>
<entityConsumer>
diff --git a/entity/RoleChildren_entity/RoleChildren_entity.aod b/entity/RoleChildren_entity/RoleChildren_entity.aod
index 353284819b7f5f9730cfcb8e16e6d7748ccc204c..f5d7e4d0001af34af75537fea85caf9f76f6c648 100644
--- a/entity/RoleChildren_entity/RoleChildren_entity.aod
+++ b/entity/RoleChildren_entity/RoleChildren_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>RoleChildren_entity</name>
<title>Child Role</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -29,14 +29,6 @@
<entityProvider>
<name>RoleChildrens</name>
<recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>cb55e16e-fd6c-4aa9-8bc5-151c7cd766c6</name>
- <entityName>Role_entity</entityName>
- <fieldName>RoleChildrens</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>Roles</name>
diff --git a/entity/RoleParent_entity/RoleParent_entity.aod b/entity/RoleParent_entity/RoleParent_entity.aod
index 86b569290664d1f362b0a808d39fe4a669ce07e5..adb2805123463810f497f8bb6af41d1e435bb628 100644
--- a/entity/RoleParent_entity/RoleParent_entity.aod
+++ b/entity/RoleParent_entity/RoleParent_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>RoleParent_entity</name>
<title>Parent Role</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -30,14 +30,6 @@
<entityProvider>
<name>RoleParents</name>
<recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>6aa59dd4-1193-47be-8b69-58c82a0d9daa</name>
- <entityName>Role_entity</entityName>
- <fieldName>RoleParents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>RoleId_param</name>
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index 956b66e51dfad38f8a28214fb7591790faeef497..bb4d3c0d11b0e9dec858fb7a19ce71896b60a984 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Role_entity</name>
<title>Roles</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -70,26 +70,6 @@
<entityProvider>
<name>Roles</name>
<recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>64d800d0-4db5-4b95-ab6a-9197b83cc09c</name>
- <entityName>PermissionDetail_entity</entityName>
- <fieldName>Roles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6d8db50e-e86f-4ebb-bb63-b520f84acca1</name>
- <entityName>RoleChildren_entity</entityName>
- <fieldName>Roles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>23ceb9b3-429c-4381-9ae2-bd23d9d08d42</name>
- <entityName>RoleParent_entity</entityName>
- <fieldName>Roles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ExcludeRoles_param</name>
@@ -104,20 +84,6 @@
</entityParameter>
<entityProvider>
<name>FilteredRoles</name>
- <dependencies>
- <entityDependency>
- <name>a31b8e4d-fa44-46ea-89a7-e3f9d659cfea</name>
- <entityName>EmployeeRole_entity</entityName>
- <fieldName>Roles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6d7b7a16-e958-4f9d-9108-81a42257d65e</name>
- <entityName>Employee_entity</entityName>
- <fieldName>PossibleRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>IS_ASSIGNABLE</name>
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index 1411e096a87c88026fbb8dde8a4ea90e73fdc0ec..b1f661d9798990a3df7adff1135cd920848e7d22 100644
--- a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
+++ b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>SalesprojectAnalyses_entity</name>
<title>Sales Project Analyses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod b/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod
index cc131683a1feb211ede261efd5b24770ed159b43..d0803f1b7a1ea699f13e9e2a66b74fca3f0dcd0b 100644
--- a/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod
+++ b/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>SalesprojectConversionRate_entity</name>
<title>Conversion Rate</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -10,14 +10,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>34de2519-ae79-4092-9f10-29727239804d</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>conversionrates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
diff --git a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
index e8af3acf65ceae7f227545812be139a5e11565fc..639fb185cecd50ebb2c5b42ca7ea193d657ce920 100644
--- a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
+++ b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>SalesprojectMilestone_entity</name>
<title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -92,14 +92,6 @@
</entityParameter>
<entityProvider>
<name>StateMilestones</name>
- <dependencies>
- <entityDependency>
- <name>f705534d-dcf3-4049-a1ea-3f75e93aa2f0</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectStateMilestones</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Kind_param</name>
@@ -109,14 +101,6 @@
</entityProvider>
<entityProvider>
<name>PhaseMilestones</name>
- <dependencies>
- <entityDependency>
- <name>b132527b-990c-416a-b2d6-ddbe6f4397e2</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectPhaseMilestones</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Kind_param</name>
diff --git a/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod b/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod
index 1731b121034ab58d7d2eb2c9f02a7ff12ef9fd6f..f0edc98a503d3148cc0d6084b10b2d3171db4e28 100644
--- a/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod
+++ b/entity/SalesprojectPhaseDefinition_entity/SalesprojectPhaseDefinition_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>SalesprojectPhaseDefinition_entity</name>
<title>Salesproject phases</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -53,12 +53,6 @@
<entityProvider>
<name>SalesprojectPhaseDefinitions</name>
<lookupIdfield>SALESPROJECTPHASETRAITDEFINITIONID</lookupIdfield>
- <dependencies>
- <entityDependency>
- <name>1d8760d0-186d-411d-a84e-dc82556ad722</name>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>ChecklistEntries</name>
diff --git a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
index 8bbdd874ccb3a760aa05be55f8269b54a6215e9c..6b56e6c4cfebc1119e80ddbe682a9d773b9cc115 100644
--- a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
+++ b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>SalesprojectPhase_entity</name>
<title>Phase</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -33,20 +33,6 @@
</entityField>
<entityProvider>
<name>Phases</name>
- <dependencies>
- <entityDependency>
- <name>22c52a24-f1ad-4035-9567-1b5e99c7b5be</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectPhaseStepper</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>26a15e56-6ce6-4d6a-9e46-793c10ac3aa6</name>
- <entityName>SalesprojectMilestone_entity</entityName>
- <fieldName>SalesProjectPhases</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 6621e3295e7e4c328cb55dee2b6b35decccc78e2..258c2c5bb899f248724f3f7cccc3932288b4568c 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>SalesprojectSource_entity</name>
<title>Touchpoint</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -14,14 +14,6 @@
<entityProvider>
<name>SalesprojectSouces</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>c1628437-2813-464f-b91c-71b1c6bb63a4</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectSources</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>SalesprojectId_param</name>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 2621b7ad1e323782be6b045d1b5650f0d7b91ae5..798fb3726313793717a9b073dc609a438112450b 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Salesproject_entity</name>
<title>Sales Project</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -23,20 +23,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>f010781d-453d-4df3-b330-75c1336e4d4c</name>
- <entityName>Object_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b53c4fc0-4ac9-4020-a6fd-359c6dd2d2c8</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>ENDDATE</name>
@@ -422,26 +408,6 @@
</entityField>
<entityProvider>
<name>Salesprojects</name>
- <dependencies>
- <entityDependency>
- <name>0925d17f-a26a-4641-aaf4-0f74796fefa7</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bdea1358-ebf2-4356-8df1-af3eb1e6338a</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>cb529e29-37cb-4e8d-9e89-f15cff56df68</name>
- <entityName>Order_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
@@ -482,14 +448,6 @@
</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>
@@ -686,14 +644,6 @@
</entityConsumer>
<entityProvider>
<name>QuickEntrySalesprojects</name>
- <dependencies>
- <entityDependency>
- <name>98389ad3-2134-4479-9e53-19623f05ae75</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>PhaseRequirementsFulfilled_parm</name>
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index b3181e070d98eda13c99a61241dd4c8bb9a8e7e2..a0dd011e9c266f022325d2536167df42492263b2 100644
--- a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
+++ b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>SalutationDistinct_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalutationDistinct_entity/documentation.adoc</documentation>
@@ -14,14 +14,6 @@
</entityField>
<entityProvider>
<name>Salutations</name>
- <dependencies>
- <entityDependency>
- <name>2f56ee5c-0f54-4d26-a4d8-a598c136967b</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>Salutations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>Language_param</name>
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index 967342e884d3c8323471238a7e58b891b08dde4b..79a829d056da4c57a4be980b0286696f43240bff 100644
--- a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
+++ b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>SalutationTitleDistinct_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalutationTitleDistinct_entity/documentation.adoc</documentation>
@@ -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>
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index 09ab3134e33c28818a418c5219f9f8ffbea238b8..4399dc9137d945e18598cf75a5795df1f4b63413 100644
--- a/entity/Salutation_entity/Salutation_entity.aod
+++ b/entity/Salutation_entity/Salutation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Salutation_entity</name>
<title>Salutation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -10,14 +10,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>d3915336-2a77-4456-9e59-869a7b8eb812</name>
- <entityName>QuickEntry_entity</entityName>
- <fieldName>Salutations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>SALUTATIONID</name>
diff --git a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
index 6109b0da0af9beceaa48ca285e4190ba1745554e..ab3393bc5bca0f248b29582231fcd73ad0eaf245 100644
--- a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
+++ b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>SerialLetterAddRecipients_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SerialLetterAddRecipients_entity/documentation.adoc</documentation>
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index 2e747b5209ad1e75e3d17ce1595d1ee92ff27934..3aa3b44fe5edd00375e1b1b881c2df8c5c6e2d67 100644
--- a/entity/SerialLetter_entity/SerialLetter_entity.aod
+++ b/entity/SerialLetter_entity/SerialLetter_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>SerialLetter_entity</name>
<title>Serial Letter</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -14,20 +14,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>8cb1a355-eb91-414a-8860-0210b18bd1ba</name>
- <entityName>SerialLetterAddRecipients_entity</entityName>
- <fieldName>SerialLetters</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>988dfd7a-dad6-440f-95d9-2288ba7de92e</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>SerialLetters</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>SERIALLETTERID</name>
diff --git a/entity/SingleObject_entity/SingleObject_entity.aod b/entity/SingleObject_entity/SingleObject_entity.aod
index c6b3b52e6d48e650d3b579fe99f38b6ddc2e84f4..a2aac325aa8fbcfbc7197287d175eedd7f1d606a 100644
--- a/entity/SingleObject_entity/SingleObject_entity.aod
+++ b/entity/SingleObject_entity/SingleObject_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>SingleObject_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index 1f3883abe85bdf5d1de98470cae7fb076cc4b905..fcbc51b11ba120b211ab3cc522dd8e36e197681d 100644
--- a/entity/Social_entity/Social_entity.aod
+++ b/entity/Social_entity/Social_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Social_entity</name>
<title>Social Media</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index d41f642e3ef523e7714df230e050a4e4b1891007..42fe08d7b6ac899cfe4558d854f05d3c28c172a1 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Stock_entity</name>
<title>Stock</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -53,20 +53,6 @@
<entityProvider>
<name>Stocks</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>aa9264c8-2c96-4a7a-94c7-e38bc0ae7df3</name>
- <entityName>Product_entity</entityName>
- <fieldName>Stocks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e6168337-2f0b-4135-be16-1a4fd1c2ff65</name>
- <entityName>Product_entity</entityName>
- <fieldName>StockCounts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>ProductId_param</name>
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index a82e8b8219ed27ae068e6c3630c6b37cc1deaa28..642c7b3f71299b97cc301237872980e5286aa9e6 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>SupportTicket_entity</name>
<title>Support Ticket</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -38,20 +38,6 @@
</entityActionGroup>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>71f2720a-a7d1-422e-8dc6-4e60d586c812</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>SupportTickets</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3190ea51-a767-436f-af75-869b43d0c568</name>
- <entityName>Object_entity</entityName>
- <fieldName>SupportTickets</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CODE</name>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index b78981407b37c38dbf1590f0f6e5f852109c2214..e31e30cb39ae827f24d9dc508de283cfea2d52b6 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>TaskLink_entity</name>
<title>Connection</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -39,20 +39,6 @@
<targetIdField>OBJECT_ROWID</targetIdField>
<documentation>%aditoprj%/entity/TaskLink_entity/entityfields/link/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>40cc8bcd-c178-4a77-a968-642e1d8e1f70</name>
- <entityName>Task_entity</entityName>
- <fieldName>Links</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>96ab81b2-20d1-4e30-8563-4b06d8406269</name>
- <entityName>SupportTicket_entity</entityName>
- <fieldName>Links</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>TaskId_param</name>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 4c1ec3f2dfaf5993c4e7afd21b7af88d6cf5d019..5b2912ed81b703846fe450e91b9abf3dffdc3fc6 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Task_entity</name>
<title>Task</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -39,14 +39,6 @@
<entityProvider>
<name>#PROVIDER</name>
<recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7a20f989-4c0a-40aa-9092-6ea9e99e851e</name>
- <entityName>Object_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>SUBJECT</name>
@@ -310,74 +302,6 @@
<entityProvider>
<name>Tasks</name>
<documentation>%aditoprj%/entity/Task_entity/entityfields/tasks/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>dd79df43-264c-494b-9c92-cadf19e61db6</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>dc29832e-15da-4f64-b17a-f1dd978ef47b</name>
- <entityName>Person_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c6507834-cd91-4202-bdf7-6566f968edb4</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>26b9b221-de02-40ef-a400-d4b5e356da0b</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b2bb448a-b647-40c8-baec-16356f3e23f5</name>
- <entityName>Order_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a93f1e7e-f929-438f-8f37-21e4af8b53b6</name>
- <entityName>Product_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2b0c15eb-fa9a-4ee8-a8b1-5d0f344ddad6</name>
- <entityName>Contract_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>335e31ad-ab67-4567-b4ea-3668f04922b2</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>fbaa2f6c-0ba1-4c93-acae-d7b636581679</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f2bd3784-3f43-4a23-8b58-0a25e0584178</name>
- <entityName>Leadimport_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0a5c7719-8f33-4647-a81d-02763c0df0a3</name>
- <entityName>ObjectProxy_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>RowId_param</name>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 7801512b42160c39b811dd0b390d34a678aa0b96..019c0092c6fdb6e9ee4b93af47fa88cb47ace671 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Timetracking_entity</name>
<title>Timetracking</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -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>
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
index dc19068f6d1d91e2fafb207c321293bf91982ff3..22a71c3c65c58d1aae90260ce19664352d239e9d 100644
--- a/entity/TurnoverTree_entity/TurnoverTree_entity.aod
+++ b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>TurnoverTree_entity</name>
<title>Tree</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -57,14 +57,6 @@
<entityProvider>
<name>FilteredTurnovers</name>
<documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/filteredturnovers/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>0ea4ad47-985b-4a9c-81d8-946be324ae04</name>
- <entityName>Turnover_entity</entityName>
- <fieldName>Turnover_tree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>YearCountToShow_param</name>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index e61b1a3a96ce5cd498aabf87c946dd0a0ca9785c..2cd511e1128dee22ee5fd0a3ce3f2bd903876012 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Turnover_entity</name>
<title>Sales forecast</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -55,14 +55,6 @@
<name>FilteredTurnovers</name>
<documentation>%aditoprj%/entity/Turnover_entity/entityfields/filteredturnovers/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
- <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>
@@ -185,20 +177,6 @@
</entityAggregateField>
<entityProvider>
<name>DynamicTurnover</name>
- <dependencies>
- <entityDependency>
- <name>d20b815b-0c36-4e7c-b114-9a8bfba77c96</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Turnovers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>341bcc89-313f-43eb-94ef-b9a934fe7f1e</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Turnovers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>MaxYear_param</name>
diff --git a/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod b/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
index c02555601d5382f8af78f3e63e9087f1a2136d75..838e84e5f70feaf7e8d1c96222fbf119d3ca521d 100644
--- a/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
+++ b/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>UniversalFileProcessor_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/UniversalFileProcessor_entity/documentation.adoc</documentation>
diff --git a/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod b/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
index b769af088b5a4c8e5d959bcd29ed97aa951acb1f..33c5ab0f3c4b4dfe8f486f847ba4a28b30c17f1e 100644
--- a/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
+++ b/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>UnlinkedMailMappingLink_entity</name>
<title>${UNLINKEDMAILMAPPING_ADDITIONAL_LINK}</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -9,14 +9,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>9958543a-9e47-4f7f-8f06-8f18757f8586</name>
- <entityName>UnlinkedMailMappingWrapper_entity</entityName>
- <fieldName>UnlinkedMailMappingLinks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>MailAsText_param</name>
diff --git a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
index 54532cd9c86648b4b23ca5242bbf2dd46f5ae71f..39f072a9aa1d0380a6dd5270aeea42934c3526e7 100644
--- a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
+++ b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>UnlinkedMailMappingWrapper_entity</name>
<title>Link unlinked e-mail</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
index 3d3bf8f882d37350f1387d165d08824a0ceb3129..04d2a21438907b6c5d88c2e326d07ffa9934b01f 100644
--- a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
+++ b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>UnlinkedMail_entity</name>
<title>Unlinked e-mail</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -46,7 +46,7 @@
<name>DownloadMail_action</name>
<title>Download Mail</title>
<onActionProcess>%aditoprj%/entity/UnlinkedMail_entity/entityfields/toactivity_actiongroup/children/downloadmail_action/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:DOWNLOAD_ALT</iconId>
<tooltip>Download e-mail</tooltip>
</entityActionField>
@@ -54,7 +54,7 @@
<name>ToActivity_action</name>
<title>Create activity</title>
<onActionProcess>%aditoprj%/entity/UnlinkedMail_entity/entityfields/toactivity_actiongroup/children/toactivity_action/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconIdProcess>%aditoprj%/entity/UnlinkedMail_entity/entityfields/toactivity_actiongroup/children/toactivity_action/iconIdProcess.js</iconIdProcess>
<tooltip>Try to create activity automatically and ask for more information if necessary</tooltip>
</entityActionField>
diff --git a/entity/UserhelpResources_entity/UserhelpResources_entity.aod b/entity/UserhelpResources_entity/UserhelpResources_entity.aod
index 39dd475719ae970e55ee4ecd00e9b0f05458f10d..831f7a4eff67ad9d1ce8d500a4b51d3add2027af 100644
--- a/entity/UserhelpResources_entity/UserhelpResources_entity.aod
+++ b/entity/UserhelpResources_entity/UserhelpResources_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>UserhelpResources_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/UserhelpResources_entity/documentation.adoc</documentation>
diff --git a/entity/Usersettings_entity/Usersettings_entity.aod b/entity/Usersettings_entity/Usersettings_entity.aod
index 2653396deac35232a2ca79f7464a20c9cbc99f1e..1ec4ab0c78aac9ce1e53ef674737b7f7f9dcfed8 100644
--- a/entity/Usersettings_entity/Usersettings_entity.aod
+++ b/entity/Usersettings_entity/Usersettings_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Usersettings_entity</name>
<title>Settings</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
index df9c843f9b51af26f4093e09c4b3cc78a37cd715..14897c0211e34f9bc450dc6ddc420a9a8b4bcb98 100644
--- a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
+++ b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>VisitPlanEmployeeWeek_entity</name>
<title>Visitplan Weekly Overview</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
index 5cbdd8c359ad36edb185b4a03986f67b55ffc0e7..b2bbe781dbe8f457d19d9e55790a7b018c05d732 100644
--- a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+++ b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>VisitPlanEntry_entity</name>
<title>Weekplan</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -238,14 +238,6 @@
<entityProvider>
<name>Entries</name>
<documentation>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entries/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>22b61edd-c062-4c94-8848-8ac25831c5ba</name>
- <entityName>VisitPlanEmployeeWeek_entity</entityName>
- <fieldName>Entries</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
index 5b3aed5fe7eb132446e7268945dd6ba265eb60c5..122aecbad7c8416f3899f0646ae322097b5fb6f4 100644
--- a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
+++ b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>VisitRecommendation_entity</name>
<title>Visit Recommendation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -18,14 +18,6 @@
<targetContextField>TARGET_CONTEXT</targetContextField>
<targetIdField>TARGET_ID</targetIdField>
<documentation>%aditoprj%/entity/VisitRecommendation_entity/entityfields/#provider/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>d39ab3e0-0b61-4a6d-a6f9-5c5fef20a801</name>
- <entityName>VisitPlanEmployeeWeek_entity</entityName>
- <fieldName>recommendations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>CONTACT_ID</name>
diff --git a/entity/WeblinkClick_entity/WeblinkClick_entity.aod b/entity/WeblinkClick_entity/WeblinkClick_entity.aod
index bd2d19c05be327649e1ada1374047855e7f984d3..bfc0e2a5eed1df3e534c506c6a7005a50e391652 100644
--- a/entity/WeblinkClick_entity/WeblinkClick_entity.aod
+++ b/entity/WeblinkClick_entity/WeblinkClick_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>WeblinkClick_entity</name>
<title>Click</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -11,26 +11,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>cd0eb69c-917b-43ba-b02f-2b05bff34cdd</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>Clicks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>cf3f4f2c-43bb-44c3-9099-95966d05623f</name>
- <entityName>Link_entity</entityName>
- <fieldName>Clicks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2a2baa00-d7c3-4e88-a4e1-553a81b4ac77</name>
- <entityName>Weblink_entity</entityName>
- <fieldName>Clicks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>BROWSER</name>
diff --git a/entity/WeblinkTag_entity/WeblinkTag_entity.aod b/entity/WeblinkTag_entity/WeblinkTag_entity.aod
index 58b737c76c9448f9a9ce7fb40fe7633bdcf4a9d3..88e59eec7f12eae5313b362320839cbe58815d89 100644
--- a/entity/WeblinkTag_entity/WeblinkTag_entity.aod
+++ b/entity/WeblinkTag_entity/WeblinkTag_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>WeblinkTag_entity</name>
<title>Tag</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -14,14 +14,6 @@
</entityProvider>
<entityProvider>
<name>Tags</name>
- <dependencies>
- <entityDependency>
- <name>4677d007-6467-4bc4-80ec-8230ee68d203</name>
- <entityName>Weblink_entity</entityName>
- <fieldName>WebtrackingTags</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>WeblinkId_param</name>
diff --git a/entity/Weblink_entity/Weblink_entity.aod b/entity/Weblink_entity/Weblink_entity.aod
index 1cd2e681a6775e3294b54b5f7fb35c6ff0cb59ec..d2e768f7f45fcbbbb135ca3f249a8f274f892847 100644
--- a/entity/Weblink_entity/Weblink_entity.aod
+++ b/entity/Weblink_entity/Weblink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>Weblink_entity</name>
<title>Weblink</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -37,7 +37,7 @@
</entityField>
<entityField>
<name>SCORE</name>
- <title>Punktzahl</title>
+ <title>Score</title>
<contentType>NUMBER</contentType>
<outputFormat>#' Punkte'</outputFormat>
<valueProcess>%aditoprj%/entity/Weblink_entity/entityfields/score/valueProcess.js</valueProcess>
@@ -63,7 +63,7 @@
<children>
<entityParameter>
<name>WeblinkId_param</name>
- <valueProcess>%aditoprj%/entity/Weblink_entity/entityfields/webtrackingtags/children/linkid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Weblink_entity/entityfields/webtrackingtags/children/weblinkid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -107,7 +107,6 @@
<children>
<entityParameter>
<name>WeblinkId_param</name>
- <valueProcess>%aditoprj%/entity/Weblink_entity/entityfields/clicks/children/linkid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Weblink_entity/entityfields/clicks/children/linkid_param/valueProcess.js b/entity/Weblink_entity/entityfields/webtrackingtags/children/weblinkid_param/valueProcess.js
similarity index 100%
rename from entity/Weblink_entity/entityfields/clicks/children/linkid_param/valueProcess.js
rename to entity/Weblink_entity/entityfields/webtrackingtags/children/weblinkid_param/valueProcess.js
diff --git a/entity/Weblink_entity/entityfields/webtrackingtags/children/webtrackingurl/valueProcess.js b/entity/Weblink_entity/entityfields/webtrackingtags/children/webtrackingurl/valueProcess.js
deleted file mode 100644
index 647f04b4516a64fb021acb531052094c641dc2ee..0000000000000000000000000000000000000000
--- a/entity/Weblink_entity/entityfields/webtrackingtags/children/webtrackingurl/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$field.WEBLINKID"));
\ No newline at end of file
diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/linktype.displayvalue/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/linktype.displayvalue/expression.js
index e452bc6e87a70c073b1eef5be3a7187eb894ffb4..92a7316b871e779d6a203b3bcc72352f3f95cc15 100644
--- a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/linktype.displayvalue/expression.js
+++ b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/linktype.displayvalue/expression.js
@@ -1,3 +1,5 @@
import("system.result");
import("Keyword_lib");
-result.string(KeywordUtils.getResolvedTitleSqlPart("WeblinkType", "WEBLINK.LINKTYPE"));
\ No newline at end of file
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.weblinkType(), "WEBLINK.LINKTYPE"));
\ No newline at end of file
diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/urltype.displayvalue/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/urltype.displayvalue/expression.js
deleted file mode 100644
index 92a7316b871e779d6a203b3bcc72352f3f95cc15..0000000000000000000000000000000000000000
--- a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/urltype.displayvalue/expression.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.weblinkType(), "WEBLINK.LINKTYPE"));
\ No newline at end of file
diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index 97fcd7f503d021ab57d135da7912aa04363a6d0a..08115b312500a58c33195f133111759cdac42ab6 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>WorkflowDefinition_entity</name>
<title>Workflow Definition</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -15,26 +15,6 @@
<entityProvider>
<name>#PROVIDER</name>
<lookupIdfield>KEY</lookupIdfield>
- <dependencies>
- <entityDependency>
- <name>e68df135-cdc4-46c4-9ca2-1712145ebe5d</name>
- <entityName>WorkflowInstance_entity</entityName>
- <fieldName>WorkflowDefinitions</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8c60efea-5fa1-4df0-a6bb-9fadcc88554c</name>
- <entityName>WorkflowLauncher_entity</entityName>
- <fieldName>WorkflowDefinitions</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>349ab9d2-edbb-4571-be14-3fb749bfff50</name>
- <entityName>Weblink_entity</entityName>
- <fieldName>WorkflowDefinitions</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
diff --git a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
index 2ca484e8dd1742dd952588ea6501469843056906..183cada70540e2204fea477b21980acbd37af008 100644
--- a/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
+++ b/entity/WorkflowInstanceHistory_entity/WorkflowInstanceHistory_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>WorkflowInstanceHistory_entity</name>
<title>History</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -53,14 +53,6 @@
<targetIdField>TASK_ID</targetIdField>
<documentation>%aditoprj%/entity/WorkflowInstanceHistory_entity/entityfields/historyforworkflowinstance/documentation.adoc</documentation>
<titlePlural>History</titlePlural>
- <dependencies>
- <entityDependency>
- <name>dae4ffad-5627-46b5-bf4c-b3b8490d4a29</name>
- <entityName>WorkflowInstance_entity</entityName>
- <fieldName>History</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>ICON</name>
diff --git a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
index ecdc057e397f87bea6051e6797f820fb170545b2..af630567187988000258a1d95e9c61d936d1fda1 100644
--- a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
+++ b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>WorkflowInstance_entity</name>
<title>Workflow instance</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -19,14 +19,6 @@
<entityProvider>
<name>InstancesOfWorkflow</name>
<documentation>%aditoprj%/entity/WorkflowInstance_entity/entityfields/instancesofworkflow/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>96f047cf-7f3b-417e-ac08-9dc231c5d0ac</name>
- <entityName>WorkflowDefinition_entity</entityName>
- <fieldName>Instances</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>WorkflowDefinitionId_param</name>
diff --git a/entity/WorkflowLauncher_entity/WorkflowLauncher_entity.aod b/entity/WorkflowLauncher_entity/WorkflowLauncher_entity.aod
index f33bea3edcaa3205f2f185b9d33422e940fbd82a..876a676e433409f72f642c45e353fbebc22efca9 100644
--- a/entity/WorkflowLauncher_entity/WorkflowLauncher_entity.aod
+++ b/entity/WorkflowLauncher_entity/WorkflowLauncher_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>WorkflowLauncher_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/WorkflowLauncher_entity/documentation.adoc</documentation>
diff --git a/entity/WorkflowModel_entity/WorkflowModel_entity.aod b/entity/WorkflowModel_entity/WorkflowModel_entity.aod
index 674696c52739d76ac96b4dd2ccd79a59e54d53bf..e4c027090fba6135e37dba8479796804240e4bb1 100644
--- a/entity/WorkflowModel_entity/WorkflowModel_entity.aod
+++ b/entity/WorkflowModel_entity/WorkflowModel_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>WorkflowModel_entity</name>
<title>Workflow Model</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod b/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
index a64a66745a095455ea7bfa4a3134cd0fe135b180..2e5432914570dff181579533db28da26f0d1aab8 100644
--- a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
+++ b/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>WorkflowSignal_entity</name>
<title>Signal</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -80,14 +80,6 @@
<entityProvider>
<name>ProcessDefinitionSignals</name>
<documentation>%aditoprj%/entity/WorkflowSignal_entity/entityfields/processdefinitionsignals/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>f08ff63c-296a-4b1f-8264-b6b1e6c1d748</name>
- <entityName>WorkflowDefinition_entity</entityName>
- <fieldName>Signals</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>PROCESSDEFINITION_KEY</name>
diff --git a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
index dde2a612a51ebc947a7c5f96d59effd665d91992..2ee19112c2fe024c4a735a5cce609896ea2ae2bd 100644
--- a/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
+++ b/entity/WorkflowStartConfig_entity/WorkflowStartConfig_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>WorkflowStartConfig_entity</name>
<title>Usage</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -38,14 +38,6 @@
</entityParameter>
<entityProvider>
<name>StartConfig</name>
- <dependencies>
- <entityDependency>
- <name>16a810bd-b531-425c-8677-11d16f9456e4</name>
- <entityName>WorkflowDefinition_entity</entityName>
- <fieldName>StartConfigs</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityConsumer>
<name>Contexts</name>
diff --git a/entity/WorkflowTask_entity/WorkflowTask_entity.aod b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
index f686333ba78f732e4a59061abd44b4c146be7a75..2c7b0ff1bca7ed5d54281a7d5a0ad1754eaf4d88 100644
--- a/entity/WorkflowTask_entity/WorkflowTask_entity.aod
+++ b/entity/WorkflowTask_entity/WorkflowTask_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>WorkflowTask_entity</name>
<title>Task</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -14,14 +14,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>f199d701-3d7a-4dbe-abf5-2f5e598e9839</name>
- <entityName>WorkflowDefinition_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
@@ -77,14 +69,6 @@
<entityProvider>
<name>InstanceTasks</name>
<documentation>%aditoprj%/entity/WorkflowTask_entity/entityfields/instancetasks/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>5913327f-1bb4-48b8-846e-639274290cee</name>
- <entityName>WorkflowInstance_entity</entityName>
- <fieldName>Tasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>OnlyFinishedTasks_param</name>
@@ -185,14 +169,6 @@
<entityProvider>
<name>FinishedInstanceTasks</name>
<documentation>%aditoprj%/entity/WorkflowTask_entity/entityfields/finishedinstancetasks/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>d5d39281-0183-42fa-960a-01347cddc85a</name>
- <entityName>WorkflowInstance_entity</entityName>
- <fieldName>FinishedTasks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
<children>
<entityParameter>
<name>OnlyFinishedTasks_param</name>
@@ -227,7 +203,7 @@
<title>Complete tasks</title>
<onActionProcess>%aditoprj%/entity/WorkflowTask_entity/entityfields/tableactions/children/completemultipletasks/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <isSelectionAction v="true" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:CHECK</iconId>
<stateProcess>%aditoprj%/entity/WorkflowTask_entity/entityfields/tableactions/children/completemultipletasks/stateProcess.js</stateProcess>
</entityActionField>
diff --git a/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod b/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
index 76e08b7ad6b6eb6e33adab9d93c38e2fc5b8701a..6bdb790952fd2dcc395f534eb26db19e10717e31 100644
--- a/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
+++ b/entity/WorkflowVariableValue_entity/WorkflowVariableValue_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>WorkflowVariableValue_entity</name>
<title>Variable</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -32,14 +32,6 @@
<entityProvider>
<name>VariablesOfInstance</name>
<documentation>%aditoprj%/entity/WorkflowVariableValue_entity/entityfields/variablesofinstance/documentation.adoc</documentation>
- <dependencies>
- <entityDependency>
- <name>b10924d7-0ba4-4268-8b2f-383e7cf6045c</name>
- <entityName>WorkflowInstance_entity</entityName>
- <fieldName>Variables</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityParameter>
<name>WorkflowInstanceId_param</name>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 8a73c7e6f4d3312b9340b159965afe27a30c491e..b94ce935a384816581e7aa2ff6347e019fd97d2b 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -8575,6 +8575,63 @@
<entry>
<key>This setting is overridden by the setting '%0'</key>
</entry>
+ <entry>
+ <key>Business Card Language</key>
+ </entry>
+ <entry>
+ <key>No advertising</key>
+ </entry>
+ <entry>
+ <key>[TEST] Importer</key>
+ </entry>
+ <entry>
+ <key>Weblink</key>
+ </entry>
+ <entry>
+ <key>Covid Information</key>
+ </entry>
+ <entry>
+ <key>Document actions</key>
+ </entry>
+ <entry>
+ <key>Click</key>
+ </entry>
+ <entry>
+ <key>Linkmanagement</key>
+ </entry>
+ <entry>
+ <key>[TEST] Calendar_lib</key>
+ </entry>
+ <entry>
+ <key>Redirect</key>
+ </entry>
+ <entry>
+ <key>Maillog</key>
+ </entry>
+ <entry>
+ <key>Maillogs</key>
+ </entry>
+ <entry>
+ <key>Url</key>
+ </entry>
+ <entry>
+ <key>[TEST] Util_lib</key>
+ </entry>
+ <entry>
+ <key>Daily Cases</key>
+ </entry>
+ <entry>
+ <key>Is an active Employee</key>
+ </entry>
+ <entry>
+ <key>Weblinks</key>
+ </entry>
+ <entry>
+ <key>Browser</key>
+ </entry>
+ <entry>
+ <key>Global Cases </key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 38086e6169d73bfe153c219038577aedc22fdba1..3226194b7c748c60ff7b268cef748a56d8abdf4e 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10,6 +10,10 @@
<key>Event End</key>
<value>Veranstaltungs Ende</value>
</entry>
+ <entry>
+ <key>Attributes of attribute group \"%0\" have to be used at least %1.</key>
+ <value>Eigenschaften der Eigenschaftsgruppe \"%0\" müssen mindestens %1 verwendet werden.</value>
+ </entry>
<entry>
<key>Redirect needs a full Url with http/https</key>
<value>Für die Weiterleitung wird eine vollständige Url mit http/https benötigt</value>
@@ -67,6 +71,10 @@
<value>Objekt nicht gefunden
</value>
</entry>
+ <entry>
+ <key>Attributes of attribute group \"%0\" can't be used more than %1.</key>
+ <value>Eigenschaften der Eigenschaftsgruppe \"%0\" dürfen maximal %1 verwendet werden.</value>
+ </entry>
<entry>
<key>Change responsible</key>
<value>Verantwortlichen wechseln</value>
@@ -11288,6 +11296,57 @@ Bitte Datumseingabe prüfen</value>
<key>Object type 2</key>
<value>Objekttyp 2</value>
</entry>
+ <entry>
+ <key>[TEST] Importer</key>
+ </entry>
+ <entry>
+ <key>Weblink</key>
+ </entry>
+ <entry>
+ <key>Covid Information</key>
+ </entry>
+ <entry>
+ <key>Document actions</key>
+ </entry>
+ <entry>
+ <key>Click</key>
+ </entry>
+ <entry>
+ <key>Linkmanagement</key>
+ </entry>
+ <entry>
+ <key>[TEST] Calendar_lib</key>
+ </entry>
+ <entry>
+ <key>Redirect</key>
+ </entry>
+ <entry>
+ <key>Maillog</key>
+ </entry>
+ <entry>
+ <key>Maillogs</key>
+ </entry>
+ <entry>
+ <key>Url</key>
+ </entry>
+ <entry>
+ <key>[TEST] Util_lib</key>
+ </entry>
+ <entry>
+ <key>Daily Cases</key>
+ </entry>
+ <entry>
+ <key>Is an active Employee</key>
+ </entry>
+ <entry>
+ <key>Weblinks</key>
+ </entry>
+ <entry>
+ <key>Browser</key>
+ </entry>
+ <entry>
+ <key>Global Cases </key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 412cb297fe20cec4729f5d7864ca07b4621dfc13..1464a7d2e294dcbe1771ba44c0e878a2cc23415f 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -8660,6 +8660,63 @@
<entry>
<key>This setting is overridden by the setting '%0'</key>
</entry>
+ <entry>
+ <key>Business Card Language</key>
+ </entry>
+ <entry>
+ <key>No advertising</key>
+ </entry>
+ <entry>
+ <key>[TEST] Importer</key>
+ </entry>
+ <entry>
+ <key>Weblink</key>
+ </entry>
+ <entry>
+ <key>Covid Information</key>
+ </entry>
+ <entry>
+ <key>Document actions</key>
+ </entry>
+ <entry>
+ <key>Click</key>
+ </entry>
+ <entry>
+ <key>Linkmanagement</key>
+ </entry>
+ <entry>
+ <key>[TEST] Calendar_lib</key>
+ </entry>
+ <entry>
+ <key>Redirect</key>
+ </entry>
+ <entry>
+ <key>Maillog</key>
+ </entry>
+ <entry>
+ <key>Maillogs</key>
+ </entry>
+ <entry>
+ <key>Url</key>
+ </entry>
+ <entry>
+ <key>[TEST] Util_lib</key>
+ </entry>
+ <entry>
+ <key>Daily Cases</key>
+ </entry>
+ <entry>
+ <key>Is an active Employee</key>
+ </entry>
+ <entry>
+ <key>Weblinks</key>
+ </entry>
+ <entry>
+ <key>Browser</key>
+ </entry>
+ <entry>
+ <key>Global Cases </key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/Appointment/Appointment.aod b/neonContext/Appointment/Appointment.aod
index 7bd2dabf7a6632779c11b0ca1de249b01382625e..7663253b4c7f6f14fbd7def51f014bb6fdddd7d3 100644
--- a/neonContext/Appointment/Appointment.aod
+++ b/neonContext/Appointment/Appointment.aod
@@ -23,9 +23,6 @@
<name>2a5e05b2-3f12-43b4-a3f4-3c31dbe0dace</name>
<view>AppointmentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>de97b676-6504-4edc-96ba-77ff8483a3a0</name>
- </neonViewReference>
<neonViewReference>
<name>2f707344-d5ef-4abc-99d9-b6eec3318ae5</name>
<view>AppointmentCheckUp_view</view>
diff --git a/neonContext/Attribute/Attribute.aod b/neonContext/Attribute/Attribute.aod
index 46d59cc597f0e66fc980eb493a14384ea1434195..749cae00feb54558e374c68bcbe98aa78a8c1877 100644
--- a/neonContext/Attribute/Attribute.aod
+++ b/neonContext/Attribute/Attribute.aod
@@ -38,8 +38,5 @@
<name>1cf7d11d-d593-4518-b7aa-aca1a9a2fb8a</name>
<view>AttributeList_view</view>
</neonViewReference>
- <neonViewReference>
- <name>ba95c103-7e26-404d-868b-ed47521bb3bd</name>
- </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/BulkMailTestRecipient/BulkMailTestRecipient.aod b/neonContext/BulkMailTestRecipient/BulkMailTestRecipient.aod
index 5c35bf72c976ec78c161c38a8574c44c2bb5133a..ce4cb549d1ea6ba64af772bdddc3e2014979f585 100644
--- a/neonContext/BulkMailTestRecipient/BulkMailTestRecipient.aod
+++ b/neonContext/BulkMailTestRecipient/BulkMailTestRecipient.aod
@@ -6,9 +6,6 @@
<editView>BulkMailTestRecipientEdit_view</editView>
<entity>BulkMailTestRecipient_entity</entity>
<references>
- <neonViewReference>
- <name>c9330ab3-e805-4dbb-8360-4767a966ae3a</name>
- </neonViewReference>
<neonViewReference>
<name>eb1567ec-e5d3-4442-9fe3-7b456ba13ffe</name>
<view>BulkMailTestRecipientFilter_view</view>
diff --git a/neonContext/Document/Document.aod b/neonContext/Document/Document.aod
index 625b588c0d26638db8e8001004ea6d6d8a12f3c1..cfb02a7f2b32b641b632905df49b01ef560bd62c 100644
--- a/neonContext/Document/Document.aod
+++ b/neonContext/Document/Document.aod
@@ -37,8 +37,5 @@
<name>434ed60c-8219-4ef5-b795-6d72b9ae48c9</name>
<view>DocumentWithIdFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>0dfe06a2-7a32-40b4-bac7-3b408956deba</name>
- </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/DuplicateOrganisation/DuplicateOrganisation.aod b/neonContext/DuplicateOrganisation/DuplicateOrganisation.aod
index 180a84c994ec66d9360520047ed577612fce6b84..d3cfec52aa9ea9b895eec795511a40b216c40de5 100644
--- a/neonContext/DuplicateOrganisation/DuplicateOrganisation.aod
+++ b/neonContext/DuplicateOrganisation/DuplicateOrganisation.aod
@@ -13,9 +13,6 @@
<name>512ef5c4-dc95-4ef1-81e0-d45479249c2e</name>
<view>DuplicateOrganisationEdit_view</view>
</neonViewReference>
- <neonViewReference>
- <name>07bbb126-8b4b-4f3c-a2c8-30409e0ee826</name>
- </neonViewReference>
<neonViewReference>
<name>2e59d859-6b5f-4bb5-a47b-1225164140ed</name>
<view>DuplicateOrganisationPreview_view</view>
diff --git a/neonContext/DuplicatePerson/DuplicatePerson.aod b/neonContext/DuplicatePerson/DuplicatePerson.aod
index 6d8e12f75aafc815feb17c94b9165e142be633e6..a30cb53a7df1f4e8fd274399a08d9911a870e3c4 100644
--- a/neonContext/DuplicatePerson/DuplicatePerson.aod
+++ b/neonContext/DuplicatePerson/DuplicatePerson.aod
@@ -13,12 +13,6 @@
<name>f54e544a-2279-41ec-a7b3-44e11989a736</name>
<view>DuplicatePersonEdit_view</view>
</neonViewReference>
- <neonViewReference>
- <name>88155af6-074d-4683-b27e-20a8ef75dd8a</name>
- </neonViewReference>
- <neonViewReference>
- <name>fb801ec5-ec73-4d6d-be3e-f2d78a57716f</name>
- </neonViewReference>
<neonViewReference>
<name>596cd813-22e1-4ba6-96d5-fefefbb800cf</name>
<view>DuplicatePersonPreview_view</view>
diff --git a/neonContext/Person/Person.aod b/neonContext/Person/Person.aod
index 1f9f01bbf1edc780afb0212eb43d1321f56fe138..89ed9017e376a5826a9972eef836ac0da2fe8194 100644
--- a/neonContext/Person/Person.aod
+++ b/neonContext/Person/Person.aod
@@ -59,9 +59,6 @@
<name>69b30bea-7b58-4a54-8d6b-dca3fb4a9c53</name>
<view>PersonMultiEditQuickEntry_view</view>
</neonViewReference>
- <neonViewReference>
- <name>2a6c44be-53e2-469e-84b3-615841bd4430</name>
- </neonViewReference>
<neonViewReference>
<name>627518cc-15b0-4f0d-b6f3-ec06172e7c4e</name>
<view>PersonMarketing_view</view>
diff --git a/neonContext/Planning/Planning.aod b/neonContext/Planning/Planning.aod
index 387221c361acd05e48468ec96feb73ea5bdb25d4..bdaf234b370b9669e5d3ee8c32b81090c05ca3e8 100644
--- a/neonContext/Planning/Planning.aod
+++ b/neonContext/Planning/Planning.aod
@@ -17,12 +17,6 @@
<name>360005f9-0f0a-41dc-b7c8-3f8b2e947d98</name>
<view>PlanningEdit_view</view>
</neonViewReference>
- <neonViewReference>
- <name>87ed8e38-7591-404e-b57a-b1268db6a777</name>
- </neonViewReference>
- <neonViewReference>
- <name>1a7e2b28-65ee-4620-88b7-c8f38b69d2c5</name>
- </neonViewReference>
<neonViewReference>
<name>e12da517-cd75-4665-a4cd-c9a2643dc0c1</name>
<view>PlanningOrganisationFilter_view</view>
diff --git a/neonView/DuplicatesOverview_view/DuplicatesOverview_view.aod b/neonView/DuplicatesOverview_view/DuplicatesOverview_view.aod
index ad0436323ab2c0829d978e2bf86c24b0766597ab..e7f6cadf9d25dabbe2ee05bb144c190b8ee90a8b 100644
--- a/neonView/DuplicatesOverview_view/DuplicatesOverview_view.aod
+++ b/neonView/DuplicatesOverview_view/DuplicatesOverview_view.aod
@@ -11,12 +11,10 @@
<neonViewReference>
<name>b3164f16-fa7e-42b0-829f-88553add7c08</name>
<entityField>#ENTITY</entityField>
- <view>PersonDublicatesTab_view</view>
</neonViewReference>
<neonViewReference>
<name>8e19d057-58da-4db8-8119-ecf070af86ab</name>
<entityField>#ENTITY</entityField>
- <view>OrganisationDuplicatesTab_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/ObservationEdit_view/ObservationEdit_view.aod b/neonView/ObservationEdit_view/ObservationEdit_view.aod
index 4540877e882f98774d37d42d786452ae592fe8d9..bba30a064ed46a6f57d1c974e43ed69f1a520add 100644
--- a/neonView/ObservationEdit_view/ObservationEdit_view.aod
+++ b/neonView/ObservationEdit_view/ObservationEdit_view.aod
@@ -47,7 +47,6 @@
</entityFieldLink>
<entityFieldLink>
<name>aa93c341-578b-4da9-8ee8-2b3d9ea9e1ca</name>
- <entityField>includeDependencies</entityField>
</entityFieldLink>
<entityFieldLink>
<name>c6fa82e2-5830-46c5-9127-e273ddf5a194</name>
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index 470461ecaeb0bffd66f046ebf529633ddcb672e3..2a6dc63dcb6624bd3c2fbb0516a9b77dd0d61482 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -25,9 +25,9 @@
<view>OrderCondition_view</view>
</neonViewReference>
<neonViewReference>
- <name>07e7374d-8d52-4677-bbf3-dedd9c1d6ab1</name>
- <entityField>Products</entityField>
- <view>ProductFilter_view</view>
+ <name>07e7374d-8d52-4677-bbf3-dedd9c1d6ab1</name>
+ <entityField>Products</entityField>
+ <view>ProductFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>1e0af6a9-9bb6-47b5-944b-636d21ac74d2</name>
diff --git a/neonView/RoleChildrenList_view/RoleChildrenList_view.aod b/neonView/RoleChildrenList_view/RoleChildrenList_view.aod
index 777f1a116a0ca5eb73734e06ba80cd3a65aca974..df1d51b6c126c9e8853e51bb74271e53020189a9 100644
--- a/neonView/RoleChildrenList_view/RoleChildrenList_view.aod
+++ b/neonView/RoleChildrenList_view/RoleChildrenList_view.aod
@@ -14,8 +14,8 @@
<titleFieldFullWidth v="true" />
<entityField>#ENTITY</entityField>
<isDeletable v="true" />
- <isEditable v="true" />
<isCreatable v="true" />
+ <isEditable v="true" />
</titledListViewTemplate>
</children>
</neonView>
diff --git a/neonView/WeblinkDrawer_view/WeblinkDrawer_view.aod b/neonView/WeblinkDrawer_view/WeblinkDrawer_view.aod
index 4eb8096b64e4a5a70ed2b466095324fdddf50531..4a69a3455f2f97336b748f0926c659589c57c947 100644
--- a/neonView/WeblinkDrawer_view/WeblinkDrawer_view.aod
+++ b/neonView/WeblinkDrawer_view/WeblinkDrawer_view.aod
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
<name>WeblinkDrawer_view</name>
- <title>Weitere Informationen</title>
+ <title>Further informations</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 357db8c7f374d4c0265becca52817d845a71cc7b..d27a2d9c2db1900c90d4ed4813dc611e7ef0e96e 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.2.2">
+<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.2.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.2.3">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<customized />
@@ -122,16 +122,6 @@
<name>duplicates.dataBlockSize</name>
<property v="5000" />
</customIntegerProperty>
- <customBooleanProperty>
- <name>workflow.leadExample</name>
- <description></description>
- <property v="false" />
- </customBooleanProperty>
- <customStringProperty>
- <name>workflow.modelerUrl</name>
- <description></description>
- <property>http://localhost:8082/flowable-modeler/</property>
- </customStringProperty>
<customBooleanProperty>
<name>ai.salesprojectProbability</name>
<description></description>
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 965a947abf7ef27ac5867379970efcdb7eb8e93e..20c80caef6169b6cf056b192bec61ae87320761e 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -78,6 +78,40 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
if (pAttributeCount)
{
+ // get parents of already linked attributes
+ var parentAttributes = AttributeUtil.getAllParents(Object.keys(pAttributeCount));
+
+ // get max usage from attribute parents
+ var parentAttributesMaxCount = [];
+
+ if (parentAttributes.length > 0)
+ {
+ // retrieve all max counts of the parent attributes
+ parentAttributesMaxCount = newSelect("AB_ATTRIBUTEID, MAX_COUNT")
+ .from("AB_ATTRIBUTEUSAGE")
+ .join("AB_ATTRIBUTE", "AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID")
+ .where("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", parentAttributes, SqlBuilder.IN())
+ .and("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
+ .table();
+ }
+
+ // count how many children of each parent are already linked
+ var parentChildUsageCount = {};
+ parentAttributes.forEach(function(attr) { parentChildUsageCount[attr] = (parentChildUsageCount[attr] || 0) + 1; });
+
+ // if actual usage >= max usage exclude parent and its children
+ for each (let parentAttr in parentAttributesMaxCount)
+ {
+ if (parentAttr[1] && parentChildUsageCount[parentAttr[0]] >= parentAttr[1])
+ {
+ // exclude this parent and its children
+ attrSelect.and(newWhere()
+ .and("AB_ATTRIBUTE.AB_ATTRIBUTEID", parentAttr[0], SqlBuilder.NOT_EQUAL())
+ .and("AB_ATTRIBUTE.AB_ATTRIBUTEID", AttributeUtil.getAllChildren(parentAttr[0]), SqlBuilder.NOT_IN())
+ );
+ }
+ }
+
for (let attributeId in pAttributeCount)
{
attrSelect.and(newWhere()
@@ -336,6 +370,37 @@ AttributeUtil.getAllChildren = function (pAttributeIds)
return childIds;
}
+/**
+ * Returns the ids of all superordinate attributes of an attribute.
+ *
+ * @param {String|Array} pAttributeIds <p>
+ * The id(s) of the attribute(s).<br>
+ * @return {String[]} <p>
+ * Array with the ids of every superordinate attribute.<br>
+ */
+AttributeUtil.getAllParents = function (pAttributeIds)
+{
+ var parentIds = [];
+ if (typeof(pAttributeIds) == "string")
+ pAttributeIds = [pAttributeIds];
+
+ while (pAttributeIds.length > 0)
+ {
+ pAttributeIds = newSelect("ATTRIBUTE_PARENT_ID")
+ .from("AB_ATTRIBUTE")
+ .where("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeIds, SqlBuilder.IN())
+ .arrayColumn();
+
+ if (pAttributeIds.length > 0)
+ parentIds = parentIds.concat(pAttributeIds);
+ }
+
+ // remove empty array elements
+ parentIds = parentIds.filter(function (id) { return id != null && id != '' });
+
+ return parentIds;
+}
+
/**
* Checks if an attribute has attribute relations.
*
@@ -718,7 +783,58 @@ AttributeRelationUtils.validateAttributeCount = function (pRowId, pObjectType, p
//retrieve all min/max counts of the possible attributes
minMaxCounts = minMaxCountsSelect.table();
}
+
+ // attribute ids of current attribute changes (client) and attributerelations (database)
+ var currentAttributes = [];
+ for (let attribute in countObj) if (countObj[attribute] > 0) currentAttributes.push(attribute);
+
+ // get all parent attributes of current attributes
+ var currentParentAttributes = AttributeUtil.getAllParents(currentAttributes);
+
+ // get all possible parent attributes
+ var possibleParentAttributes = newSelect("distinct ATTRIBUTE_PARENT_ID")
+ .from("AB_ATTRIBUTE")
+ .where("AB_ATTRIBUTE.AB_ATTRIBUTEID", possibleAttributes, SqlBuilder.IN())
+ .arrayColumn();
+ // remove empty elements
+ possibleParentAttributes = possibleParentAttributes.filter(function (el) { return el != null && el != ""; });
+
+ // count current usages of parent attributes
+ var countParentObj = {};
+ currentParentAttributes.forEach(function(parentAttribute) { countParentObj[parentAttribute] = (countParentObj[parentAttribute] || 0) + 1; });
+
+ // add missing possible parent attributes with usage of 0 to countParentObj
+ var addAttr;
+ for each (let possibleParent in possibleParentAttributes)
+ {
+ addAttr = true;
+ for (let countParent in countParentObj)
+ {
+ if (possibleParent == countParent)
+ {
+ addAttr = false;
+ break;
+ }
+ }
+
+ if (addAttr) countParentObj[possibleParent] = 0;
+ }
+
+ var minMaxParentCounts = [];
+
+ if (possibleParentAttributes.length > 0)
+ {
+ var minMaxParentCountsSelect = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_NAME, MIN_COUNT, MAX_COUNT")
+ .from("AB_ATTRIBUTEUSAGE")
+ .join("AB_ATTRIBUTE", "AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID")
+ .where("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", possibleParentAttributes, SqlBuilder.IN())
+ .and("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType);
+
+ // retrieve all min/max counts of parent attributes
+ minMaxParentCounts = minMaxParentCountsSelect.table();
+ }
+
var validationMessage = [];
minMaxCounts.forEach(function ([attributeId, name, minCount, maxCount])
{
@@ -730,6 +846,16 @@ AttributeRelationUtils.validateAttributeCount = function (pRowId, pObjectType, p
validationMessage.push(translate.withArguments("Attribute \"%0\" can't be used more than %1.", [name, _getTranslatedCount(maxCount)]));
}, countObj);
+ minMaxParentCounts.forEach(function ([attributeId, name, minCount, maxCount])
+ {
+ let count = this[attributeId] || 0;
+ //compares the actual usage with the min and max count and generates a message if the usage is too low or too high
+ if (count < minCount)
+ validationMessage.push(translate.withArguments("Attributes of attribute group \"%0\" have to be used at least %1.", [name, _getTranslatedCount(minCount)]));
+ if (maxCount && count > maxCount)
+ validationMessage.push(translate.withArguments("Attributes of attribute group \"%0\" can't be used more than %1.", [name, _getTranslatedCount(maxCount)]));
+ }, countParentObj);
+
return validationMessage.join("\n");
//returns the correct count expression by choosing either singular (1 time) or plural (2 times)
@@ -2062,4 +2188,4 @@ AttributeRelation.prototype.deleteAttribute = function (pOmitValidation)
newWhere("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", this.attributeRelationId)
.deleteData();
return true;
-}
\ No newline at end of file
+}
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index c8198e8f828a79b9d0d7951b2e77e24963a3239c..05c5dbc203e94ae8054e38d86ca8f993542a91a6 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -554,13 +554,14 @@ BulkMailUtils.copy = function(pBulkMailId)
* @param {String} pMailRunId <p>
* The id of the bulk mail run.<br>
* @param {String} pMailLogId <p>
- * The id of the corresponding mail log entry.<br>
+ * The id of the corresponding mail log entry.<br>
+ * @param {String} pFile
**/
-BulkMailUtils.storeEmlFile = function(pBulkMailId,pMailRunId, pMailLogId,pFile)
+BulkMailUtils.storeEmlFile = function (pBulkMailId, pMailRunId, pMailLogId, pFile)
{
- var locationoption = project.getPreferenceValue("bulkmail.fileStorage","/bulkMailFiles/");
- var path = vars.get("$sys.serverdata")+locationoption +pBulkMailId+"/"+pMailRunId+"/";
- var filename = pMailLogId+".eml"
+ var locationoption = project.getPreferenceValue("bulkmail.fileStorage", "/bulkMailFiles/");
+ var path = vars.get("$sys.serverdata") + locationoption + pBulkMailId + "/" + pMailRunId + "/";
+ var filename = pMailLogId + ".eml"
var fullPath = path + filename;
fileIO.storeData(fullPath, pFile, util.DATA_BINARY, false);
}
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index d154f286f514db3308097b02d05be777cedfe273..4d6ad17a8dbaa9240b0223a3791db0c510a18df0 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -1,4 +1,5 @@
import("KeywordRegistry_basic");
+import("MarketingCondition_lib");
import("Keyword_lib");
import("system.datetime");
import("system.translate");
@@ -589,16 +590,25 @@ ContactUtils.getCommRestrictionCondition = function (pMedium, pNoRestriction, pS
*
* @param {String} pContactId contact id
* @param {String} pMedium medium to check
- * @param {String|Number} [pStartDate=current date] the start date of the commrestriction
*
* @return {Boolean} true, if the contact has a commrestriction, otherwise false
*/
-ContactUtils.hasCommRestriction = function(pContactId, pMedium, pStartDate)
+ContactUtils.hasCommRestriction = function (pContactId, pMedium)
{
+ var commSettingsCond = new CommunicationSettingsCondition();
+ if (pMedium == $KeywordRegistry.communicationMediumCampaign$letter())
+ {
+ commSettingsCond.address();
+ }
+ else
+ {
+ commSettingsCond.medium(pMedium);
+ }
+
return newSelect("CONTACTID")
.from("CONTACT")
.where("CONTACT.CONTACTID", pContactId)
- .and(ContactUtils.getCommRestrictionCondition(pMedium, false, pStartDate))
+ .and(commSettingsCond.rejected().existSettings().buildCondition())
.cell() != "";
}
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 2bb2c3d1239b1458fed124790bb58827b0f15fab..1c2acdb21f9f2c28b2b1f9d2dae3c643d69d4538 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -41,15 +41,19 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
if (pToRecipients && typeof(pToRecipients) == "string")
pToRecipients = [pToRecipients];
- var email;
+ var email, retVal, isBinaryExistent;
+ isBinaryExistent = db.getBinaryCount("DOCUMENTTEMPLATE", "DOCUMENT", pTemplateId, SqlUtils.getBinariesAlias(), null);
- if (pTemplateId || (pBindata.bindata != "" && pBindata.bindata != null))
+ if ((pTemplateId && isBinaryExistent > 0) || (pBindata.bindata != "" && pBindata.bindata != null))
{
email = Email.fromTemplate(pTemplateId, pRecipientContactId, pBindata, pAdditionalPlaceholders);
if (!email)
email = new Email();
}
- else email = new Email();
+ else
+ {
+ email = new Email();
+ }
email.setSender(pSenderContactId);
@@ -72,9 +76,7 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
email.subject = pSubject;
}
- var isBinaryExistent = db.getBinaryCount("DOCUMENTTEMPLATE", "DOCUMENT", pTemplateId, SqlUtils.getBinariesAlias(), null);
-
- return isBinaryExistent > 0 ? email.downloadEML(pEmailFilename) : [];
+ return email.downloadEML(pEmailFilename);
}
@@ -115,7 +117,7 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComing
EmailWritingUtils.getMailbridgeAddress = function ()
{
- return "mailbridge@domain.local"; //TODO: not hardcoded
+ return tools.getUser("mailbridge", tools.PROFILE_DEFAULT)[tools.PARAMS][tools.EMAIL];
}
/**
diff --git a/process/MarketingCondition_test/MarketingCondition_test.aod b/process/MarketingCondition_test/MarketingCondition_test.aod
index e1fabb654e0c28f0747afcbf030302c26d996392..3f8e07edff10bc88d1a83877df45e54da223a1be 100644
--- a/process/MarketingCondition_test/MarketingCondition_test.aod
+++ b/process/MarketingCondition_test/MarketingCondition_test.aod
@@ -2,7 +2,6 @@
<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>MarketingCondition_test</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/MarketingCondition_test/process.js</process>
<variants>
<element>EXECUTABLE</element>
</variants>
diff --git a/process/MarketingCondition_test/process.js b/process/MarketingCondition_test/process.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/process/Workflow_lib/process.js b/process/Workflow_lib/process.js
index 52634e53c71a268418f1dd680093c0b5096e6618..5d05eedb802f927f2ee40c22ca4ff06faa1225e7 100644
--- a/process/Workflow_lib/process.js
+++ b/process/Workflow_lib/process.js
@@ -93,7 +93,15 @@ WorkflowUtils.engineIsEnabled = function ()
*/
WorkflowUtils.getModelerUrl = function (pModelId, pIsEditor)
{
- var modelerUrl = project.getPreferenceValue("custom.workflow.modelerUrl", "").replace(/\/$/, "");
+ var modelerAliasName = project.getInstanceConfigValue("workflowModelerAlias", "") || "WorkflowModeler";
+ if (!modelerAliasName)
+ return "";
+
+ var modelerProperties = project.getAliasModel(modelerAliasName)[project.ALIAS_PROPERTIES];
+ if (!modelerProperties.modelerUrl)
+ return "";
+
+ var modelerUrl = modelerProperties.modelerUrl.replace(/\/$/, "");
if (pModelId)
{
if (pIsEditor)