diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index c0068a238e0be7d53ec49b6507dd8a9a56161f86..ac040c579fa5d6f4c780f140facc435f3c178be3 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -298,6 +298,19 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>ADDRESS_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -774,6 +787,246 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>ADDRESS</name>
+ <dbName></dbName>
+ <idColumn>ADDRESSID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>ZIP</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>STATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ADDR_TYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>REGION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ADDRESSADDITION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="60" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DISTRICT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CITY</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>COUNTRY</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="2" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ADDRESS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ADDRESSID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ADDRIDENTIFIER</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="60" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>RELATION_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>BUILDINGNO</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e50eff8e9633305a244b628b5df130da7fe34024
--- /dev/null
+++ b/entity/Address_entity/Address_entity.aod
@@ -0,0 +1,143 @@
+<?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.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3">
+ <name>Address_entity</name>
+ <title>Adressen</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/Address_entity/conditionProcess.js</conditionProcess>
+ <recordContainerType>DB</recordContainerType>
+ <caption>Adressen</caption>
+ <entityFields>
+ <entityField>
+ <name>ADDRESS</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>ADDRESS</columnName>
+ <caption>Adresse</caption>
+ </entityField>
+ <entityField>
+ <name>ADDRESSADDITION</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>ADDRESSADDITION</columnName>
+ </entityField>
+ <entityField>
+ <name>ADDRESSID</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>ADDRESSID</columnName>
+ </entityField>
+ <entityField>
+ <name>ADDRIDENTIFIER</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>ADDRIDENTIFIER</columnName>
+ </entityField>
+ <entityField>
+ <name>ADDR_TYPE</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>ADDR_TYPE</columnName>
+ <caption>Adresstyp</caption>
+ </entityField>
+ <entityField>
+ <name>BUILDINGNO</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>BUILDINGNO</columnName>
+ <caption>Hausnummer</caption>
+ </entityField>
+ <entityField>
+ <name>CITY</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>CITY</columnName>
+ <caption>Stadt</caption>
+ </entityField>
+ <entityField>
+ <name>COUNTRY</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>COUNTRY</columnName>
+ <caption>Land</caption>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>DATE_EDIT</columnName>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>DATE_NEW</columnName>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DISTRICT</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>DISTRICT</columnName>
+ </entityField>
+ <entityField>
+ <name>REGION</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>REGION</columnName>
+ </entityField>
+ <entityField>
+ <name>RELATION_ID</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>RELATION_ID</columnName>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/relation_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>STATE</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>STATE</columnName>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>USER_EDIT</columnName>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>USER_NEW</columnName>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ZIP</name>
+ <tableName>ADDRESS</tableName>
+ <columnName>ZIP</columnName>
+ <caption>Postleitzahl</caption>
+ </entityField>
+ <entityIncomingField>
+ <name>OrgAddress_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
+ <entityName>Org_entity</entityName>
+ <fieldName>OrgAddress_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityIncomingField>
+ <entityParameter>
+ <name>RelId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityIncomingField>
+ <name>PersAddress_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
+ <entityName>Pers_entity</entityName>
+ <fieldName>PersAddress_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityIncomingField>
+ </entityFields>
+ <linkInformation>
+ <linkInformation>
+ <name>a0278c8c-4d5a-4ac9-b0eb-fec72f9e8576</name>
+ <tableName>ADDRESS</tableName>
+ <primaryKey>ADDRESSID</primaryKey>
+ <isUIDTable v="true" />
+ </linkInformation>
+ </linkInformation>
+</entity>
diff --git a/entity/Address_entity/conditionProcess.js b/entity/Address_entity/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..08c672c31be0767f42ccbf85b5de0a459d9e0c74
--- /dev/null
+++ b/entity/Address_entity/conditionProcess.js
@@ -0,0 +1,8 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+
+if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null)
+ result.string("ADDRESS.RELATION_ID = ('" + vars.getString("$param.RelId_param") + "')");
+else
+ result.string("1 = 2");
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/date_new/valueProcess.js b/entity/Address_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..eedddb3cf02507bf4da985cf9db27f79c8468b55
--- /dev/null
+++ b/entity/Address_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.getString("$sys.date"));
+
diff --git a/entity/Address_entity/entityfields/relation_id/valueProcess.js b/entity/Address_entity/entityfields/relation_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d085e3aff5efa91eca352d8fc20a4c2c7bbdd4a
--- /dev/null
+++ b/entity/Address_entity/entityfields/relation_id/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+ if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null)
+ result.string(vars.getString("$param.RelId_param"));
+}
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/user_new/valueProcess.js b/entity/Address_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f9abb66712ca12b68fe96e5a37b1bb123c484bc7
--- /dev/null
+++ b/entity/Address_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index c0b427f24c8ca3f35cfe1f556ef0727c7d2726a7..78a9fd3b28e5b502eb2e2e4d7d4914d1b68a61b3 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -182,6 +182,29 @@
<name>Org_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
</entityIncomingField>
+ <entityOutgoingField>
+ <name>OrgAddress_dfo</name>
+ <title>Adressen</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <caption>Adressen</caption>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>OrgAddress_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RelId_param</name>
+ <code>%aditoprj%/entity/Org_entity/entityfields/orgaddress_dfo/children/relid_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
+ <entityField>
+ <name>ADDRESS_ID</name>
+ <tableName>RELATION</tableName>
+ <columnName>ADDRESS_ID</columnName>
+ </entityField>
</entityFields>
<linkInformation>
<linkInformation>
diff --git a/entity/Org_entity/entityfields/org_date_new/valueProcess.js b/entity/Org_entity/entityfields/org_date_new/valueProcess.js
index 97857fcc5a5eb0e57e6f244b4d4c9547dc0ff2f1..eedddb3cf02507bf4da985cf9db27f79c8468b55 100644
--- a/entity/Org_entity/entityfields/org_date_new/valueProcess.js
+++ b/entity/Org_entity/entityfields/org_date_new/valueProcess.js
@@ -3,8 +3,6 @@ import("system.vars");
import("system.result");
import("system.neon");
-logging.log("stateDateNew: " + vars.get("$sys.operatingstate"))
-
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.date"));
diff --git a/entity/Org_entity/entityfields/orgaddress_dfo/children/relid_param/code.js b/entity/Org_entity/entityfields/orgaddress_dfo/children/relid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..aa257b8b78ed72ce888626a9fa22a890e3c9bf17
--- /dev/null
+++ b/entity/Org_entity/entityfields/orgaddress_dfo/children/relid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index dbdfa0553e05695cc159cb75d7d69b1d2dc5a978..1117ceb3ea388a0605b534c113d6621c97b9ec83 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -202,6 +202,24 @@
<caption>Firma</caption>
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/orgname/valueProcess.js</valueProcess>
</entityField>
+ <entityOutgoingField>
+ <name>PersAddress_dfo</name>
+ <title>Adressen</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <caption>Adressen</caption>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>PersAddress_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RelId_param</name>
+ <code>%aditoprj%/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
</entityFields>
<linkInformation>
<linkInformation>
diff --git a/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..aa257b8b78ed72ce888626a9fa22a890e3c9bf17
--- /dev/null
+++ b/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
diff --git a/neonContext/Address_context/Address_context.aod b/neonContext/Address_context/Address_context.aod
new file mode 100644
index 0000000000000000000000000000000000000000..f55d6ecaf3c88676f76a61a13d45e7e082ae87f6
--- /dev/null
+++ b/neonContext/Address_context/Address_context.aod
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+ <name>Address_context</name>
+ <title>Adressen</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>AddressFilter_view</filterview>
+ <editview>AddressEdit_view</editview>
+ <entity>Address_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>f36427d6-75b7-4f67-9cd9-e391bca3166e</name>
+ <view>AddressFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>306f9a88-42be-4838-9698-c6ac5c6a7f57</name>
+ <view>AddressEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>0b476864-5342-4cb2-aa0c-f1ab29bb99b4</name>
+ <view>AddressList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f4c516c0-b9de-47df-91e4-43bdb3297fe7</name>
+ <view>AdressMultiEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/AddressEdit_view/AddressEdit_view.aod b/neonView/AddressEdit_view/AddressEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..dd4de193749296e461ffef9e9079f3044e8f6a9b
--- /dev/null
+++ b/neonView/AddressEdit_view/AddressEdit_view.aod
@@ -0,0 +1,43 @@
+<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+ <name>AddressEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Generic_template</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>b510378e-dfd3-4cec-bc2e-84b72aebb2b6</name>
+ <entityField>ADDR_TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c70668f3-6722-4a90-86d6-0d89be06dbe1</name>
+ <entityField>ADDRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0eac157d-de3d-4ff0-9ac2-1927b33c854a</name>
+ <entityField>BUILDINGNO</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c70677f3-6722-4a90-86d6-0d89be06dbe1</name>
+ <entityField>ZIP</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>fafca9d6-c6dd-4b66-b1ff-1d6ba451827b</name>
+ <entityField>CITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d8a7a16b-9d7f-44d7-bbb1-b0404d5b8b8f</name>
+ <entityField>COUNTRY</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AddressFilter_view/AddressFilter_view.aod b/neonView/AddressFilter_view/AddressFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7dee8657190dd52d97135d8930d09a38ae6078bf
--- /dev/null
+++ b/neonView/AddressFilter_view/AddressFilter_view.aod
@@ -0,0 +1,42 @@
+<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+ <name>AddressFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table_template</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>852583d4-1883-4b36-963f-6f3a4df63a89</name>
+ <entityField>ADDR_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>32b8b6f0-bdbc-4a4b-b98c-0a22861b0e6c</name>
+ <entityField>ADDRESS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9d93662b-f024-4b0b-a37e-6cc88afb9dd2</name>
+ <entityField>BUILDINGNO</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>10e9e08f-db9b-4789-a4b4-b1a0a750b169</name>
+ <entityField>ZIP</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>57247c5c-6498-420b-b288-68ca316cf7f2</name>
+ <entityField>CITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>10e9e08f-db9b-4789-a4b4-b2a0a750b069</name>
+ <entityField>COUNTRY</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6938f5a9bce3c12260b578c73dcf79fdb14ef501
--- /dev/null
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -0,0 +1,38 @@
+<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+ <name>AddressList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>TitledList_template</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>49e14587-34f7-4f09-916c-9eb4aaf55509</name>
+ <entityField>ADDR_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
+ <entityField>ADDRESS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>935bcecf-fdd9-4e82-a53f-3c3082c85340</name>
+ <entityField>BUILDINGNO</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0336ea99-c4a1-4f39-b5aa-a520a7dcbaab</name>
+ <entityField>ZIP</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
+ <entityField>CITY</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..8d4fbe5c22d9324a7e90b79c42d565bf17a3d49c
--- /dev/null
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -0,0 +1,42 @@
+<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+ <name>AdressMultiEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>GenericMultiple_template</name>
+ <entityField>#ENTITY</entityField>
+ <children>
+ <neonTableColumn>
+ <name>b210372e-dfd3-4cec-bc2e-84b72aebb2b6</name>
+ <entityField>ADDR_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c20668f3-6722-4a90-86d6-0d29be06dbe1</name>
+ <entityField>ADDRESS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0eac127d-de3d-4ff0-9ac2-1227b33c854a</name>
+ <entityField>BUILDINGNO</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0eac127d-de3d-aff0-9ac2-1327b33c854a</name>
+ <entityField>ZIP</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fafca2d6-c2dd-4b66-b1ff-1d6ba451827b</name>
+ <entityField>CITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d8a7a26b-9d7f-44d7-bbb1-b0404d5b8b2f</name>
+ <entityField>COUNTRY</entityField>
+ </neonTableColumn>
+ </children>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrgEdit_view/OrgEdit_view.aod b/neonView/OrgEdit_view/OrgEdit_view.aod
index 8f7ef2c2f9e648c096745268580d72d697cd7bda..3585d7d5a5683ba24f265dbdcb4b6a4890e24dc5 100644
--- a/neonView/OrgEdit_view/OrgEdit_view.aod
+++ b/neonView/OrgEdit_view/OrgEdit_view.aod
@@ -39,5 +39,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>148e3a6c-d30b-470c-84e5-273293348611</name>
+ <entityField>OrgAddress_dfo</entityField>
+ <view>AdressMultiEdit_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrgMain_view/OrgMain_view.aod b/neonView/OrgMain_view/OrgMain_view.aod
index edb4bb4693ef97734f73efa8ada4fe2fc86b9acc..402507e167087d8fedc232c6c56f5572b53a1819 100644
--- a/neonView/OrgMain_view/OrgMain_view.aod
+++ b/neonView/OrgMain_view/OrgMain_view.aod
@@ -25,5 +25,10 @@
<entityField>PersOrg_dfo</entityField>
<view>PersFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>cce1d1ef-cc69-455a-a2a6-3357c80bb235</name>
+ <entityField>OrgAddress_dfo</entityField>
+ <view>AddressFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrgPreview_view/OrgPreview_view.aod b/neonView/OrgPreview_view/OrgPreview_view.aod
index 276ed3e4b3384276312d42c29ecb06d1ebb2b6e7..e6a81a25797ffeb44c1ff4b05aee834ddd19a069 100644
--- a/neonView/OrgPreview_view/OrgPreview_view.aod
+++ b/neonView/OrgPreview_view/OrgPreview_view.aod
@@ -15,6 +15,11 @@
<descriptionField>CUSTOMERCODE_DISPLAY_fieldGroup</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <neonViewReference>
+ <name>df605bb6-5d18-4233-abc0-1da82e4910ca</name>
+ <entityField>OrgAddress_dfo</entityField>
+ <view>AddressList_view</view>
+ </neonViewReference>
<genericViewTemplate>
<name>OrgInfo_template</name>
<showDrawer v="true" />
diff --git a/neonView/PersEdit_view/PersEdit_view.aod b/neonView/PersEdit_view/PersEdit_view.aod
index c4212714cf9c0a61e665a136c76f3f16653d0337..c0d33091202946b66f711914e01a7d26be00e134 100644
--- a/neonView/PersEdit_view/PersEdit_view.aod
+++ b/neonView/PersEdit_view/PersEdit_view.aod
@@ -50,5 +50,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>78dcb8dc-61c3-4cf9-a37b-28dbeeb27001</name>
+ <entityField>PersAddress_dfo</entityField>
+ <view>AdressMultiEdit_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersMain_view/PersMain_view.aod b/neonView/PersMain_view/PersMain_view.aod
index 5f77bdaab1821fb500a21fa9c0a13b65fe54691b..48adc67106f61ba794f87ac64063062f3d2af560 100644
--- a/neonView/PersMain_view/PersMain_view.aod
+++ b/neonView/PersMain_view/PersMain_view.aod
@@ -19,5 +19,10 @@
<entityField>PersHistory_dfo</entityField>
<view>HistoryFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>d23e96e5-24de-4aca-861e-f339b729da34</name>
+ <entityField>PersAddress_dfo</entityField>
+ <view>AddressFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersPreview_view/PersPreview_view.aod b/neonView/PersPreview_view/PersPreview_view.aod
index 095e75bfbf77f9b050fdeb6a58c804aa193e9eaa..a340bf1982fefdab26c72ce5146e6f6f0c5a941f 100644
--- a/neonView/PersPreview_view/PersPreview_view.aod
+++ b/neonView/PersPreview_view/PersPreview_view.aod
@@ -15,6 +15,11 @@
<descriptionField>ORGNAME</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
+ <neonViewReference>
+ <name>4c4b1e66-fdc2-469c-a553-244b6dbffbe0</name>
+ <entityField>PersAddress_dfo</entityField>
+ <view>AddressList_view</view>
+ </neonViewReference>
<genericViewTemplate>
<name>PersInfo_template</name>
<showDrawer v="true" />
diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml
index 2c654d34fa6de937a4fbcd83e87c86c9fe4359f0..857ea874357ca9c803dfa8272f3f856945c6f11e 100644
--- a/others/db_changes/masterChangelog.xml
+++ b/others/db_changes/masterChangelog.xml
@@ -11,4 +11,5 @@
<include file="struct/relationChangePERSID.xml"/>
<include file="data/PERS_extendeddata.xml"/>
<include file="data/example_history/extendHLink_62330df6.xml"/>
+ <include file="struct/create_address.xml"/>
</databaseChangeLog>
diff --git a/others/db_changes/struct/create_address.xml b/others/db_changes/struct/create_address.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ff468cc0b2ae71a963244dbd0bb137986f2a4cde
--- /dev/null
+++ b/others/db_changes/struct/create_address.xml
@@ -0,0 +1,36 @@
+<?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="t.feldmann" id="11b5d1ac-08cf-3331-90a8-8cbc1438bfca">
+ <createTable tableName="ADDRESS">
+ <column name="ADDRESSID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_ADDRESS_ADDRESSID"/>
+ </column>
+ <column name="DATE_EDIT" type="TIMESTAMP"/>
+ <column name="DATE_NEW" type="TIMESTAMP">
+ <constraints nullable="false"/>
+ </column>
+ <column name="ADDR_TYPE" type="INTEGER"/>
+ <column name="USER_EDIT" type="VARCHAR(50)"/>
+ <column name="USER_NEW" type="VARCHAR(50)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="ADDRESS" type="VARCHAR(50)"/>
+ <column name="ADDRESSADDITION" type="VARCHAR(60)"/>
+ <column name="ADDRIDENTIFIER" type="VARCHAR(60)"/>
+ <column name="BUILDINGNO" type="VARCHAR(50)"/>
+ <column name="CITY" type="VARCHAR(50)"/>
+ <column name="COUNTRY" type="CHAR(2)"/>
+ <column name="DISTRICT" type="VARCHAR(50)"/>
+ <column name="REGION" type="VARCHAR(50)"/>
+ <column name="RELATION_ID" type="CHAR(36)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="STATE" type="VARCHAR(50)"/>
+ <column name="ZIP" type="VARCHAR(50)"/>
+ </createTable>
+ <addColumn
+ tableName="RELATION">
+ <column name="ADDRESS_ID" type="CHAR(36)" />
+ </addColumn>
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file