diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 96bc635802679fc3a083dfd0d8bb22df301af0cf..271a04c6943247f7fffba69ae840931189e4001b 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1176,6 +1176,207 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>PRODUCT</name>
+ <dbName></dbName>
+ <idColumn>PRODUCTID</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>ORG_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>
+ <entityFieldDb>
+ <name>UNIT</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>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>ADVERTISING</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="1" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>PRODUCTID</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>PRODUCTNAME</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>PRODUCTCODE</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>MINSTOCK</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2" />
+ <size v="14" />
+ <scale v="2" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>GROUPCODEID</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>STATUS</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>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>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>STANDARD</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>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 4339184f8a52a7999d43b4f7504b742b2fd30615..402f4cfa4db14bcfadc606390a4b2ab55495cc89 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -190,6 +190,12 @@
<fieldName>PersOrg_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
+ <entityDependency>
+ <name>25e5cc50-0443-4e79-8690-a47197706936</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>ProductOrg_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
</dependencies>
</entityIncomingField>
<entityOutgoingField>
@@ -238,6 +244,15 @@
</entityParameter>
</children>
</entityOutgoingField>
+ <entityOutgoingField>
+ <name>OrgProduct_dfo</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>OrgProduct_dfi</fieldName>
+ </dependency>
+ </entityOutgoingField>
</entityFields>
<linkInformation>
<linkInformation>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..8a978f3d02a099676885a61e1f2149674971759d
--- /dev/null
+++ b/entity/Product_entity/Product_entity.aod
@@ -0,0 +1,108 @@
+<?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>Product_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <alias>Data_alias</alias>
+ <recordContainerType>DB</recordContainerType>
+ <entityFields>
+ <entityField>
+ <name>ADVERTISING</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>ADVERTISING</columnName>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>DATE_EDIT</columnName>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>DATE_NEW</columnName>
+ </entityField>
+ <entityField>
+ <name>GROUPCODEID</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>GROUPCODEID</columnName>
+ </entityField>
+ <entityField>
+ <name>MINSTOCK</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>MINSTOCK</columnName>
+ </entityField>
+ <entityField>
+ <name>ORG_ID</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>ORG_ID</columnName>
+ </entityField>
+ <entityField>
+ <name>PRODUCTCODE</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>PRODUCTCODE</columnName>
+ </entityField>
+ <entityField>
+ <name>PRODUCTID</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>PRODUCTID</columnName>
+ </entityField>
+ <entityField>
+ <name>PRODUCTNAME</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>PRODUCTNAME</columnName>
+ </entityField>
+ <entityField>
+ <name>STANDARD</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>STANDARD</columnName>
+ </entityField>
+ <entityField>
+ <name>STATUS</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>STATUS</columnName>
+ </entityField>
+ <entityField>
+ <name>UNIT</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>UNIT</columnName>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>USER_EDIT</columnName>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <tableName>PRODUCT</tableName>
+ <columnName>USER_NEW</columnName>
+ </entityField>
+ <entityOutgoingField>
+ <name>ProductOrg_dfo</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Org_entity</entityName>
+ <fieldName>Org_dfi</fieldName>
+ </dependency>
+ </entityOutgoingField>
+ <entityIncomingField>
+ <name>OrgProduct_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>49cbec11-7d2e-4898-b63f-2e36aac9181e</name>
+ <entityName>Org_entity</entityName>
+ <fieldName>OrgProduct_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityIncomingField>
+ </entityFields>
+ <linkInformation>
+ <linkInformation>
+ <name>43c30a2b-7b59-46a2-9d8f-57ce4cde5d36</name>
+ <tableName>PRODUCT</tableName>
+ <primaryKey>PRODUCTID</primaryKey>
+ <isUIDTable v="true" />
+ </linkInformation>
+ </linkInformation>
+</entity>
diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml
index f110cd2378b9371d7757ad127e12709621cf12fe..6a15f451a32f811c1db43a755c55c0369aadb04a 100644
--- a/others/db_changes/masterChangelog.xml
+++ b/others/db_changes/masterChangelog.xml
@@ -8,6 +8,7 @@
<include file="struct/relationChangePERSID.xml"/>
<include file="struct/create_address.xml"/>
<include file="struct/create_comm.xml"/>
+ <include file="struct/create_product.xml"/>
<include file="misc/1535533490181_persChanges.xml"/>
<include file="struct/1535612802325_addressChange.xml"/>
<include file="data/example_org/ORG_privat.xml"/>
diff --git a/others/db_changes/struct/create_product.xml b/others/db_changes/struct/create_product.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1db1f002e7b6914d75f3695031798e5cec4c11f3
--- /dev/null
+++ b/others/db_changes/struct/create_product.xml
@@ -0,0 +1,27 @@
+<?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.schroeger" id="40ad5330-2163-400c-8fa7-d0d2461774b7">
+ <createTable tableName="PRODUCT">
+ <column name="PRODUCTID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_PRODUCT_PRODUCTID"/>
+ </column>
+ <column name="ADVERTISING" type="CHAR(1)"/>
+ <column name="GROUPCODEID" type="INTEGER"/>
+ <column name="MINSTOCK" type="NUMERIC(14,2)"/>
+ <column name="ORG_ID" type="CHAR(36)"/>
+ <column name="PRODUCTCODE" type="VARCHAR(50)"/>
+ <column name="PRODUCTNAME" type="VARCHAR(50)"/>
+ <column name="STATUS" type="INTEGER"/>
+ <column name="UNIT" type="INTEGER"/>
+ <column name="STANDARD" type="INTEGER"/>
+ <column name="DATE_EDIT" type="TIMESTAMP"/>
+ <column name="DATE_NEW" type="TIMESTAMP">
+ <constraints nullable="false"/>
+ </column>
+ <column name="USER_EDIT" type="VARCHAR(50)"/>
+ <column name="USER_NEW" type="VARCHAR(50)">
+ <constraints nullable="false"/>
+ </column>
+ </createTable>
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file