diff --git a/.liquibase/Data_alias/basic/2020.2.0/alter_Order_1067701.xml b/.liquibase/Data_alias/basic/2020.2.0/alter_Order_1067701.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1f503a3bb62e08a11a872c5ab24e43fd2d0da0ee
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.0/alter_Order_1067701.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="Pierre und Imen" id="46a01232-99c9-4de6-b74b-9a9e650fc034">
+ <addColumn tableName="SALESORDER">
+ <column name="INFO" type="VARCHAR(255)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
index 620de869917cdd857fbdaee72b06b6b9ae84c26c..7271eec9d92bedc173f57d9f201cd87c16d06036 100644
--- a/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.0/changelog.xml
@@ -6,11 +6,12 @@
<include relativeToChangelogFile="true" file="ImportFields/changelog.xml"/>
<include relativeToChangelogFile="true" file="LeadimportMappingAssistant/changelog.xml"/>
<include relativeToChangelogFile="true" file="Lead/changelog.xml"/>
- <include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>
+ <!--<include relativeToChangelogFile="true" file="optimizeIndizes.xml"/>!-->
<include relativeToChangelogFile="true" file="addNotificationStateKeywords/addNotificationStateKeyword.xml"/>
<include relativeToChangelogFile="true" file="alter_ComunicationMedium_IdDatatype.xml"/>
<include relativeToChangelogFile="true" file="ReportDispatchImpl/add_DocumentTemplatePlaceOfUse.xml"/>
<include relativeToChangelogFile="true" file="alter_VisitrecommendationpriorityDatatype.xml"/>
<include relativeToChangelogFile="true" file="alter_KeywordTitlesForTranslation.xml"/>
<include relativeToChangelogFile="true" file="alter_CommrestrictionsEmployeeInvolved.xml"/>
+ <include relativeToChangelogFile="true" file="alter_Order_1067701.xml"/>
</databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 31f424c2a728efc81f5090e9734c65277f7d9c1a..54173a596ed76262dffa34c0260fde200c51da27 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4844,6 +4844,20 @@
</customBooleanProperty>
</customProperties>
</entityFieldDb>
+ <entityFieldDb>
+ <name>INFO</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 1e0d2d5b12cf647df08ece88cce5a9c629db8d77..4ec1550e56fde5ebe4302deb3ac3047af67cdb40 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -918,6 +918,11 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityField>
+ <name>INFO</name>
+ <title>Info</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1140,6 +1145,11 @@
<recordfield>SALESORDER.SALESORDERID</recordfield>
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>SALESORDER.INFO</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
</recordFieldMappings>
<filterExtensions>
<filterExtension>
diff --git a/neonContext/Order/Order.aod b/neonContext/Order/Order.aod
index d3f8ba0860f318063c886afe075a841d34da9858..3aed2f990aa1c611b9800ff36c2f9d14cb569f98 100644
--- a/neonContext/Order/Order.aod
+++ b/neonContext/Order/Order.aod
@@ -51,5 +51,13 @@
<name>99e9bf9f-3aa0-48c6-b136-6b0d81f602d4</name>
<view>OrderReport_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>87de3eca-c0cb-4aec-a32b-c7edc1cbac93</name>
+ <view>OrderCondition_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>777804d0-fe8d-43b6-9599-18fc46951d8f</name>
+ <view>OrderAddress_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/OrderAddress_view/OrderAddress_view.aod b/neonView/OrderAddress_view/OrderAddress_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..21cdfc0b23c9ba563d6e2deb9d0f0366a1850ec1
--- /dev/null
+++ b/neonView/OrderAddress_view/OrderAddress_view.aod
@@ -0,0 +1,52 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>OrderAddress_view</name>
+ <title>Address</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ <direction>HORIZONTAL</direction>
+ <maxDirectionElements v="2" />
+ <autoHeight v="false" />
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>PaymentAddress</name>
+ <editMode v="false" />
+ <showDrawer v="true" />
+ <drawerCaption>Payment Address</drawerCaption>
+ <fixedDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>4064a2da-3ede-4a13-b1d6-2d07822ab451</name>
+ <entityField>ChosenPaymentAddress</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a6cf6ba2-6865-4735-a1f4-c09e083995ba</name>
+ <entityField>PAYMENTADDRESS</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>DeliveryAddress</name>
+ <editMode v="false" />
+ <showDrawer v="true" />
+ <drawerCaption>Delivery Address</drawerCaption>
+ <fixedDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>2e9298ca-38e4-4d8e-a20f-a0688a4c4b4e</name>
+ <entityField>ChosenDeliveryAddress</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d2a2e6e9-069d-464b-aca5-d0c2cbee2c10</name>
+ <entityField>DELIVERYADDRESS</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrderCondition_view/OrderCondition_view.aod b/neonView/OrderCondition_view/OrderCondition_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4559612f30fb0d13b146ebe07bc69b71694b4807
--- /dev/null
+++ b/neonView/OrderCondition_view/OrderCondition_view.aod
@@ -0,0 +1,61 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>OrderCondition_view</name>
+ <title>Info</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ <direction>HORIZONTAL</direction>
+ <maxDirectionElements v="2" />
+ <autoHeight v="true" />
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Conditions</name>
+ <showDrawer v="true" />
+ <drawerCaption>Condition</drawerCaption>
+ <fixedDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <title>Condition</title>
+ <fields>
+ <entityFieldLink>
+ <name>fdb5d3bd-d8cb-486f-b5dd-d39eade0184a</name>
+ <entityField>PAYMENTTERMS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c0db758d-be42-47bc-95f4-7ba00544b98c</name>
+ <entityField>DELIVERYTERMS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3644cf2a-508e-4adb-a821-f4bbe5975db2</name>
+ <entityField>PAYDUEDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a15c9d22-3a20-49e7-a37b-c10443de106a</name>
+ <entityField>CURRENCY</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Information</name>
+ <showDrawer v="true" />
+ <drawerCaption>Information</drawerCaption>
+ <fixedDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <title>Information</title>
+ <fields>
+ <entityFieldLink>
+ <name>ae0e3cd0-deb8-49e0-a0a1-c0212cb036e1</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>437fca44-8d53-426d-b23c-4295acd92d57</name>
+ <entityField>#ENTITY</entityField>
+ <view>OrderAddress_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index 428d0c02e07af523318e7f24d35f87230edab64f..0e4839d8caed931b9ad2c0714ac1a36cc983b87e 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -19,6 +19,11 @@
<entityField>Orderitems</entityField>
<view>OrderitemFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>28bc7bdd-f1d5-49dc-9afb-c2e72ed5410d</name>
+ <entityField>#ENTITY</entityField>
+ <view>OrderCondition_view</view>
+ </neonViewReference>
<neonViewReference>
<name>1e0af6a9-9bb6-47b5-944b-636d21ac74d2</name>
<entityField>AttributeTree</entityField>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index 449cb53093e44483cf3aa756620e62102d37d113..dd3e2b5c9c8d813268ba78ec12c31384c92db3b7 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -55,14 +55,6 @@
<name>22013ee3-0ea1-4830-affd-73429ebd18f5</name>
<entityField>PAYDATE</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>e58a3aab-0cd7-493f-a24e-ed9e30f970ce</name>
- <entityField>PAYMENTTERMS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8f976c0e-f31d-4482-a8f7-7c93864f1815</name>
- <entityField>DELIVERYTERMS</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>39a40fbb-b3af-49a2-8ce2-0ece7bbf6fda</name>
<entityField>ORDERSTATUS</entityField>