diff --git a/.liquibase/Data_alias/basic/2019.1.4/create_dunninglevel_keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/create_dunninglevel_keyword.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/create_dunninglevel_keyword.xml
rename to .liquibase/Data_alias/basic/2019.1.4/Salesorder/create_dunninglevel_keyword.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/create_ordertype_keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/create_ordertype_keyword.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/create_ordertype_keyword.xml
rename to .liquibase/Data_alias/basic/2019.1.4/Salesorder/create_ordertype_keyword.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/update_Salesorder.xml b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml
similarity index 72%
rename from .liquibase/Data_alias/basic/2019.1.4/update_Salesorder.xml
rename to .liquibase/Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml
index 0a03c722c22d925534c243e06bb6080dfbf0906a..0b09845c4345ce3a800dc517b13c03af998532bd 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/update_Salesorder.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Salesorder/update_Salesorder.xml
@@ -3,8 +3,14 @@
     <changeSet author="m.mansour" id="a48f9e54-16ac-4bb8-8f2a-395f3035c55e">  
         
         <addColumn tableName="SALESORDER">
-            <column name="OBJECT_TYPE" type="NVARCHAR(63)">
-            </column>
+            <column name="OBJECT_TYPE" type="NVARCHAR(63)"/>
+            <column name="CANCELLATION " type="TINYINT"/>
+            <column name="UNPAID" type="INTEGER"/>
+            <column name="PAID" type="INTEGER"/>
+            <column name="PAYDUEDATE" type="DATETIME"/>
+            <column name="PAYDATE" type="DATETIME"/>
+            <column name="DUNNINGDATE" type="DATETIME"/>
+            <column name="DUNNINGLEVEL" type="CHAR(36)"/>
         </addColumn>
         <renameColumn newColumnName="OBJECT_ROWID" oldColumnName="SALESPROJECT_ID" tableName="SALESORDER" columnDataType="CHAR(36)"/>
         <update tableName="SALESORDER">
diff --git a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
index b1975265893aeb7cb35729c05479aaccd569cfbc..7599179a4345ad66a4528ca91e31d2db5673d9b9 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
@@ -184,7 +184,7 @@
     <include relativeToChangelogFile="true" file="AditoBasic/init_NotificationPriority.xml"/>
     <include relativeToChangelogFile="true" file="AditoBasic/init_NotificationState.xml"/>
     
-    <include relativeToChangelogFile="true" file="create_ordertype_keyword.xml"/>
-    <include relativeToChangelogFile="true" file="create_dunninglevel_keyword.xml"/>
-    <include relativeToChangelogFile="true" file="update_Salesorder.xml"/>
+    <include relativeToChangelogFile="true" file="Salesorder/create_ordertype_keyword.xml"/>
+    <include relativeToChangelogFile="true" file="Salesorder/create_dunninglevel_keyword.xml"/>
+    <include relativeToChangelogFile="true" file="Salesorder/update_Salesorder.xml"/>
 </databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
index b99f8dd61bd2d68f93f6279fd9022d1d6e68c772..9825fe170a5b4e709ecd4d537ce42324149acef4 100644
--- a/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
+++ b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
@@ -1,6 +1,6 @@
 <?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="c2f89ee9-0c4c-4961-935a-b399381c720d">
+<changeSet author="j.hoermann" id="c8469998-9763-4300-87af-925af8c8ea5a">
 	<createTable tableName="SALESORDER">
 		<column name="SALESORDERID" type="CHAR(36)">
                     <constraints primaryKey="true" primaryKeyName="PK_SALESORDER_SALESORDERID"/>
@@ -12,13 +12,6 @@
 		<column name="SALESORDER_ID" type="CHAR(36)"/>
                 <column name="ORDERTYPE" type="CHAR(36)"/>
                 <column name="ORDERSTATUS" type="TINYINT"/>
-                <column name="CANCELLATION " type="TINYINT"/>
-                <column name="UNPAID" type="INTEGER"/>
-                <column name="PAID" type="INTEGER"/>
-                <column name="PAYDUEDATE" type="DATETIME"/>
-                <column name="PAYDATE" type="DATETIME"/>
-                <column name="DUNNINGDATE" type="DATETIME"/>
-                <column name="DUNNINGLEVEL" type="CHAR(36)"/>
                 <column name="HEADER" type="NCLOB"/>
                 <column name="FOOTER" type="NCLOB"/>
                 <column name="SALESORDERDATE" type="DATETIME"/>
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index d4dd5fbc34d9c24e6f671cbef255b01a12030e2a..f066e7be58fb913f9943bf5dd5021b2d1c8bbe25 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -60,6 +60,10 @@
           <name>c4b3c8ed-4625-4785-abc6-c726171ff7f4</name>
           <entityField>FOOTER</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>97eca233-7383-4fb6-97ff-d722e422befa</name>
+          <entityField>SALESORDERDATE</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>31ed9eba-66a1-4114-a1fe-61ef475d532d</name>
           <entityField>PAID</entityField>