Skip to content
Snippets Groups Projects
Commit 6806bbb2 authored by Pascal Neub's avatar Pascal Neub
Browse files

merged 2021.1 into sales_pn_1080452_salesproject_autoprobab_notheigher

parents bdb10a19 12ed106a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 130 additions and 409 deletions
.aditoprj/ignoredScanServiceTasks.json
+ 6
− 0
View file @ 6806bbb2
......@@ -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,
......
.aditoprj/project.version
+ 2
− 2
View file @ 6806bbb2
#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
.liquibase/_____SYSTEMALIAS/basic/init/init.xml
+ 4
− 1
View file @ 6806bbb2
<?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>
.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_audit.xml 0 → 100644
+ 21
− 0
View file @ 6806bbb2
<?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
.liquibase/_____SYSTEMALIAS/basic/mailbridge/mailbridgeUser.xml 0 → 100644
+ 75
− 0
View file @ 6806bbb2
<?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
.liquibase/_____SYSTEMALIAS/changelog.xml
+ 1
− 0
View file @ 6806bbb2
<?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"/>
......
aliasDefinition/WorkflowModeler/WorkflowModeler.aod 0 → 100644
+ 6
− 0
View file @ 6806bbb2
<?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>
entity/360Degree_entity/360Degree_entity.aod
+ 1
− 17
View file @ 6806bbb2
<?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>
......
entity/ActivityLink_entity/ActivityLink_entity.aod
+ 1
− 9
View file @ 6806bbb2
<?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>
......
entity/Activity_entity/Activity_entity.aod
+ 1
− 95
View file @ 6806bbb2
<?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>
......
entity/Activity_entity/recordcontainers/db/conditionProcess.js
+ 3
− 22
View file @ 6806bbb2
......@@ -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"))
......
entity/AddressType_entity/AddressType_entity.aod
+ 1
− 9
View file @ 6806bbb2
<?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>
......
entity/AddressValidation_entity/AddressValidation_entity.aod
+ 1
− 33
View file @ 6806bbb2
<?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>
......
entity/Address_entity/Address_entity.aod
+ 1
− 71
View file @ 6806bbb2
<?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>
......
entity/AdminViewRow_entity/AdminViewRow_entity.aod
+ 1
− 9
View file @ 6806bbb2
<?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>
......
entity/Analyses_entity/Analyses_entity.aod
+ 1
− 1
View file @ 6806bbb2
<?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>
......
entity/AnyContact_entity/AnyContact_entity.aod
+ 1
− 109
View file @ 6806bbb2
<?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>
......
entity/AppointmentLink_entity/AppointmentLink_entity.aod
+ 1
− 9
View file @ 6806bbb2
<?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>
......
entity/Appointment_entity/Appointment_entity.aod
+ 1
− 21
View file @ 6806bbb2
<?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>
......
entity/AroundLocation_entity/AroundLocation_entity.aod
+ 1
− 1
View file @ 6806bbb2
<?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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment