From 4e712270994a7267c0629e868134b837e0eca334 Mon Sep 17 00:00:00 2001
From: Mohamed Mansour <m.mansour@adito.de>
Date: Mon, 12 Aug 2019 16:06:49 +0200
Subject: [PATCH] Belege: Demodata fix and db table update.

---
 .../_demoData/generatedData/SALESORDER.xml    | 12 +++++++----
 aliasDefinition/Data_alias/Data_alias.aod     | 21 -------------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
index 6be51f3a371..66917057ed7 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
@@ -218,7 +218,8 @@
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="SALESORDER">
-      <column name="ADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="PAYMENTADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="DELIVERYADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="FOOTER" value="Unsere Zahlungkonditionen finden sie hier:"/>
@@ -241,7 +242,8 @@
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="SALESORDER">
-      <column name="ADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="PAYMENTADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="DELIVERYADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
@@ -263,7 +265,8 @@
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="SALESORDER">
-      <column name="ADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="PAYMENTADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
+      <column name="DELIVERYADDRESS" value="Skyscraper Bau GmbH&#10;Baustraße 64&#10;70173 Stuttgart"/>
       <column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:&#10;&#10;Produkt: &#10;Produkt:"/>
@@ -288,7 +291,8 @@
       <column name="VERSNR" valueNumeric="1"/>
     </insert>
     <insert tableName="SALESORDER">
-      <column name="ADDRESS" value="Transatlantik Logistics GmbH&#10;Hafenstraße 12&#10;88045 Friedrichshafen"/>
+      <column name="PAYMENTADDRESS" value="Transatlantik Logistics GmbH&#10;Hafenstraße 12&#10;88045 Friedrichshafen"/>
+      <column name="DELIVERYADDRESS" value="Transatlantik Logistics GmbH&#10;Hafenstraße 12&#10;88045 Friedrichshafen"/>
       <column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="CURRENCY" value="EUR                                 "/>
       <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index f4ccf45de71..186ac933073 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4265,27 +4265,6 @@
                 <title>Salesorder Id</title>
                 <description></description>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>ADDRESS</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>Address</title>
-                <description></description>
-                <customProperties>
-                  <customBooleanProperty>
-                    <name>log</name>
-                    <global v="false" />
-                    <property v="true" />
-                  </customBooleanProperty>
-                </customProperties>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>OFFER_ID</name>
                 <dbName></dbName>
-- 
GitLab