diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml
index 8b15018bb73995af0cfb5ee93112d531d68911f5..da270e2a062aedd10d76162f078d79e2a70526ce 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/activity.xml
@@ -30,7 +30,7 @@
       <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:55:36"/>
       <column name="ACTIVITYID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
-      <column name="ENTRYDATE" valueDate="2018-12-26T08:55:00"/>
+      <column name="ENTRYDATE" valueDate="2021-05-03T08:55:00"/>
       <column name="DATE_EDIT" valueDate="2019-11-15T07:55:37"/>
       <column name="INFO" value="&lt;p&gt;Anrede: Herr&lt;/p&gt;&#10;&#10;&lt;p&gt;Vorname:Markus&lt;/p&gt;&#10;&#10;&lt;p&gt;Nachname:Altinger&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail:maltinger@industrial-steel.de&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Sehr geehrte Damen und Herren,&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;unsere Firma hat Interesse an ihren Produkten.&lt;/p&gt;&#10;&#10;&lt;p&gt;Bitte kontaktieren sie mich f&amp;uuml;r weitere Besprechungen.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Beste Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Markus Altinger&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="DIRECTION" value="i"/>
@@ -58,17 +58,6 @@
       <column name="INFO" value="&lt;p&gt;Prim&amp;auml;r die Fragen gem&amp;auml;&amp;szlig; Agenda besprochen - Unterlagen befinden sich auf dem Filerverzeichnis.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="DIRECTION" value="o"/>
     </insert>
-    <insert tableName="activity">
-      <column name="SUBJECT" value="telefonischer Austausch"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2020-09-16T07:47:03"/>
-      <column name="ACTIVITYID" value="18ed06df-30b2-4d59-a4b4-a6e646f6f05a"/>
-      <column name="ENTRYDATE" valueDate="2020-09-16T07:47:00"/>
-      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="CATEGORY" value="PHONE"/>
-      <column name="INFO" value="&lt;p&gt;Gespr&amp;auml;ch zum Wachstumspotential 2021&lt;/p&gt;&#10;"/>
-      <column name="DIRECTION" value="o"/>
-    </insert>
     <insert tableName="activity">
       <column name="SUBJECT" value="Einladung zum GfK-Abend"/>
       <column name="USER_EDIT" value="Admin"/>
@@ -127,7 +116,7 @@
       <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:57:15"/>
       <column name="ACTIVITYID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
-      <column name="ENTRYDATE" valueDate="2020-02-03T07:57:00"/>
+      <column name="ENTRYDATE" valueDate="2021-06-07T07:57:00"/>
       <column name="RESPONSIBLE" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="DATE_EDIT" valueDate="2020-09-16T06:28:47"/>
       <column name="CATEGORY" value="VISIT"/>
@@ -187,11 +176,11 @@
       <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:49:57"/>
       <column name="ACTIVITYID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
-      <column name="ENTRYDATE" valueDate="2020-03-24T07:49:00"/>
+      <column name="ENTRYDATE" valueDate="2021-07-20T07:49:00"/>
       <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="DATE_EDIT" valueDate="2020-09-16T06:25:55"/>
       <column name="CATEGORY" value="MAIL"/>
-      <column name="INFO" value="&lt;p&gt;Hallo Herr Altinger,&lt;/p&gt;&#10;&#10;&lt;p&gt;anbei erhalten Sie wie gew&amp;uuml;nscht und vereinbart unser Angebot zu dem Produkten A und B.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Bei Fragen zum Angebot erreichen Sie uns jederzeit unter den bekannten Kontaktdaten.&lt;/p&gt;&#10;&#10;&lt;p&gt;Wir freuen uns auf die Best&amp;auml;tigung des Angebots und auf die bevorstehende Zusammenarbeit.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Mit freundlichen Gr&amp;uuml;&amp;szlig;en&lt;/p&gt;&#10;&#10;&lt;p&gt;Tim Admin&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
+      <column name="INFO" value="&lt;p&gt;Hallo Herr Altinger,&lt;/p&gt;&#10;&#10;&lt;p&gt;anbei erhalten Sie wie gew&amp;uuml;nscht und vereinbart unser Angebot.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Bei Fragen zum Angebot erreichen Sie uns jederzeit unter den bekannten Kontaktdaten.&lt;/p&gt;&#10;&#10;&lt;p&gt;Wir freuen uns auf die Best&amp;auml;tigung des Angebots und auf die bevorstehende Zusammenarbeit.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Mit freundlichen Gr&amp;uuml;&amp;szlig;en&lt;/p&gt;&#10;&#10;&lt;p&gt;Tim Admin&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
       <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
@@ -295,7 +284,7 @@
       <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-19T08:52:54"/>
       <column name="ACTIVITYID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
-      <column name="ENTRYDATE" valueDate="2019-03-01T08:52:00"/>
+      <column name="ENTRYDATE" valueDate="2021-05-03T08:52:00"/>
       <column name="DATE_EDIT" valueDate="2019-11-15T08:13:07"/>
       <column name="INFO" value="&lt;p&gt;Automatischer Import:&lt;/p&gt;&#10;&#10;&lt;p&gt;Infobrosch&amp;uuml;re zu Produkt A runtergeladen.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="DIRECTION" value="o"/>
@@ -382,19 +371,6 @@
       <column name="DATE_EDIT" valueDate="2019-11-15T08:56:02"/>
       <column name="DIRECTION" value="x"/>
     </insert>
-    <insert tableName="activity">
-      <column name="SUBJECT" value="Auswahlprozess"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:56:02"/>
-      <column name="ACTIVITYID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
-      <column name="ENTRYDATE" valueDate="2020-01-27T07:56:00"/>
-      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="DATE_EDIT" valueDate="2020-09-16T06:29:04"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="INFO" value="&lt;p&gt;Sehr geehrte Damen und Herren,&lt;/p&gt;&#10;&#10;&lt;p&gt;es freut uns Ihnen mitteilen zu k&amp;ouml;nnen, dass wir gerne mit Ihnen in die engere Auswahl gehen m&amp;ouml;chten.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Die n&amp;auml;chsten Schritte sind weitere Gespr&amp;auml;che sowie eine Pr&amp;auml;sentation Ihrer Produkte.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Viele Gr&amp;uuml;&amp;szlig;e&lt;/p&gt;&#10;&#10;&lt;p&gt;Markus Altinger&lt;/p&gt;&#10;"/>
-      <column name="DIRECTION" value="i"/>
-    </insert>
     <insert tableName="activity">
       <column name="SUBJECT" value="Besuch zum umsatz"/>
       <column name="USER_NEW" value="Admin"/>
@@ -411,10 +387,10 @@
       <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-15T05:01:56"/>
       <column name="ACTIVITYID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
-      <column name="ENTRYDATE" valueDate="2020-03-09T05:01:00"/>
+      <column name="ENTRYDATE" valueDate="2021-06-21T05:01:00"/>
       <column name="DATE_EDIT" valueDate="2020-09-16T06:27:32"/>
       <column name="CATEGORY" value="MAIL"/>
-      <column name="INFO" value="&lt;p&gt;Der potentielle K&amp;auml;ufer hat Produkte unseres Segments gemietet.&lt;/p&gt;&#10;"/>
+      <column name="INFO" value="&lt;p&gt;Der potentielle K&amp;auml;ufer hat auf Basis unserer Produkte seine Anforderungen gesendet gemietet.&lt;/p&gt;&#10;"/>
       <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
@@ -545,7 +521,7 @@
       <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:55:08"/>
       <column name="ACTIVITYID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
-      <column name="ENTRYDATE" valueDate="2020-01-13T07:55:00"/>
+      <column name="ENTRYDATE" valueDate="2021-05-10T07:55:00"/>
       <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="DATE_EDIT" valueDate="2020-09-16T06:29:37"/>
       <column name="CATEGORY" value="PHONE"/>
@@ -570,11 +546,11 @@
       <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-15T04:59:21"/>
       <column name="ACTIVITYID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
-      <column name="ENTRYDATE" valueDate="2020-02-24T04:59:00"/>
+      <column name="ENTRYDATE" valueDate="2021-06-07T04:59:00"/>
       <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="DATE_EDIT" valueDate="2020-09-16T06:28:00"/>
       <column name="CATEGORY" value="VISIT"/>
-      <column name="INFO" value="&lt;p&gt;Kunde hatte die erste Produktpr&amp;auml;sentation zu unseren Produkten&amp;nbsp;A und B.&lt;/p&gt;&#10;&#10;&lt;p&gt;Vor allem das rafinierte Design und die Preisstruktur unseres Unternehmens waren positive Aspekte aus Kundensicht.&lt;/p&gt;&#10;&#10;&lt;p&gt;Werde die n&amp;auml;chsten Schritte anhand der Pr&amp;auml;sentation ableiten.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
+      <column name="INFO" value="&lt;p&gt;Kunde hatte die erste Produktpr&amp;auml;sentation zu unseren Produkten.&lt;/p&gt;&#10;&#10;&lt;p&gt;Vor allem das rafinierte Design und die Preisstruktur unseres Unternehmens waren positive Aspekte aus Kundensicht.&lt;/p&gt;&#10;&#10;&lt;p&gt;Werde die n&amp;auml;chsten Schritte anhand der Pr&amp;auml;sentation ableiten.&lt;/p&gt;&#10;&#10;&lt;p&gt;&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="DIRECTION" value="o"/>
     </insert>
     <insert tableName="activity">
@@ -633,11 +609,11 @@
       <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-23T09:06:25"/>
       <column name="ACTIVITYID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
-      <column name="ENTRYDATE" valueDate="2020-03-19T09:06:00"/>
+      <column name="ENTRYDATE" valueDate="2021-07-20T09:06:00"/>
       <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="DATE_EDIT" valueDate="2020-09-16T06:26:12"/>
       <column name="CATEGORY" value="PHONE"/>
-      <column name="INFO" value="&lt;p&gt;Hr. Altinger hat ein Angebot f&amp;uuml;r die Produkte A und B angefordert.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Zu dem Angebot haben wir noch einige Fragen gekl&amp;auml;rt.&amp;nbsp;&lt;/p&gt;&#10;"/>
+      <column name="INFO" value="&lt;p&gt;Hr. Altinger hat ein Angebot angefordert.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Zu dem Angebot haben wir noch einige Fragen gekl&amp;auml;rt.&amp;nbsp;&lt;/p&gt;&#10;"/>
       <column name="DIRECTION" value="i"/>
     </insert>
     <insert tableName="activity">
@@ -754,7 +730,7 @@
       <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-23T08:55:01"/>
       <column name="ACTIVITYID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
-      <column name="ENTRYDATE" valueDate="2020-03-10T08:55:00"/>
+      <column name="ENTRYDATE" valueDate="2021-06-25T08:55:00"/>
       <column name="DATE_EDIT" valueDate="2020-09-16T06:27:07"/>
       <column name="CATEGORY" value="PHONE"/>
       <column name="INFO" value="&lt;p&gt;Weiteres Telefonat mit Herrn Altinger gef&amp;uuml;hrt.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Hr. Altinger ist sehr begeistert von den M&amp;ouml;glichkeiten des Produktes.&lt;/p&gt;&#10;"/>
@@ -792,7 +768,7 @@
       <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-17T07:59:28"/>
       <column name="ACTIVITYID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
-      <column name="ENTRYDATE" valueDate="2020-03-11T07:59:00"/>
+      <column name="ENTRYDATE" valueDate="2021-06-28T07:59:00"/>
       <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="DATE_EDIT" valueDate="2020-09-16T06:26:59"/>
       <column name="CATEGORY" value="PHONE"/>
@@ -877,19 +853,6 @@
       <column name="INFO" value="&lt;p&gt;Produktinformationen zu produkt C versandt.&lt;/p&gt;&#10;"/>
       <column name="DIRECTION" value="o"/>
     </insert>
-    <insert tableName="activity">
-      <column name="SUBJECT" value="Angebot an Interessenten versandt"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:13:38"/>
-      <column name="ACTIVITYID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
-      <column name="ENTRYDATE" valueDate="2020-05-06T05:13:00"/>
-      <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
-      <column name="DATE_EDIT" valueDate="2020-09-16T06:24:22"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="INFO" value="&lt;p&gt;Sehr geehrter Herr Tannenbaum,&lt;/p&gt;&#10;&#10;&lt;p&gt;anbei erhalten Sie unser erneutes Angebot f&amp;uuml;r das gew&amp;uuml;nschte Produkt A.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;So wie besprochen mit den korrigierten Produktpreisen.&lt;/p&gt;&#10;&#10;&lt;p&gt;Wir freuen uns auf die Best&amp;auml;tigung des Angebots und stehen Ihnen bei R&amp;uuml;ckfragen jederzeit zur Verf&amp;uuml;gung.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Beste Gr&amp;uuml;&amp;szlig;e&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Tim Admin&lt;/p&gt;&#10;&#10;&lt;p&gt;meine Firma&lt;/p&gt;&#10;&#10;&lt;p&gt;Wilhelm-Str. 2&lt;/p&gt;&#10;&#10;&lt;p&gt;80807 M&amp;uuml;nchen&lt;/p&gt;&#10;&#10;&lt;p&gt;Fon: +49 8763 1333&lt;/p&gt;&#10;&#10;&lt;p&gt;E-Mail: lsommer@meine-firma.de&lt;/p&gt;&#10;"/>
-      <column name="DIRECTION" value="o"/>
-    </insert>
     <insert tableName="activity">
       <column name="SUBJECT" value="Gespräch mit Frau Decken"/>
       <column name="USER_EDIT" value="Admin"/>
@@ -909,7 +872,7 @@
       <column name="USER_NEW" value="Admin"/>
       <column name="DATE_NEW" valueDate="2019-05-15T04:57:48"/>
       <column name="ACTIVITYID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
-      <column name="ENTRYDATE" valueDate="2020-01-13T04:57:00"/>
+      <column name="ENTRYDATE" valueDate="2021-05-10T04:57:00"/>
       <column name="RESPONSIBLE" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="DATE_EDIT" valueDate="2020-09-16T06:29:47"/>
       <column name="CATEGORY" value="MAIL"/>
@@ -939,18 +902,6 @@
       <column name="INFO" value="&lt;p&gt;Herr Kainz hat angerufen, weil er das Produkt gerne in seinem Verein verwenden m&amp;ouml;chte und sich daher f&amp;uuml;r weitere Details interessiert, aber auch f&amp;uuml;r daraus entstehende Kosten&lt;/p&gt;&#10;"/>
       <column name="DIRECTION" value="i"/>
     </insert>
-    <insert tableName="activity">
-      <column name="SUBJECT" value="Interessent möchte Angebot zu dem Produkt"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T08:56:50"/>
-      <column name="ACTIVITYID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
-      <column name="ENTRYDATE" valueDate="2020-03-20T08:56:00"/>
-      <column name="DATE_EDIT" valueDate="2020-09-16T06:26:21"/>
-      <column name="CATEGORY" value="MAIL"/>
-      <column name="INFO" value="&lt;p&gt;Sehr geehrter Herr Admin,&lt;/p&gt;&#10;&#10;&lt;p&gt;wie bereits telefonisch angek&amp;uuml;ndigt, bitten wir um ein Angebot f&amp;uuml;r die Produkte A und B.&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Viele Gr&amp;uuml;&amp;szlig;e&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Markus Altinger&amp;nbsp;&lt;/p&gt;&#10;&#10;&lt;p&gt;Industrial Steel AG&amp;nbsp;&lt;/p&gt;&#10;"/>
-      <column name="DIRECTION" value="i"/>
-    </insert>
     <insert tableName="activity">
       <column name="SUBJECT" value="Telefonat bzgl. offener Fragen"/>
       <column name="USER_EDIT" value="Admin"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
index 070b69755a28b63cac87db50a4a3313a662b4458..984be9fec29d9d0ec456767bd3e980346f90bea9 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
@@ -138,22 +138,6 @@
       <column name="OBJECT_ROWID" value="a059aa9d-0463-4dbd-8b54-e85e235e63e0"/>
       <column name="DATE_NEW" valueDate="2021-06-28T12:23:29"/>
     </insert>
-    <insert tableName="activitylink">
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="ACTIVITY_ID" value="18ed06df-30b2-4d59-a4b4-a6e646f6f05a"/>
-      <column name="ACTIVITYLINKID" value="17ca6ad6-e2d4-47b0-a70f-b824e35298a2"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="DATE_NEW" valueDate="2020-09-16T07:48:14"/>
-    </insert>
-    <insert tableName="activitylink">
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="ACTIVITY_ID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
-      <column name="ACTIVITYLINKID" value="18cd806d-67fc-4d6b-87d4-dfec5669859f"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T07:55:40"/>
-    </insert>
     <insert tableName="activitylink">
       <column name="OBJECT_TYPE" value="Person"/>
       <column name="ACTIVITY_ID" value="d8c7b5a3-03f7-485a-bbe8-d4b2d75a6702"/>
@@ -234,14 +218,6 @@
       <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
       <column name="DATE_NEW" valueDate="2019-06-11T02:41:00"/>
     </insert>
-    <insert tableName="activitylink">
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="ACTIVITY_ID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
-      <column name="ACTIVITYLINKID" value="2f81f33a-1af7-4ecb-86f9-50d98555c909"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:14:26"/>
-    </insert>
     <insert tableName="activitylink">
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ACTIVITY_ID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
@@ -252,14 +228,6 @@
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="DATE_NEW" valueDate="2019-05-17T08:58:30"/>
     </insert>
-    <insert tableName="activitylink">
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="ACTIVITY_ID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
-      <column name="ACTIVITYLINKID" value="3385ac40-6f0e-45eb-bb71-ca3027325133"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:56:49"/>
-    </insert>
     <insert tableName="activitylink">
       <column name="OBJECT_TYPE" value="Person"/>
       <column name="ACTIVITY_ID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
@@ -268,14 +236,6 @@
       <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
       <column name="DATE_NEW" valueDate="2019-06-05T04:05:39"/>
     </insert>
-    <insert tableName="activitylink">
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="ACTIVITY_ID" value="18ed06df-30b2-4d59-a4b4-a6e646f6f05a"/>
-      <column name="ACTIVITYLINKID" value="388760d2-b575-492f-b249-ab0d1b4cc5b4"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="DATE_NEW" valueDate="2020-09-16T07:48:14"/>
-    </insert>
     <insert tableName="activitylink">
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ACTIVITY_ID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
@@ -396,14 +356,6 @@
       <column name="OBJECT_ROWID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="DATE_NEW" valueDate="2019-09-04T05:58:58"/>
     </insert>
-    <insert tableName="activitylink">
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="ACTIVITY_ID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
-      <column name="ACTIVITYLINKID" value="4f1c387a-7bb0-4c0c-a6be-e8708a172d40"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T11:18:03"/>
-    </insert>
     <insert tableName="activitylink">
       <column name="OBJECT_TYPE" value="Person"/>
       <column name="ACTIVITY_ID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
@@ -444,14 +396,6 @@
       <column name="OBJECT_ROWID" value="a10eaf09-7230-4889-a601-776de71cb71b"/>
       <column name="DATE_NEW" valueDate="2019-09-04T06:00:16"/>
     </insert>
-    <insert tableName="activitylink">
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="ACTIVITY_ID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
-      <column name="ACTIVITYLINKID" value="55dbf18a-fefa-4d79-827a-2685abf5ecc5"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T07:56:49"/>
-    </insert>
     <insert tableName="activitylink">
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="ACTIVITY_ID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
@@ -612,14 +556,6 @@
       <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="DATE_NEW" valueDate="2019-05-17T09:00:40"/>
     </insert>
-    <insert tableName="activitylink">
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="ACTIVITY_ID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
-      <column name="ACTIVITYLINKID" value="769721cc-a526-4e61-989f-71296085e7df"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="DATE_NEW" valueDate="2019-05-15T05:14:26"/>
-    </insert>
     <insert tableName="activitylink">
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="ACTIVITY_ID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
@@ -828,14 +764,6 @@
       <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
       <column name="DATE_NEW" valueDate="2019-05-22T05:54:23"/>
     </insert>
-    <insert tableName="activitylink">
-      <column name="OBJECT_TYPE" value="Organisation"/>
-      <column name="ACTIVITY_ID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
-      <column name="ACTIVITYLINKID" value="9f2616fb-7d78-44f6-9f5e-94ef5268dad4"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T08:57:56"/>
-    </insert>
     <insert tableName="activitylink">
       <column name="OBJECT_TYPE" value="Person"/>
       <column name="ACTIVITY_ID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
@@ -932,14 +860,6 @@
       <column name="OBJECT_ROWID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
     </insert>
-    <insert tableName="activitylink">
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="ACTIVITY_ID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
-      <column name="ACTIVITYLINKID" value="b1a9bcbf-2b76-4377-b41b-12aab911a093"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="DATE_NEW" valueDate="2019-05-28T07:53:18"/>
-    </insert>
     <insert tableName="activitylink">
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="ACTIVITY_ID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
@@ -1332,14 +1252,6 @@
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="DATE_NEW" valueDate="2019-06-05T04:15:09"/>
     </insert>
-    <insert tableName="activitylink">
-      <column name="OBJECT_TYPE" value="Person"/>
-      <column name="ACTIVITY_ID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
-      <column name="ACTIVITYLINKID" value="f7b42c68-cdc0-4a47-81f8-7a2c5f3d661a"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T08:57:56"/>
-    </insert>
     <insert tableName="activitylink">
       <column name="OBJECT_TYPE" value="Organisation"/>
       <column name="ACTIVITY_ID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/forecast.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/forecast.xml
index 9b19ed42a68ed1df4b4408e3d4e5d43a592bd7f0..e66866e2a403d4f494a0f7e0b3c4b2d6ad947f54 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/forecast.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/forecast.xml
@@ -2,6 +2,66 @@
 <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="autogenerated" id="bd7597ec-56b3-4ca9-9b65-e0414d2a0eff">
     <delete tableName="forecast"/>
+    <insert tableName="forecast">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="KIND" value="FORECAST"/>
+      <column name="GROUPCODE" value="PRODUCTSERVICE"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="VOLUME" valueNumeric="150000.00"/>
+      <column name="FORECASTID" value="74d72ac5-11ba-414f-a8b4-d31481e90e7f"/>
+      <column name="DATE_START" valueDate="2020-10-29T00:00:00"/>
+      <column name="INFO" value="Projektphase 1"/>
+    </insert>
+    <insert tableName="forecast">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="KIND" value="FORECAST"/>
+      <column name="GROUPCODE" value="PRODUCTSERVICE"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="VOLUME" valueNumeric="150000.00"/>
+      <column name="FORECASTID" value="84d72ac5-11ba-414f-a8b4-d31481e90e7f"/>
+      <column name="DATE_START" valueDate="2021-06-23T00:00:00"/>
+      <column name="INFO" value="Projektphase 2"/>
+    </insert>
+    <insert tableName="forecast">
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="KIND" value="FORECAST"/>
+      <column name="GROUPCODE" value="PRODUCTSERVICE"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="VOLUME" valueNumeric="150000.00"/>
+      <column name="FORECASTID" value="94d72ac5-11ba-414f-a8b4-d31481e90e7f"/>
+      <column name="DATE_START" valueDate="2022-05-22T00:00:00"/>
+      <column name="INFO" value="Projektphase 3"/>
+    </insert>
+    <insert tableName="forecast">
+      <column name="RESPONSIBLE_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="FORECAST_YEAR" valueNumeric="2020"/>
+      <column name="KIND" value="PLANNING"/>
+      <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="GROUPCODE" value="PRODUCTSERVICE"/>
+      <column name="VOLUME" valueNumeric="200000.00"/>
+      <column name="FORECASTID" value="2e2ef063-5586-44cc-bf83-65e94e223cb1"/>
+      <column name="STATUS" value="LOCKED"/>
+    </insert>
+    <insert tableName="forecast">
+      <column name="RESPONSIBLE_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="FORECAST_YEAR" valueNumeric="2021"/>
+      <column name="KIND" value="PLANNING"/>
+      <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="GROUPCODE" value="PRODUCTSERVICE"/>
+      <column name="VOLUME" valueNumeric="150000.00"/>
+      <column name="FORECASTID" value="07d57020-8c5b-4ecf-9d45-74ed3ed3ae81"/>
+      <column name="STATUS" value="PLANNED"/>
+    </insert>
+    <insert tableName="forecast">
+      <column name="RESPONSIBLE_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
+      <column name="FORECAST_YEAR" valueNumeric="2022"/>
+      <column name="KIND" value="PLANNING"/>
+      <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="GROUPCODE" value="PRODUCTSERVICE"/>
+      <column name="VOLUME" valueNumeric="180000.00"/>
+      <column name="FORECASTID" value="a59eceaa-980f-4ea9-a4cd-e3dec4fd9678"/>
+      <column name="STATUS" value="IN_PLANNING"/>
+    </insert>
     <insert tableName="forecast">
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="KIND" value="FORECAST"/>
@@ -9,7 +69,7 @@
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="VOLUME" valueNumeric="25000.00"/>
       <column name="FORECASTID" value="2d5c65fe-708b-4e54-96cf-d2fcdc98001f"/>
-      <column name="DATE_START" valueDate="2020-10-29T12:00:00"/>
+      <column name="DATE_START" valueDate="2020-10-29T00:00:00"/>
       <column name="INFO" value="fc"/>
     </insert>
     <insert tableName="forecast">
@@ -19,7 +79,7 @@
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="VOLUME" valueNumeric="80000.00"/>
       <column name="FORECASTID" value="37016eaa-ce14-45cd-8977-930cf6a20bb1"/>
-      <column name="DATE_START" valueDate="2020-12-30T12:00:00"/>
+      <column name="DATE_START" valueDate="2020-12-30T00:00:00"/>
       <column name="INFO" value="fc"/>
     </insert>
     <insert tableName="forecast">
@@ -29,8 +89,8 @@
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="VOLUME" valueNumeric="100000.00"/>
       <column name="FORECASTID" value="44bc5ce9-2456-4e04-8ff1-f35f2a71798f"/>
-      <column name="DATE_START" valueDate="2020-05-23T12:00:00"/>
-      <column name="INFO" value="fc"/>
+      <column name="DATE_START" valueDate="2022-01-31T00:00:00"/>
+      <column name="INFO" value="Ende Phase 1"/>
     </insert>
     <insert tableName="forecast">
       <column name="OBJECT_TYPE" value="Salesproject"/>
@@ -39,7 +99,7 @@
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="VOLUME" valueNumeric="25000.00"/>
       <column name="FORECASTID" value="4cc2db79-5263-4ee7-a651-00e7ecb6cc33"/>
-      <column name="DATE_START" valueDate="2020-10-22T12:00:00"/>
+      <column name="DATE_START" valueDate="2020-10-22T00:00:00"/>
       <column name="INFO" value="fc"/>
     </insert>
     <insert tableName="forecast">
@@ -59,19 +119,9 @@
       <column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
       <column name="VOLUME" valueNumeric="150000.00"/>
       <column name="FORECASTID" value="655bf6c0-713a-4738-a649-b1f6e212bd92"/>
-      <column name="DATE_START" valueDate="2021-01-28T12:00:00"/>
+      <column name="DATE_START" valueDate="2021-01-28T00:00:00"/>
       <column name="INFO" value="fc"/>
     </insert>
-    <insert tableName="forecast">
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="KIND" value="FORECAST"/>
-      <column name="GROUPCODE" value="PRODUCTGROUP3"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="VOLUME" valueNumeric="100000.00"/>
-      <column name="FORECASTID" value="74d72ac5-11ba-414f-a8b4-d31481e90e7f"/>
-      <column name="DATE_START" valueDate="2020-10-29T12:00:00"/>
-      <column name="INFO" value="W3 "/>
-    </insert>
     <insert tableName="forecast">
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="KIND" value="FORECAST"/>
@@ -79,8 +129,8 @@
       <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="VOLUME" valueNumeric="100000.00"/>
       <column name="FORECASTID" value="82dccf63-165f-4345-87a6-e3535ae58349"/>
-      <column name="DATE_START" valueDate="2020-05-22T12:00:00"/>
-      <column name="INFO" value="FC"/>
+      <column name="DATE_START" valueDate="2021-10-01T00:00:00"/>
+      <column name="INFO" value="Auslieferung Produkte"/>
     </insert>
     <insert tableName="forecast">
       <column name="RESPONSIBLE_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
@@ -99,7 +149,7 @@
       <column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
       <column name="VOLUME" valueNumeric="75000.00"/>
       <column name="FORECASTID" value="9b3c76ad-5fac-4c26-af9b-3b05f097763f"/>
-      <column name="DATE_START" valueDate="2020-11-18T12:00:00"/>
+      <column name="DATE_START" valueDate="2020-11-18T00:00:00"/>
       <column name="INFO" value="fc"/>
     </insert>
     <insert tableName="forecast">
@@ -109,7 +159,7 @@
       <column name="OBJECT_ROWID" value="cdaa7f90-6e3d-4199-974b-0847b867a419"/>
       <column name="VOLUME" valueNumeric="100000.00"/>
       <column name="FORECASTID" value="9eec32ea-c21f-404f-b3b1-c8e8a2a0379f"/>
-      <column name="DATE_START" valueDate="2021-06-28T12:00:00"/>
+      <column name="DATE_START" valueDate="2021-06-28T00:00:00"/>
       <column name="INFO" value="Beratungsbudget"/>
     </insert>
     <insert tableName="forecast">
@@ -119,7 +169,7 @@
       <column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
       <column name="VOLUME" valueNumeric="25000.00"/>
       <column name="FORECASTID" value="f87ad5ed-943e-4008-a3fa-291699e3df28"/>
-      <column name="DATE_START" valueDate="2020-11-19T12:00:00"/>
+      <column name="DATE_START" valueDate="2020-11-19T00:00:00"/>
       <column name="INFO" value="fc"/>
     </insert>
   </changeSet>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml
index ccce71c72901c72924ad26c02f87ca93365c6acc..740d0a023f357c43e169c9abc3876671366e5190 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml
@@ -56,30 +56,6 @@
       <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
       <column name="STATUS" value="OFFERSTATSENT"/>
     </insert>
-    <insert tableName="offer">
-      <column name="PAYMENTTERMS" value="PAYTERM7"/>
-      <column name="DELIVERYTERMS" value="FREE"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="CONTACT_ID" value="3da2a794-7155-4009-95e0-b8aeb703acfc"/>
-      <column name="USER_NEW" value="Birgit Leicht"/>
-      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="DISCOUNTED_VAT" valueNumeric="1425.00"/>
-      <column name="ISOLANGUAGE" value="deu"/>
-      <column name="VERSNR" valueNumeric="1"/>
-      <column name="OFFERID" value="17f55fce-2c42-46f3-bcfe-4344ab6a3978"/>
-      <column name="DATE_EDIT" valueDate="2021-06-29T11:03:13"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="NET" valueNumeric="7500.00"/>
-      <column name="ADDRESS" value="Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 32&#10;22765 Hamburg"/>
-      <column name="OFFERDATE" valueDate="2020-11-12T12:00:00"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="PROBABILITY" valueNumeric="0.00"/>
-      <column name="OFFERCODE" valueNumeric="1017"/>
-      <column name="DISCOUNTED_NET" valueNumeric="7500.00"/>
-      <column name="VAT" valueNumeric="1425.00"/>
-      <column name="DATE_NEW" valueDate="2021-06-29T09:14:05"/>
-      <column name="STATUS" value="OFFERSTATOPEN"/>
-    </insert>
     <insert tableName="offer">
       <column name="PAYMENTTERMS" value="PAYTERM7"/>
       <column name="DELIVERYTERMS" value="DELIVEREX"/>
@@ -103,51 +79,28 @@
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="STATUS" value="OFFERSTATWON"/>
     </insert>
-    <insert tableName="offer">
-      <column name="PAYMENTTERMS" value="PAYTERM30"/>
-      <column name="DELIVERYTERMS" value="DELIVEREX"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="ISOLANGUAGE" value="deu"/>
-      <column name="VERSNR" valueNumeric="1"/>
-      <column name="OFFERID" value="2497128b-c07d-4fe8-b927-1bea929cce4d"/>
-      <column name="DATE_EDIT" valueDate="2020-09-16T07:20:44"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="NET" valueNumeric="25000.00"/>
-      <column name="ADDRESS" value="Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg"/>
-      <column name="OFFERDATE" valueDate="2020-03-16T12:00:00"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="PROBABILITY" valueNumeric="75.00"/>
-      <column name="OFFERCODE" valueNumeric="1013"/>
-      <column name="VAT" valueNumeric="4750.00"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T09:04:28"/>
-      <column name="HEADER" value="Für die bisherigen Gespräche möchten wir uns bei Ihnen bedanken. Gerne bieten wir Ihnen wie folgt an:&#10;&#10;"/>
-      <column name="STATUS" value="OFFERSTATOPEN"/>
-    </insert>
     <insert tableName="offer">
       <column name="PAYMENTTERMS" value="PAYTERM7"/>
       <column name="FOOTER" value="Vielen Dank!"/>
       <column name="DELIVERYTERMS" value="FREE"/>
-      <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="CONTACT_ID" value="3da2a794-7155-4009-95e0-b8aeb703acfc"/>
       <column name="USER_NEW" value="Admin"/>
       <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="VERSNR" valueNumeric="1"/>
       <column name="OFFERID" value="2948a9b8-5e81-491f-b741-9b35622f09da"/>
       <column name="CURRENCY" value="EUR"/>
-      <column name="NET" valueNumeric="145000.00"/>
+      <column name="NET" valueNumeric="450000.00"/>
       <column name="ADDRESS" value="Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 5&#10;22765 Hamburg"/>
-      <column name="OFFERDATE" valueDate="2020-04-06T12:00:00"/>
+      <column name="OFFERDATE" valueDate="2020-01-24T10:55:49"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="PROBABILITY" valueNumeric="0.00"/>
-      <column name="OFFERCODE" valueNumeric="1014"/>
-      <column name="VAT" valueNumeric="0.00"/>
-      <column name="DATE_NEW" valueDate="2020-09-16T09:11:19"/>
+      <column name="PROBABILITY" valueNumeric="100.00"/>
+      <column name="OFFERCODE" valueNumeric="1018"/>
+      <column name="VAT" valueNumeric="85500.00"/>
+      <column name="DATE_NEW" valueDate="2020-01-24T10:55:49"/>
       <column name="LETTERSALUTATION" value="Sehr geehrte Damen und Herren,"/>
       <column name="HEADER" value="Gerne bieten wir Ihnen wie folgt an:"/>
-      <column name="STATUS" value="OFFERSTATOPEN"/>
+      <column name="STATUS" value="OFFERSTATWON"/>
     </insert>
     <insert tableName="offer">
       <column name="PAYMENTTERMS" value="PAYTERM30"/>
@@ -287,52 +240,6 @@
       <column name="HEADER" value="Wir danken Ihnen für Ihre Anfrage und bieten Ihnen die von Ihnen genannten Produkte wie folgt an:"/>
       <column name="STATUS" value="OFFERSTATAPPROVED"/>
     </insert>
-    <insert tableName="offer">
-      <column name="PAYMENTTERMS" value="PAYTERM30"/>
-      <column name="DELIVERYTERMS" value="DELIVERCIF"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="ISOLANGUAGE" value="deu"/>
-      <column name="VERSNR" valueNumeric="1"/>
-      <column name="OFFERID" value="a4fd6030-bb7e-419e-877c-816d343feea7"/>
-      <column name="DATE_EDIT" valueDate="2020-09-16T07:23:28"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="NET" valueNumeric="17500.00"/>
-      <column name="ADDRESS" value="Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg"/>
-      <column name="OFFERDATE" valueDate="2020-05-15T12:00:00"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="PROBABILITY" valueNumeric="25.00"/>
-      <column name="OFFERCODE" valueNumeric="1010"/>
-      <column name="VAT" valueNumeric="0.00"/>
-      <column name="DATE_NEW" valueDate="2019-05-17T10:28:20"/>
-      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
-      <column name="STATUS" value="OFFERSTATOPEN"/>
-    </insert>
-    <insert tableName="offer">
-      <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
-      <column name="DELIVERYTERMS" value="DELIVEREX"/>
-      <column name="USER_EDIT" value="Admin"/>
-      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="USER_NEW" value="Admin"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="ISOLANGUAGE" value="deu"/>
-      <column name="VERSNR" valueNumeric="1"/>
-      <column name="OFFERID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
-      <column name="DATE_EDIT" valueDate="2020-09-16T07:23:42"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="NET" valueNumeric="210.00"/>
-      <column name="ADDRESS" value="Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg"/>
-      <column name="OFFERDATE" valueDate="2020-05-14T12:00:00"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="PROBABILITY" valueNumeric="50.00"/>
-      <column name="OFFERCODE" valueNumeric="1005"/>
-      <column name="VAT" valueNumeric="39.90"/>
-      <column name="DATE_NEW" valueDate="2019-05-16T01:35:17"/>
-      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
-      <column name="STATUS" value="OFFERSTATOPEN"/>
-    </insert>
     <insert tableName="offer">
       <column name="USER_EDIT" value="Admin"/>
       <column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
@@ -360,23 +267,23 @@
       <column name="CONTACT_ID" value="3da2a794-7155-4009-95e0-b8aeb703acfc"/>
       <column name="USER_NEW" value="Birgit Leicht"/>
       <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="DISCOUNTED_VAT" valueNumeric="9310.00"/>
+      <column name="DISCOUNTED_VAT" valueNumeric="76950.00"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="VERSNR" valueNumeric="1"/>
       <column name="OFFERID" value="b25b1da5-c179-4142-a9c8-130c888a9b29"/>
       <column name="CURRENCY" value="EUR"/>
-      <column name="NET" valueNumeric="49000.00"/>
+      <column name="NET" valueNumeric="405000.00"/>
       <column name="ADDRESS" value="Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 32&#10;22765 Hamburg"/>
-      <column name="OFFERDATE" valueDate="2020-12-15T12:00:00"/>
+      <column name="OFFERDATE" valueDate="2020-01-23T10:55:49"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="PROBABILITY" valueNumeric="0.00"/>
       <column name="APPROVAL" value="2"/>
-      <column name="OFFERCODE" valueNumeric="1018"/>
+      <column name="OFFERCODE" valueNumeric="1014"/>
       <column name="DISCOUNTED_NET" valueNumeric="49000.00"/>
-      <column name="VAT" valueNumeric="9310.00"/>
-      <column name="DATE_NEW" valueDate="2021-06-29T10:45:47"/>
+      <column name="VAT" valueNumeric="76950.00"/>
+      <column name="DATE_NEW" valueDate="2020-01-23T10:55:49"/>
       <column name="HEADER" value="Wir danken Ihnen für Ihre Anfrage und bieten Ihnen die von Ihnen genannten Produkte wie folgt an:"/>
-      <column name="STATUS" value="OFFERSTATTOCHECK"/>
+      <column name="STATUS" value="OFFERSTATDENIED"/>
     </insert>
     <insert tableName="offer">
       <column name="PAYMENTTERMS" value="PAYTERM7"/>
@@ -388,46 +295,20 @@
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="VERSNR" valueNumeric="1"/>
       <column name="OFFERID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
-      <column name="DATE_EDIT" valueDate="2020-09-16T07:21:01"/>
+      <column name="DATE_EDIT" valueDate="2021-07-20T11:52:19"/>
       <column name="CURRENCY" value="EUR"/>
-      <column name="NET" valueNumeric="45000.00"/>
+      <column name="NET" valueNumeric="200000.00"/>
       <column name="ADDRESS" value="Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg"/>
-      <column name="OFFERDATE" valueDate="2020-03-23T12:00:00"/>
+      <column name="OFFERDATE" valueDate="2021-07-20T11:22:49"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
       <column name="PROBABILITY" valueNumeric="50.00"/>
       <column name="APPROVAL" value="1"/>
       <column name="OFFERCODE" valueNumeric="1012"/>
-      <column name="VAT" valueNumeric="8550.00"/>
-      <column name="DATE_NEW" valueDate="2019-05-23T09:00:44"/>
+      <column name="VAT" valueNumeric="38000.00"/>
+      <column name="DATE_NEW" valueDate="2021-07-20T11:22:49"/>
       <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
       <column name="STATUS" value="OFFERSTATTOCHECK"/>
     </insert>
-    <insert tableName="offer">
-      <column name="PAYMENTTERMS" value="PAYTERM30"/>
-      <column name="FOOTER" value="Wir freuen uns auf Ihre Beauftragung und stehen für Rückfragen gerne zur Verfügung."/>
-      <column name="DELIVERYTERMS" value="FREE"/>
-      <column name="USER_EDIT" value="Birgit Leicht"/>
-      <column name="CONTACT_ID" value="42397577-c00b-4434-859e-0766ab40bf8b"/>
-      <column name="USER_NEW" value="Birgit Leicht"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="DISCOUNTED_VAT" valueNumeric="2137.50"/>
-      <column name="ISOLANGUAGE" value="deu"/>
-      <column name="VERSNR" valueNumeric="1"/>
-      <column name="OFFERID" value="f6dd0a19-4579-4b6a-a7ec-577a24519273"/>
-      <column name="DATE_EDIT" valueDate="2021-06-29T10:58:58"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="NET" valueNumeric="11250.00"/>
-      <column name="ADDRESS" value="Industrial Steel AG&#10;Rathausmarkt 1&#10;20095 Hamburg"/>
-      <column name="OFFERDATE" valueDate="2021-03-18T12:00:00"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="PROBABILITY" valueNumeric="25.00"/>
-      <column name="OFFERCODE" valueNumeric="1019"/>
-      <column name="DISCOUNTED_NET" valueNumeric="11250.00"/>
-      <column name="VAT" valueNumeric="2137.50"/>
-      <column name="DATE_NEW" valueDate="2021-06-29T10:49:58"/>
-      <column name="HEADER" value="Wir danken Ihnen für Ihre Anfrage und bieten Ihnen die von Ihnen genannten Produkte wie folgt an:"/>
-      <column name="STATUS" value="OFFERSTATOPEN"/>
-    </insert>
     <insert tableName="offer">
       <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
       <column name="DELIVERYTERMS" value="DELIVEREX"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml
index c2a0645339d2fcae9e20f899f043740ea08e0ce4..dab040bf917926560da517e272bbd6153529066f 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml
@@ -2,45 +2,6 @@
 <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="autogenerated" id="71d12f09-1b0a-477e-a454-56b499b1b802">
     <delete tableName="offeritem"/>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
-      <column name="ITEMNAME" value="Produktname1.2"/>
-      <column name="OFFERITEMID" value="092eb124-8cc1-456e-a5e8-dacdba4abc15"/>
-      <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="ITEMSORT" valueNumeric="8"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
-      <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="ITEMPOSITION" value="1.3"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
-    </insert>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="2.00"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
-      <column name="ITEMNAME" value="Produktname1.1"/>
-      <column name="OFFERITEMID" value="0f42ddc3-717d-4844-9f96-8dbab2800c24"/>
-      <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="ITEMSORT" valueNumeric="7"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
-      <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="ITEMPOSITION" value="1.2"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
-    </insert>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
-      <column name="ITEMNAME" value="Gipsplatten"/>
-      <column name="OFFERITEMID" value="178c6049-0b01-4f5b-8431-08ef637f9c97"/>
-      <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
-      <column name="OFFER_ID" value="a4fd6030-bb7e-419e-877c-816d343feea7"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRICE" valueNumeric="15000.00"/>
-      <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
-    </insert>
     <insert tableName="offeritem">
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
@@ -82,32 +43,33 @@
       <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
     </insert>
     <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
-      <column name="ITEMNAME" value="Ersatzteil 1"/>
+      <column name="QUANTITY" valueNumeric="800.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSERVISE                      "/>
+      <column name="ITEMNAME" value="Beratung"/>
       <column name="OFFERITEMID" value="22f6c80c-8bd3-4b30-af56-0e080ca18f48"/>
       <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFER_ID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
       <column name="ITEMPOSITION" value="1"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRICE" valueNumeric="5000.00"/>
-      <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
+      <column name="PRICE" valueNumeric="125.00"/>
+      <column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
-      <column name="ITEMNAME" value="Produkt SL2"/>
+      <column name="QUANTITY" valueNumeric="3600.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE                      "/>
+      <column name="ITEMNAME" value="Beratung"/>
       <column name="OFFERITEMID" value="24080940-1ef5-4630-a806-6a6224b571d5"/>
       <column name="VAT" valueNumeric="19.00"/>
+      <column name="DISCOUNT" valueNumeric="10.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFER_ID" value="b25b1da5-c179-4142-a9c8-130c888a9b29"/>
       <column name="ITEMPOSITION" value="1"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRICE" valueNumeric="49000.00"/>
-      <column name="PRODUCT_ID" value="acd4cbde-f55d-444b-b294-1c6fe8588000"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
+      <column name="PRICE" valueNumeric="125.00"/>
+      <column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
     </insert>
     <insert tableName="offeritem">
       <column name="QUANTITY" valueNumeric="1.00"/>
@@ -203,20 +165,6 @@
       <column name="UNIT" value="QUANTITYPIECES"/>
       <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
     </insert>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
-      <column name="ITEMNAME" value="Modul D - Standard"/>
-      <column name="OFFERITEMID" value="5375f2f2-b547-4aeb-bafa-b0b181f7dfda"/>
-      <column name="VAT" valueNumeric="19.00"/>
-      <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
-      <column name="OFFER_ID" value="17f55fce-2c42-46f3-bcfe-4344ab6a3978"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRICE" valueNumeric="7500.00"/>
-      <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
-    </insert>
     <insert tableName="offeritem">
       <column name="QUANTITY" valueNumeric="1000.00"/>
       <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
@@ -230,19 +178,6 @@
       <column name="PRICE" valueNumeric="150.00"/>
       <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
     </insert>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
-      <column name="ITEMNAME" value="Produktname1.2"/>
-      <column name="OFFERITEMID" value="5814617f-8977-4ba4-9567-695767017848"/>
-      <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="ITEMSORT" valueNumeric="5"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
-      <column name="ASSIGNEDTO" value="bd35c94b-5ad8-43eb-a131-501e3577d9c9"/>
-      <column name="ITEMPOSITION" value="1.1.1.1.1"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
-    </insert>
     <insert tableName="offeritem">
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
@@ -270,19 +205,6 @@
       <column name="PRICE" valueNumeric="1000.00"/>
       <column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
     </insert>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
-      <column name="ITEMNAME" value="Produktname4.1"/>
-      <column name="OFFERITEMID" value="6c60f55e-27d3-44a5-a324-d184a067237a"/>
-      <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="ITEMSORT" valueNumeric="3"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
-      <column name="ASSIGNEDTO" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
-      <column name="ITEMPOSITION" value="1.1.1"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
-    </insert>
     <insert tableName="offeritem">
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
@@ -299,33 +221,21 @@
       <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
     </insert>
     <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="5.00"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
-      <column name="ITEMNAME" value="Produkt 4"/>
-      <column name="OFFERITEMID" value="72d21e9b-8b5e-470b-8a54-d5877899ce7c"/>
-      <column name="VAT" valueNumeric="19.00"/>
-      <column name="DISCOUNT" valueNumeric="10.00"/>
-      <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
-      <column name="OFFER_ID" value="f6dd0a19-4579-4b6a-a7ec-577a24519273"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRICE" valueNumeric="2500.00"/>
-      <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
-    </insert>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="QUANTITY" valueNumeric="3600.00"/>
+      <column name="GROUPCODEID" value="PRODUCTSERVICE                      "/>
+      <column name="ITEMNAME" value="Beratung"/>
       <column name="OFFERITEMID" value="76b2aed9-ef76-4682-8dcb-2f042257eedb"/>
+      <column name="VAT" valueNumeric="19.00"/>
       <column name="OPTIONAL" valueNumeric="0"/>
       <column name="ITEMSORT" valueNumeric="1"/>
       <column name="OFFER_ID" value="2948a9b8-5e81-491f-b741-9b35622f09da"/>
       <column name="ITEMPOSITION" value="1"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRICE" valueNumeric="145000.00"/>
-      <column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
+      <column name="UNIT" value="QUANTITYHOUR"/>
+      <column name="PRICE" valueNumeric="125.00"/>
+      <column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
     </insert>
     <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="QUANTITY" valueNumeric="5.00"/>
       <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
       <column name="ITEMNAME" value="WG1 Standardprodukt 1"/>
       <column name="OFFERITEMID" value="82d27c88-a3da-4c64-a933-6031ec56e64a"/>
@@ -349,23 +259,10 @@
       <column name="OFFER_ID" value="5abae3a9-8d96-4709-b6be-7fc7e87f002b"/>
       <column name="ITEMPOSITION" value="2"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRICE" valueNumeric="2500.00"/>
+      <column name="PRICE" valueNumeric="50000.00"/>
       <column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
       <column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
     </insert>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
-      <column name="ITEMNAME" value="AX47"/>
-      <column name="OFFERITEMID" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
-      <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
-      <column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="ITEMPOSITION" value="1.1"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
-    </insert>
     <insert tableName="offeritem">
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
@@ -460,7 +357,7 @@
       <column name="OFFER_ID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
       <column name="ITEMPOSITION" value="3"/>
       <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRICE" valueNumeric="30000.00"/>
+      <column name="PRICE" valueNumeric="50000.00"/>
       <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
     </insert>
     <insert tableName="offeritem">
@@ -506,64 +403,6 @@
       <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
       <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
     </insert>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
-      <column name="ITEMNAME" value="Modul A - Comfort"/>
-      <column name="OFFERITEMID" value="f68842c9-40f8-497f-bd3b-e5a46476c3c4"/>
-      <column name="VAT" valueNumeric="19.00"/>
-      <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="ITEMSORT" valueNumeric="2"/>
-      <column name="OFFER_ID" value="b25b1da5-c179-4142-a9c8-130c888a9b29"/>
-      <column name="ASSIGNEDTO" value="24080940-1ef5-4630-a806-6a6224b571d5"/>
-      <column name="ITEMPOSITION" value="1.1"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRICE" valueNumeric="13000.00"/>
-      <column name="PRODUCT_ID" value="4004db3e-a63e-4b32-b7da-8c899996ddcd"/>
-    </insert>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP2                       "/>
-      <column name="ITEMNAME" value="WG2 Produkt 5"/>
-      <column name="OFFERITEMID" value="f81bad1d-baed-425b-8751-fd297161fdc7"/>
-      <column name="VAT" valueNumeric="19.00"/>
-      <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
-      <column name="OFFER_ID" value="2497128b-c07d-4fe8-b927-1bea929cce4d"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRICE" valueNumeric="25000.00"/>
-      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
-    </insert>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="2.00"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
-      <column name="ITEMNAME" value="Modul B - Comfort"/>
-      <column name="OFFERITEMID" value="f93b1dfc-e146-4f62-acce-0b384d2bb8a4"/>
-      <column name="VAT" valueNumeric="19.00"/>
-      <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="ITEMSORT" valueNumeric="3"/>
-      <column name="OFFER_ID" value="b25b1da5-c179-4142-a9c8-130c888a9b29"/>
-      <column name="ASSIGNEDTO" value="24080940-1ef5-4630-a806-6a6224b571d5"/>
-      <column name="ITEMPOSITION" value="1.2"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRICE" valueNumeric="18000.00"/>
-      <column name="PRODUCT_ID" value="4775aed7-e165-495b-a147-7e3312b27d0b"/>
-    </insert>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="1.00"/>
-      <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
-      <column name="ITEMNAME" value="AX45"/>
-      <column name="OFFERITEMID" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
-      <column name="VAT" valueNumeric="19.00"/>
-      <column name="OPTIONAL" valueNumeric="0"/>
-      <column name="ITEMSORT" valueNumeric="1"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
-      <column name="ITEMPOSITION" value="1"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRICE" valueNumeric="210.00"/>
-      <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
-    </insert>
     <insert tableName="offeritem">
       <column name="QUANTITY" valueNumeric="1.00"/>
       <column name="GROUPCODEID" value="PRODUCTGROUP3                       "/>
@@ -577,18 +416,5 @@
       <column name="PRICE" valueNumeric="25000.00"/>
       <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
     </insert>
-    <insert tableName="offeritem">
-      <column name="QUANTITY" valueNumeric="3.00"/>
-      <column name="GROUPCODEID" value="PRODUCTSPARE                        "/>
-      <column name="ITEMNAME" value="Produktname4.2a"/>
-      <column name="OFFERITEMID" value="fe58567c-54f9-4194-b798-2571a5ed4e86"/>
-      <column name="OPTIONAL" valueNumeric="1"/>
-      <column name="ITEMSORT" valueNumeric="6"/>
-      <column name="OFFER_ID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
-      <column name="ASSIGNEDTO" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
-      <column name="ITEMPOSITION" value="1.1.2"/>
-      <column name="UNIT" value="QUANTITYPIECES"/>
-      <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
-    </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
index 9a0bac956015edd9458827b3d38d85f498b25635..ed83dfc0b46c2781ec6ad61fce663a1f119a5ace 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
@@ -250,26 +250,52 @@
       <column name="FOOTER" value="Danke sehr:"/>
       <column name="DELIVERYTERMS" value="FREE"/>
       <column name="DUNNINGTEXT" value="Please pay the outstanding amount,this is you first/second reminder."/>
-      <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="CONTACT_ID" value="3da2a794-7155-4009-95e0-b8aeb703acfc"/>
       <column name="SALESORDERCODE" valueNumeric="1020"/>
-      <column name="PAYDATE" valueDate="2020-09-16T12:00:00"/>
+      <column name="PAYDATE" valueDate="2020-11-08T00:00:00"/>
       <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="SALESORDERDATE" valueDate="2020-08-12T12:00:00"/>
-      <column name="DUNNINGDATE" valueDate="2020-09-16T12:00:00"/>
+      <column name="SALESORDERDATE" valueDate="2020-11-02T00:00:00"/>
+      <column name="DUNNINGDATE" valueDate="2020-11-30T00:00:00"/>
       <column name="ISOLANGUAGE" value="deu"/>
       <column name="CURRENCY" value="EUR"/>
-      <column name="NET" valueNumeric="145000.00"/>
+      <column name="NET" valueNumeric="135000.00"/>
       <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="VAT" valueNumeric="0.00"/>
-      <column name="PAYDUEDATE" valueDate="2020-08-19T12:00:00"/>
+      <column name="VAT" valueNumeric="25650.00"/>
+      <column name="PAYDUEDATE" valueDate="2020-11-09T00:00:00"/>
       <column name="PAYMENTADDRESS" value="Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 5&#10;22765 Hamburg"/>
       <column name="OFFER_ID" value="2948a9b8-5e81-491f-b741-9b35622f09da"/>
       <column name="CANCELLATION" valueNumeric="0"/>
-      <column name="PAID" valueNumeric="145000.00"/>
+      <column name="PAID" valueNumeric="160650.00"/>
       <column name="SALESORDERID" value="66f6ffc1-702a-4ebe-9158-6214884d658d"/>
       <column name="DELIVERYADDRESS" value="Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 5&#10;22765 Hamburg"/>
       <column name="ORDERTYPE" value="ORDTYPEINVO"/>
     </insert>
+    <insert tableName="salesorder">
+      <column name="PAYMENTTERMS" value="PAYTERM7"/>
+      <column name="ORDERSTATUS" valueNumeric="1"/>
+      <column name="FOOTER" value="Danke sehr:"/>
+      <column name="DELIVERYTERMS" value="FREE"/>
+      <column name="DUNNINGTEXT" value="Please pay the outstanding amount,this is you first/second reminder."/>
+      <column name="CONTACT_ID" value="3da2a794-7155-4009-95e0-b8aeb703acfc"/>
+      <column name="SALESORDERCODE" valueNumeric="1027"/>
+      <column name="PAYDATE" valueDate="2021-07-07T00:00:00"/>
+      <column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="SALESORDERDATE" valueDate="2021-07-02T00:00:00"/>
+      <column name="DUNNINGDATE" valueDate="2021-07-30T00:00:00"/>
+      <column name="ISOLANGUAGE" value="deu"/>
+      <column name="CURRENCY" value="EUR"/>
+      <column name="NET" valueNumeric="150000.00"/>
+      <column name="OBJECT_TYPE" value="Salesproject"/>
+      <column name="VAT" valueNumeric="28500.00"/>
+      <column name="PAYDUEDATE" valueDate="2021-07-09T00:00:00"/>
+      <column name="PAYMENTADDRESS" value="Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 5&#10;22765 Hamburg"/>
+      <column name="OFFER_ID" value="2948a9b8-5e81-491f-b741-9b35622f09da"/>
+      <column name="CANCELLATION" valueNumeric="0"/>
+      <column name="PAID" valueNumeric="178500.00"/>
+      <column name="SALESORDERID" value="90a9dc72-5054-41c1-9213-e8c0c8e466a0"/>
+      <column name="DELIVERYADDRESS" value="Bucher Unternehmensgruppe&#10;Julius-Leber-Straße 5&#10;22765 Hamburg"/>
+      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
+    </insert>
     <insert tableName="salesorder">
       <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
       <column name="ORDERSTATUS" valueNumeric="1"/>
@@ -367,32 +393,6 @@
       <column name="DELIVERYADDRESS" value="Meister Messebau GmbH&#10;Aitrachstraße 7&#10;84130 Dingolfing"/>
       <column name="ORDERTYPE" value="ORDTYPEINVO"/>
     </insert>
-    <insert tableName="salesorder">
-      <column name="PAYMENTTERMS" value="PAYTERM7"/>
-      <column name="ORDERSTATUS" valueNumeric="1"/>
-      <column name="FOOTER" value="Danke sehr:"/>
-      <column name="DELIVERYTERMS" value="FREE"/>
-      <column name="DUNNINGTEXT" value="Please pay the outstanding amount,this is you first/second reminder."/>
-      <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="SALESORDERCODE" valueNumeric="1017"/>
-      <column name="PAYDATE" valueDate="2020-09-16T12:00:00"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="SALESORDERDATE" valueDate="2020-09-16T12:00:00"/>
-      <column name="DUNNINGDATE" valueDate="2020-09-16T12:00:00"/>
-      <column name="ISOLANGUAGE" value="deu"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="NET" valueNumeric="25000.00"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="VAT" valueNumeric="4750.00"/>
-      <column name="PAYDUEDATE" valueDate="2020-09-23T12:00:00"/>
-      <column name="PAYMENTADDRESS" value="Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg"/>
-      <column name="OFFER_ID" value="2497128b-c07d-4fe8-b927-1bea929cce4d"/>
-      <column name="CANCELLATION" valueNumeric="0"/>
-      <column name="PAID" valueNumeric="29750.00"/>
-      <column name="SALESORDERID" value="e40eb96e-1f1f-4afa-9bd3-f70eff9041c0"/>
-      <column name="DELIVERYADDRESS" value="Industrial Steel AG&#10;Königstraße 4&#10;22767  Hamburg"/>
-      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
-    </insert>
     <insert tableName="salesorder">
       <column name="PAYMENTTERMS" value="PAYTERM7"/>
       <column name="ORDERSTATUS" valueNumeric="0"/>
@@ -446,33 +446,5 @@
       <column name="DUNNINGLEVEL" value="2"/>
       <column name="ORDERTYPE" value="ORDTYPEINVO"/>
     </insert>
-    <insert tableName="salesorder">
-      <column name="PAYMENTTERMS" value="PAYTERM7"/>
-      <column name="ORDERSTATUS" valueNumeric="0"/>
-      <column name="FOOTER" value="Vielen Dank!&#10;Die Positionen bleiben bis zur vollständigen Zahlung Eigentum der meineFirma GmbH. &#10;"/>
-      <column name="DELIVERYTERMS" value="FREE"/>
-      <column name="DUNNINGTEXT" value="Bitte zahlen Sie den ausstehenden Betrag, dies ist die erste/zweite Mahnung."/>
-      <column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
-      <column name="SALESORDERCODE" valueNumeric="1016"/>
-      <column name="PAYDATE" valueDate="2020-09-16T12:00:00"/>
-      <column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="SALESORDERDATE" valueDate="2020-08-05T12:00:00"/>
-      <column name="DUNNINGDATE" valueDate="2020-09-16T12:00:00"/>
-      <column name="DISCOUNTED_VAT" valueNumeric="285.00"/>
-      <column name="ISOLANGUAGE" value="deu"/>
-      <column name="CURRENCY" value="EUR"/>
-      <column name="NET" valueNumeric="0.00"/>
-      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="DISCOUNTED_NET" valueNumeric="1500.00"/>
-      <column name="VAT" valueNumeric="0.00"/>
-      <column name="PAYDUEDATE" valueDate="2020-08-12T12:00:00"/>
-      <column name="PAYMENTADDRESS" value="Salesproject"/>
-      <column name="CANCELLATION" valueNumeric="0"/>
-      <column name="PAID" valueNumeric="50000.00"/>
-      <column name="SALESORDERID" value="ff049e6e-06ef-4c27-bcce-5b5b244e4054"/>
-      <column name="HEADER" value="Entsprechend Ihrem Auftrag stellen wir Ihnen folgende Positionen in Rechnung:"/>
-      <column name="DELIVERYADDRESS" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="ORDERTYPE" value="ORDTYPEINVO"/>
-    </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
index 3ae947c27873ccf06f010700750cf37096adfc58..d584daf9ca99e872411cfd5df692a545b1ed9506 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
@@ -53,14 +53,24 @@
       <column name="SALESORDERITEMID" value="0b6823a7-7c89-4da8-a4fb-1f2ce4d3a6f0"/>
     </insert>
     <insert tableName="salesorderitem">
-      <column name="QUANTITY" valueNumeric="1.00"/>
+      <column name="QUANTITY" valueNumeric="1200.00"/>
       <column name="SALESORDER_ID" value="66f6ffc1-702a-4ebe-9158-6214884d658d"/>
       <column name="ITEMSORT" valueNumeric="1"/>
       <column name="ITEMPOSITION" value="1"/>
-      <column name="PRICE" valueNumeric="145000.00"/>
-      <column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
+      <column name="DISCOUNT" valueNumeric="10.00"/>
+      <column name="PRICE" valueNumeric="125.00"/>
+      <column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
       <column name="SALESORDERITEMID" value="117e49f1-b6ac-4570-9042-ae9d69263cb5"/>
     </insert>
+    <insert tableName="salesorderitem">
+      <column name="QUANTITY" valueNumeric="1200.00"/>
+      <column name="SALESORDER_ID" value="90a9dc72-5054-41c1-9213-e8c0c8e466a0"/>
+      <column name="ITEMSORT" valueNumeric="1"/>
+      <column name="ITEMPOSITION" value="1"/>
+      <column name="PRICE" valueNumeric="125.00"/>
+      <column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
+      <column name="SALESORDERITEMID" value="8e946799-4921-41a6-a419-eca29dc1a3e0"/>
+    </insert>
     <insert tableName="salesorderitem">
       <column name="QUANTITY" valueNumeric="3.00"/>
       <column name="GROUPCODEID" value="PRODUCTGROUP1                       "/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
index b1e216514d719c3ee97082d52c9c18eeaed4a9f3..4d1cf385df2103cef05fc7f1e85c09c0fbe910a0 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
@@ -2,15 +2,28 @@
 <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="autogenerated" id="87622af0-7fc4-461c-a093-7b5f49f76a2c">
     <delete tableName="salesproject"/>
+    <insert tableName="salesproject">
+      <column name="PHASE" value="SALPROJPHASENEGO"/>
+      <column name="PROBABILITY" valueNumeric="100.00"/>
+      <column name="PROJECTCODE" valueNumeric="1006"/>
+      <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+      <column name="STARTDATE" valueDate="2020-02-01T11:22:49"/>
+      <column name="DATE_NEW" valueDate="2020-01-08T11:22:49"/>
+      <column name="VOLUME" valueNumeric="450000.00"/>
+      <column name="ENDDATE" valueDate="2022-05-22T12:00:00"/>
+      <column name="SALESPROJECTID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="PROJECTTITLE" value="Bucher Neuprojekt"/>
+      <column name="STATUS" value="SALPROJSTATORDER"/>
+    </insert>
     <insert tableName="salesproject">
       <column name="PHASE" value="SALPROJPHASEOFFER"/>
-      <column name="PROBABILITY" valueNumeric="25.00"/>
+      <column name="PROBABILITY" valueNumeric="50.00"/>
       <column name="PROJECTCODE" valueNumeric="1002"/>
       <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
-      <column name="STARTDATE" valueDate="2020-05-14T12:00:00"/>
-      <column name="DATE_NEW" valueDate="2020-01-01T11:22:49"/>
+      <column name="STARTDATE" valueDate="2021-10-01T11:22:49"/>
+      <column name="DATE_NEW" valueDate="2021-05-03T11:22:49"/>
       <column name="VOLUME" valueNumeric="200000.00"/>
-      <column name="ENDDATE" valueDate="2021-05-20T12:00:00"/>
+      <column name="ENDDATE" valueDate="2022-01-31T12:00:00"/>
       <column name="SALESPROJECTID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="PROJECTTITLE" value="Erstprojekt"/>
       <column name="STATUS" value="SALPROJSTATOPEN"/>
@@ -101,18 +114,5 @@
       <column name="PROJECTTITLE" value="Projekt 123"/>
       <column name="STATUS" value="SALPROJSTATOPEN"/>
     </insert>
-    <insert tableName="salesproject">
-      <column name="PHASE" value="SALPROJPHASECONTACT"/>
-      <column name="PROBABILITY" valueNumeric="25.00"/>
-      <column name="PROJECTCODE" valueNumeric="1006"/>
-      <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
-      <column name="STARTDATE" valueDate="2020-02-05T12:00:00"/>
-      <column name="DATE_NEW" valueDate="2020-01-01T11:22:49"/>
-      <column name="VOLUME" valueNumeric="450000.00"/>
-      <column name="ENDDATE" valueDate="2022-05-22T12:00:00"/>
-      <column name="SALESPROJECTID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="PROJECTTITLE" value="Buchner Neuprojekt"/>
-      <column name="STATUS" value="SALPROJSTATOPEN"/>
-    </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_milestone.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_milestone.xml
index 1aa8d1bf082874c96c10919e06a712b0222afc74..e42a180026b91fcc5d24e790a24849028b95eade 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_milestone.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_milestone.xml
@@ -2,6 +2,107 @@
 <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="autogenerated" id="8003c31c-69d9-4f39-9606-963f33162bcd">
     <delete tableName="salesproject_milestone"/>
+    <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="1f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
+      <column name="DATE_START" valueDate="2020-01-08T11:22:49"/>
+      <column name="DATE_END" valueDate="2020-01-15T11:55:49"/>
+      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="KIND" value="SalesprojectPhase"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASECONTACT"/>
+    </insert>
+    <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="2f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
+      <column name="DATE_START" valueDate="2020-01-15T11:55:49"/>
+      <column name="DATE_END" valueDate="2020-01-20T10:55:49"/>
+      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="KIND" value="SalesprojectPhase"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASELEAD"/>
+      <column name="PARENT_ID" value="1f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
+    </insert>
+    <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="3f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
+      <column name="DATE_START" valueDate="2020-01-20T10:55:49"/>
+      <column name="DATE_END" valueDate="2020-01-23T10:55:49"/>
+      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="KIND" value="SalesprojectPhase"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEPROS"/>
+      <column name="PARENT_ID" value="2f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
+    </insert>
+    <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="4f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
+      <column name="DATE_START" valueDate="2020-01-23T10:55:49"/>
+      <column name="DATE_END" valueDate="2020-01-25T10:55:49"/>
+      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="KIND" value="SalesprojectPhase"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEOFFER"/>
+      <column name="PARENT_ID" value="3f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
+    </insert>
+    <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="5f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
+      <column name="DATE_START" valueDate="2020-01-25T10:55:49"/>
+      <column name="DATE_END" valueDate="2020-01-30T10:55:49"/>
+      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="KIND" value="SalesprojectPhase"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASENEGO"/>
+      <column name="PARENT_ID" value="4f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
+    </insert>
+    <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="161cbb06-b92f-4fe8-9d00-39998b53061c"/>
+      <column name="DATE_START" valueDate="2020-01-01T11:22:49"/>
+      <column name="DATE_END" valueDate="2020-01-30T10:55:49"/>
+      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="KIND" value="SalesprojectState"/>
+      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/>
+    </insert>
+    <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="361cbb06-b92f-4fe8-9d00-39998b53061c"/>
+      <column name="DATE_START" valueDate="2020-01-30T10:55:49"/>
+      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
+      <column name="KIND" value="SalesprojectState"/>
+      <column name="MILESTONEVALUE" value="SALPROJSTATORDER"/>
+      <column name="PARENT_ID" value="161cbb06-b92f-4fe8-9d00-39998b53061c"/>
+    </insert>
+    <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="ae7fe604-2fea-4aa1-be75-e990e8f31c74"/>
+      <column name="DATE_START" valueDate="2021-05-03T11:22:49"/>
+      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="KIND" value="SalesprojectState"/>
+      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/>
+    </insert>
+    <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="14da1165-ed6c-4f2a-8766-11d3533804cb"/>
+      <column name="DATE_START" valueDate="2021-05-03T11:22:49"/>
+      <column name="DATE_END" valueDate="2021-06-07T11:22:49"/>
+      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="KIND" value="SalesprojectPhase"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASECONTACT"/>
+    </insert>
+    <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="bbdcd740-b160-480c-8b26-dfca711a6edb"/>
+      <column name="DATE_START" valueDate="2021-06-07T11:22:49"/>
+      <column name="DATE_END" valueDate="2021-06-28T11:22:49"/>
+      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="KIND" value="SalesprojectPhase"/>
+      <column name="PARENT_ID" value="14da1165-ed6c-4f2a-8766-11d3533804cb"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASELEAD"/>
+    </insert>
+    <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="511b18b1-c5a0-49c9-826e-e5b9423ce127"/>
+      <column name="DATE_START" valueDate="2021-06-28T11:22:49"/>
+      <column name="DATE_END" valueDate="2021-07-20T11:22:49"/>
+      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="KIND" value="SalesprojectPhase"/>
+      <column name="PARENT_ID" value="bbdcd740-b160-480c-8b26-dfca711a6edb"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEPROS"/>
+    </insert>
+    <insert tableName="salesproject_milestone">
+      <column name="SALESPROJECT_MILESTONEID" value="f864e461-1b68-4c00-a4e4-df4af86f486a"/>
+      <column name="DATE_START" valueDate="2021-07-20T11:22:49"/>
+      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
+      <column name="KIND" value="SalesprojectPhase"/>
+      <column name="PARENT_ID" value="511b18b1-c5a0-49c9-826e-e5b9423ce127"/>
+      <column name="MILESTONEVALUE" value="SALPROJPHASEOFFER"/>
+    </insert>
     <insert tableName="salesproject_milestone">
       <column name="SALESPROJECT_MILESTONEID" value="063a2c02-4b21-459a-8ae3-558ba67973dd"/>
       <column name="DATE_START" valueDate="2019-04-25T08:08:07"/>
@@ -19,23 +120,6 @@
       <column name="DATE_END" valueDate="2019-06-17T08:08:07"/>
       <column name="MILESTONEVALUE" value="SALPROJPHASEMAL"/>
     </insert>
-    <insert tableName="salesproject_milestone">
-      <column name="SALESPROJECT_MILESTONEID" value="14da1165-ed6c-4f2a-8766-11d3533804cb"/>
-      <column name="DATE_START" valueDate="2019-05-23T11:30:10"/>
-      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="KIND" value="SalesprojectPhase"/>
-      <column name="PARENT_ID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
-      <column name="DATE_END" valueDate="2019-06-01T11:30:09"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASEMQC"/>
-    </insert>
-    <insert tableName="salesproject_milestone">
-      <column name="SALESPROJECT_MILESTONEID" value="1f86a32a-7fa5-4a51-8bbe-4feee35c8e50"/>
-      <column name="DATE_START" valueDate="2019-11-26T12:43:30"/>
-      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="KIND" value="SalesprojectPhase"/>
-      <column name="PARENT_ID" value="40512b52-d0f4-4a07-a894-88f72455e700"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASEMQC"/>
-    </insert>
     <insert tableName="salesproject_milestone">
       <column name="SALESPROJECT_MILESTONEID" value="36265e49-c676-4370-94ff-f772c087f55b"/>
       <column name="DATE_START" valueDate="2021-06-28T12:34:07"/>
@@ -51,22 +135,6 @@
       <column name="KIND" value="SalesprojectState"/>
       <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/>
     </insert>
-    <insert tableName="salesproject_milestone">
-      <column name="SALESPROJECT_MILESTONEID" value="381b808e-d0a7-408b-a794-55c10b0399b5"/>
-      <column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
-      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="KIND" value="SalesprojectState"/>
-      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/>
-    </insert>
-    <insert tableName="salesproject_milestone">
-      <column name="SALESPROJECT_MILESTONEID" value="40512b52-d0f4-4a07-a894-88f72455e700"/>
-      <column name="DATE_START" valueDate="2019-06-19T08:08:07"/>
-      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="KIND" value="SalesprojectPhase"/>
-      <column name="PARENT_ID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
-      <column name="DATE_END" valueDate="2019-11-26T12:43:30"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASEMAL"/>
-    </insert>
     <insert tableName="salesproject_milestone">
       <column name="SALESPROJECT_MILESTONEID" value="4529f6d1-2d4d-4dfc-b404-6a3d30e7153b"/>
       <column name="DATE_START" valueDate="2019-05-22T11:51:20"/>
@@ -74,15 +142,6 @@
       <column name="KIND" value="SalesprojectState"/>
       <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/>
     </insert>
-    <insert tableName="salesproject_milestone">
-      <column name="SALESPROJECT_MILESTONEID" value="47999521-d6ea-4a4d-959c-e72776ba5a25"/>
-      <column name="DATE_START" valueDate="2019-06-01T10:18:10"/>
-      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="KIND" value="SalesprojectPhase"/>
-      <column name="PARENT_ID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
-      <column name="DATE_END" valueDate="2019-06-15T11:30:09"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASEOFFER"/>
-    </insert>
     <insert tableName="salesproject_milestone">
       <column name="SALESPROJECT_MILESTONEID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/>
       <column name="DATE_START" valueDate="2019-05-10T08:39:38"/>
@@ -161,21 +220,6 @@
       <column name="KIND" value="SalesprojectPhase"/>
       <column name="MILESTONEVALUE" value="SALPROJPHASENQC"/>
     </insert>
-    <insert tableName="salesproject_milestone">
-      <column name="SALESPROJECT_MILESTONEID" value="ae7fe604-2fea-4aa1-be75-e990e8f31c74"/>
-      <column name="DATE_START" valueDate="2019-06-15T01:34:58"/>
-      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="KIND" value="SalesprojectState"/>
-      <column name="MILESTONEVALUE" value="SALPROJSTATOPEN"/>
-    </insert>
-    <insert tableName="salesproject_milestone">
-      <column name="SALESPROJECT_MILESTONEID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
-      <column name="DATE_START" valueDate="2019-05-16T01:34:58"/>
-      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="KIND" value="SalesprojectPhase"/>
-      <column name="DATE_END" valueDate="2019-05-23T10:18:10"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASENQC"/>
-    </insert>
     <insert tableName="salesproject_milestone">
       <column name="SALESPROJECT_MILESTONEID" value="ba8d15aa-3851-451b-9230-70eb7fb4ed6c"/>
       <column name="DATE_START" valueDate="2019-11-26T12:48:39"/>
@@ -190,13 +234,6 @@
       <column name="KIND" value="SalesprojectPhase"/>
       <column name="MILESTONEVALUE" value="SALPROJPHASEPROS"/>
     </insert>
-    <insert tableName="salesproject_milestone">
-      <column name="SALESPROJECT_MILESTONEID" value="d51e2f85-5767-4cfb-9252-b314813152ed"/>
-      <column name="DATE_START" valueDate="2019-11-15T01:06:15"/>
-      <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
-      <column name="KIND" value="SalesprojectPhase"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASESQO"/>
-    </insert>
     <insert tableName="salesproject_milestone">
       <column name="SALESPROJECT_MILESTONEID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/>
       <column name="DATE_START" valueDate="2019-05-14T11:51:20"/>
@@ -227,13 +264,5 @@
       <column name="KIND" value="SalesprojectPhase"/>
       <column name="MILESTONEVALUE" value="SALPROJPHASECONTACT"/>
     </insert>
-    <insert tableName="salesproject_milestone">
-      <column name="SALESPROJECT_MILESTONEID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
-      <column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
-      <column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
-      <column name="KIND" value="SalesprojectPhase"/>
-      <column name="DATE_END" valueDate="2019-06-19T08:08:07"/>
-      <column name="MILESTONEVALUE" value="SALPROJPHASESQO"/>
-    </insert>
   </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_touchpoint.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_touchpoint.xml
index 22c7ea6beb0e528ff751df5edcf131831626d1da..5691a9cbd918276de06cc3fefff02bbd134aa2d9 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_touchpoint.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject_touchpoint.xml
@@ -10,14 +10,14 @@
       <column name="INFO" value="Kontakt über die Webseite"/>
     </insert>
     <insert tableName="salesproject_touchpoint">
-      <column name="ENTRYDATE" valueDate="2019-05-23T10:33:18"/>
+      <column name="ENTRYDATE" valueDate="2021-05-03T10:33:18"/>
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_TOUCHPOINTID" value="515ac173-4eab-4783-9c3f-e637c462f6b3"/>
       <column name="TOUCHPOINT" value="SALPROJSCOWNWEB"/>
       <column name="INFO" value="Erster Kontakt mit uns."/>
     </insert>
     <insert tableName="salesproject_touchpoint">
-      <column name="ENTRYDATE" valueDate="2019-05-23T10:19:16"/>
+      <column name="ENTRYDATE" valueDate="2021-06-07T10:33:18"/>
       <column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
       <column name="SALESPROJECT_TOUCHPOINTID" value="675253dd-0337-44c0-b230-71f030ee0246"/>
       <column name="TOUCHPOINT" value="SALPROJSCFAIR"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/task.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/task.xml
index 6a07339a1da5781238baae1d0c8fbf254ae4d971..62f44c80a9de9dce625c1bac84c67f2debb1010b 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/task.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/task.xml
@@ -87,8 +87,8 @@
       <column name="SUBJECT" value="Lead nachfassen"/>
       <column name="KIND" value="TASK"/>
       <column name="REQUESTOR_CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
-      <column name="DESCRIPTION" value="Kunde ist sehr interessiert an unserem Produkten, weitere Produktabstimmung intern."/>
-      <column name="MATURITY_DATE" valueDate="2020-09-30T12:48:00"/>
+      <column name="DESCRIPTION" value="Kunde ist sehr interessiert an unseren Produkten, weitere Produktabstimmung intern."/>
+      <column name="MATURITY_DATE" valueDate="2021-05-31T12:48:00"/>
       <column name="PRIORITY" value="TASKPRIOLOW"/>
       <column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
@@ -126,11 +126,11 @@
       <column name="START_DATE" valueDate="2020-10-21T09:34:00"/>
     </insert>
     <insert tableName="task">
-      <column name="SUBJECT" value="Mit der Vertriebsleitung abstimmen wie viel Prozent Rabatt gegeben werden kann."/>
+      <column name="SUBJECT" value="Mit der Vertriebsleitung abstimmen, wie viel Prozent Rabatt gegeben werden kann."/>
       <column name="KIND" value="TASK"/>
       <column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
       <column name="DESCRIPTION" value="Preisabstimmung."/>
-      <column name="MATURITY_DATE" valueDate="2020-10-21T09:08:00"/>
+      <column name="MATURITY_DATE" valueDate="2021-06-28T09:08:00"/>
       <column name="PRIORITY" value="TASKPRIOMEDIUM"/>
       <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
       <column name="PROTECTIONLEVEL" valueNumeric="0"/>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_RECORDGROUP.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_RECORDGROUP.xml
index 3490a6d6c42ff1b9b82b8d8b7aeb0d3080873df8..684701f9c5335cabfcd5d3282faa7fd365ed0303 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_RECORDGROUP.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_RECORDGROUP.xml
@@ -5,7 +5,7 @@
       <column name="USER_ID" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>
       <column name="ID" value="145c4277-869c-4e09-af42-47d8a779b961"/>
       <column name="GROUP_TYPE" value="FAVORITE_GROUP"/>
-      <column name="TITLE" value="Abschluss in 2020"/>
+      <column name="TITLE" value="Abschluss in 2021"/>
     </insert>
     <insert tableName="ASYS_RECORDGROUP">
       <column name="USER_ID" value="_____USER_bcdfb521-c7d0-4ef1-8916-78e7d3232046"/>