diff --git a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
index b97380ae77faae94a57c4911178d14113d9f815a..4a4a9e34293722e9259185911b460a68968b0f9d 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
@@ -160,4 +160,5 @@
<include relativeToChangelogFile="true" file="Attributes/AB_ATTRIBUTEUSAGE.xml"/>
<include relativeToChangelogFile="true" file="create_description_translation.xml"/>
+ <include relativeToChangelogFile="true" file="remove_productInfo_language.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/remove_productInfo_language.xml b/.liquibase/Data_alias/basic/2019.1.4/remove_productInfo_language.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1cd980ac242eb266a59827214d707d6c55b318fd
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/remove_productInfo_language.xml
@@ -0,0 +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">
+<changeSet author="m.mansour" id="99b87771-f603-49b7-85df-09931eac69df">
+ <dropColumn tableName="PRODUCT" columnName="LANGUAGE"/>
+ <dropColumn tableName="PRODUCT" columnName="INFO"/>
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
index d17b83d957a2a8e6454bde2c62835aef181192d5..e8fb8fcc3a97e72d1261a1ea4b1b341043550ef1 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
@@ -75,7 +75,6 @@
<column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
<column name="DATE_NEW" valueDate="2019-05-16T01:43:25"/>
<column name="GROUPCODEID" value="PRODUCTGROUP1"/>
- <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
<column name="MINSTOCK" valueNumeric="10"/>
<column name="PRODUCTCODE" value="WG0001"/>
<column name="PRODUCTID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
@@ -85,12 +84,18 @@
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
+ <insert tableName="DESCRIPTIONTRANSLATION">
+ <column name="DESCRIPTIONTRANSLATIONID" value="70108db9-2c27-438d-9dff-d01c8b54c8c7"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="OBJECT_ROWID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
+ <column name="LANG" value="deu"/>
+ <column name="DESCRIPTION" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+ </insert>
<insert tableName="PRODUCT">
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
<column name="DATE_NEW" valueDate="2019-05-16T01:48:31"/>
<column name="GROUPCODEID" value="PRODUCTGROUP2"/>
- <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
<column name="PRODUCTCODE" value="WG2002"/>
<column name="PRODUCTID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
<column name="PRODUCTNAME" value="WG2 Produkt 1"/>
@@ -99,12 +104,18 @@
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
+ <insert tableName="DESCRIPTIONTRANSLATION">
+ <column name="DESCRIPTIONTRANSLATIONID" value="91f7d8e8-136c-46de-8d01-ba231ebb49e3"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="OBJECT_ROWID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
+ <column name="LANG" value="deu"/>
+ <column name="DESCRIPTION" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
+ </insert>
<insert tableName="PRODUCT">
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
<column name="DATE_NEW" valueDate="2019-05-16T01:49:51"/>
<column name="GROUPCODEID" value="PRODUCTGROUP2"/>
- <column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
<column name="PRODUCTCODE" value="WG2003"/>
<column name="PRODUCTID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
<column name="PRODUCTNAME" value="WG2 Produkt 2"/>
@@ -113,6 +124,13 @@
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
+ <insert tableName="DESCRIPTIONTRANSLATION">
+ <column name="DESCRIPTIONTRANSLATIONID" value="020ca255-eae8-4771-a4a3-e62d6702f9f0"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="OBJECT_ROWID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
+ <column name="LANG" value="deu"/>
+ <column name="DESCRIPTION" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
+ </insert>
<insert tableName="PRODUCT">
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 520aa65dd73f3658a108e2863d3ec291b5556c33..4dfcdd5881522cf1e96e1e4e139e59d019ed2a00 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1779,48 +1779,6 @@
</customStringProperty>
</customProperties>
</entityFieldDb>
- <entityFieldDb>
- <name>INFO</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2005" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title>Description</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- </customProperties>
- </entityFieldDb>
- <entityFieldDb>
- <name>LANGUAGE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="3" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title>Language</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- </customProperties>
- </entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
diff --git a/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.displayvalue/expression.js b/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.displayvalue/expression.js
index 66406524c0b9bb6d95b1a4450b1ed61daeb16b4e..c0156ae28d7ef04c0c79d5678f96cf52ed668f83 100644
--- a/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.displayvalue/expression.js
+++ b/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.displayvalue/expression.js
@@ -1,7 +1,5 @@
-import("system.logging");
import("system.result");
import("Keyword_lib");
var sql = LanguageKeywordUtils.getResolvedTitleSqlPart("DESCRIPTIONTRANSLATION.LANG");
-logging.log(sql)
result.string(sql);
\ No newline at end of file
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 439c799ebb507bf1cb787e323fe7ec070a3d9be2..113932dd5ccb725f589389436ad196fc102f05e4 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -55,12 +55,6 @@
<fieldName>Languages</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>0b2dd6bf-933f-4476-9071-de9d5e23800b</name>
- <entityName>Product_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>030ac1ae-5f5b-4815-b9f4-1121b7c881ad</name>
<entityName>Contact_entity</entityName>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index d43d263ba277e79dcacbee3d286403474473c755..d3d32965cffe17c91ffc124a8aafba1b730aa4cf 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -202,11 +202,6 @@
<element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
- <entityField>
- <name>INFO</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- </entityField>
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
@@ -275,22 +270,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>LANGUAGE</name>
- <consumer>Languages</consumer>
- <searchable v="false" />
- <titleProcess>%aditoprj%/entity/Product_entity/entityfields/language/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/Product_entity/entityfields/language/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityConsumer>
- <name>Languages</name>
- <dependency>
- <name>dependency</name>
- <entityName>Language_entity</entityName>
- <fieldName>ISO3Name</fieldName>
- </dependency>
- </entityConsumer>
<entityConsumer>
<name>Activities</name>
<dependency>
@@ -538,10 +517,6 @@
<name>CONTACT_ID.value</name>
<recordfield>PRODUCT.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>PRODUCT.INFO</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>GROUPCODEID.displayValue</name>
<expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
@@ -550,14 +525,6 @@
<name>UNIT.displayValue</name>
<expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LANGUAGE.value</name>
- <recordfield>PRODUCT.LANGUAGE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LANGUAGE.displayValue</name>
- <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>PRODUCT.USER_NEW</recordfield>
diff --git a/entity/Product_entity/entityfields/language/displayValueProcess.js b/entity/Product_entity/entityfields/language/displayValueProcess.js
deleted file mode 100644
index de5246774faf8a3f68bea969823cf3fe462d1504..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/language/displayValueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.db");
-import("system.translate");
-import("system.vars");
-import("system.result");
-import("KeywordRegistry_basic");
-import("Keyword_lib");
-import("Sql_lib");
-
-result.string(translate.text(db.cell(SqlCondition.begin().andPrepareVars("AB_LANGUAGE.ISO3", "$field.LANGUAGE")
- .buildSql("select NAME_LATIN from AB_LANGUAGE", "1=2"))));
diff --git a/entity/Product_entity/entityfields/language/titleProcess.js b/entity/Product_entity/entityfields/language/titleProcess.js
deleted file mode 100644
index 04be2c545b0879ee1106eeb333161b65e5520edf..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/language/titleProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.translate");
-import("system.result");
-
-result.string(translate.text("Language") + " (" + translate.text("Description") + ")");
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/language/valueProcess.js b/entity/Product_entity/entityfields/language/valueProcess.js
deleted file mode 100644
index fef47cfe6e7315f7dad5f4864bbe69e1276f7f38..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/language/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("system.result");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.getString("$field.LANGUAGE"))
- result.string("deu");
\ No newline at end of file
diff --git a/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js b/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
deleted file mode 100644
index 368c9593d9bde80e463b49879026c47394294f12..0000000000000000000000000000000000000000
--- a/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = LanguageKeywordUtils.getResolvedTitleSqlPart("PRODUCT.LANGUAGE");
-result.string(sql);
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 1c51ddec69c3f914e0fc22b0b0f880d95342babf..967dd861748ab1f617c2c6cd81ad8d502371705f 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -613,6 +613,10 @@
<key>Confirmed</key>
<value>Bestätigt</value>
</entry>
+ <entry>
+ <key>Descriptions</key>
+ <value>Beschreibungen</value>
+ </entry>
<entry>
<key>Free</key>
<value>Frei</value>
diff --git a/neonContext/Product/Product.aod b/neonContext/Product/Product.aod
index 64a4cf42e7c55d9be744f9b415413a62aeeaa7b3..a91bfe8529ca21610ebc1edcea60092691199a93 100644
--- a/neonContext/Product/Product.aod
+++ b/neonContext/Product/Product.aod
@@ -1,34 +1,30 @@
-<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>Product</name>
- <title>Product</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>ProductMain_view</mainview>
- <filterview>ProductFilter_view</filterview>
- <editview>ProductEdit_view</editview>
- <preview>ProductPreview_view</preview>
- <lookupview>ProductFilter_view</lookupview>
- <entity>Product_entity</entity>
- <references>
- <neonViewReference>
- <name>8a0bd726-b3f6-4c5a-bd2a-251285b9ad90</name>
- <view>ProductMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ecb98950-5460-44ab-8da8-757bd143c03e</name>
- <view>ProductEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>cc985c0d-755f-46bd-89a2-71c5c6227198</name>
- <view>ProductFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>5580ead4-2257-4cdb-a3ac-5e7067c4c1ab</name>
- <view>ProductPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>f5f7c429-56ca-421e-8e43-e8da14ca88a0</name>
- <view>ProductDescription_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>Product</name>
+ <title>Product</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>ProductMain_view</mainview>
+ <filterview>ProductFilter_view</filterview>
+ <editview>ProductEdit_view</editview>
+ <preview>ProductPreview_view</preview>
+ <lookupview>ProductFilter_view</lookupview>
+ <entity>Product_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>8a0bd726-b3f6-4c5a-bd2a-251285b9ad90</name>
+ <view>ProductMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ecb98950-5460-44ab-8da8-757bd143c03e</name>
+ <view>ProductEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>cc985c0d-755f-46bd-89a2-71c5c6227198</name>
+ <view>ProductFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5580ead4-2257-4cdb-a3ac-5e7067c4c1ab</name>
+ <view>ProductPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/ProductDescription_view/ProductDescription_view.aod b/neonView/ProductDescription_view/ProductDescription_view.aod
deleted file mode 100644
index b5f0f9e807ae07a33d7f8f3eca82c6a53086666b..0000000000000000000000000000000000000000
--- a/neonView/ProductDescription_view/ProductDescription_view.aod
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>ProductDescription_view</name>
- <title>Description</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Description</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>f0743860-a2f8-4c9c-998f-200ad1e67bb2</name>
- <entityField>LANGUAGE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>cd7cd596-0f25-4067-9aac-5ee188a3af64</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod
index 20027b6e81447837ee9425792d3954214e92a3b6..d4a5ea781da01966d342115ef24990cb144f8485 100644
--- a/neonView/ProductEdit_view/ProductEdit_view.aod
+++ b/neonView/ProductEdit_view/ProductEdit_view.aod
@@ -1,68 +1,60 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>ProductEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>d5cfa031-1bce-43b3-b1c1-d79a4c1205dc</name>
- <entityField>ADVERTISING</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>950b57a7-df15-42a3-9f94-3377ed757ba3</name>
- <entityField>GROUPCODEID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>77197b19-54ea-493c-8d12-27391cd54a7a</name>
- <entityField>MINSTOCK</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>472939e5-a69b-4eba-986f-0b47e72d0e9d</name>
- <entityField>ORGANISATION_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>cefb3dc8-8d9b-47c4-a0f8-e78e66303ec7</name>
- <entityField>PRODUCTCODE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0019c5bd-368f-457a-b6e3-dd1d12cbe19e</name>
- <entityField>PRODUCTNAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>5882a13d-3f07-4017-ad5b-042ee49c67d4</name>
- <entityField>LANGUAGE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>07f4aa57-24e9-4ce2-8b81-c4a3e8bcbce6</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>49b07dd2-1ee1-4b80-88a7-daf4879848d2</name>
- <entityField>STATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>a068f12a-ed45-4997-9e94-c865ccffee2a</name>
- <entityField>UNIT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0c921c3d-df1a-4794-862b-6d190d6ef04e</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>34659538-e8a5-4f76-9710-a322548885ef</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationMultiEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ProductEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>d5cfa031-1bce-43b3-b1c1-d79a4c1205dc</name>
+ <entityField>ADVERTISING</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>950b57a7-df15-42a3-9f94-3377ed757ba3</name>
+ <entityField>GROUPCODEID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>77197b19-54ea-493c-8d12-27391cd54a7a</name>
+ <entityField>MINSTOCK</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>472939e5-a69b-4eba-986f-0b47e72d0e9d</name>
+ <entityField>ORGANISATION_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>cefb3dc8-8d9b-47c4-a0f8-e78e66303ec7</name>
+ <entityField>PRODUCTCODE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0019c5bd-368f-457a-b6e3-dd1d12cbe19e</name>
+ <entityField>PRODUCTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>49b07dd2-1ee1-4b80-88a7-daf4879848d2</name>
+ <entityField>STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a068f12a-ed45-4997-9e94-c865ccffee2a</name>
+ <entityField>UNIT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0c921c3d-df1a-4794-862b-6d190d6ef04e</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>34659538-e8a5-4f76-9710-a322548885ef</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index b5ea26c430afe88e5a505013a5b28d2ce58604eb..170b358c21eb28a731ed5f1b6cded2ffc0b8d475 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -25,9 +25,9 @@
<view>TaskFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>51f37fe5-91e1-4b76-83b3-be0319e871a4</name>
- <entityField>#ENTITY</entityField>
- <view>ProductDescription_view</view>
+ <name>c647d35b-3535-4acf-b6cb-c9786a353b08</name>
+ <entityField>DescriptionTranslations</entityField>
+ <view>DescriptionTranslationFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>7f416115-ff89-45ca-be10-ed568cac266c</name>
@@ -44,11 +44,6 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>c647d35b-3535-4acf-b6cb-c9786a353b08</name>
- <entityField>DescriptionTranslations</entityField>
- <view>DescriptionTranslationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>6ee1258f-b571-45c1-b833-f292361b5a04</name>
<entityField>AttributeTree</entityField>