Merge branch '2021.2' into master

# Conflicts: # .liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml # aliasDefinition/Data_alias/Data_alias.aod # aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod # entity/Offer_entity/Offer_entity.aod # entity/Offer_entity/contentDescriptionProcess.js # entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js # entity/Offer_entity/entityfields/net/displayValueProcess.js # entity/Offeritem_entity/afterSave.js # entity/Order_entity/Order_entity.aod # entity/Order_entity/entityfields/discounted_net/displayValueProcess.js # entity/Order_entity/entityfields/net/displayValueProcess.js # entity/Orderitem_entity/afterSave.js # entity/Salesproject_entity/Salesproject_entity.aod # language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod # language/_____LANGUAGE_de/_____LANGUAGE_de.aod # language/_____LANGUAGE_en/_____LANGUAGE_en.aod # preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod # process/Offer_lib/process.js

Merge branch '2021.2' into master
b365860b · Sebastian Pongratz · 1bc423b9 · 8b813edc · b365860b · b365860b
Commit b365860b authored 3 years ago by Sebastian Pongratz
--- a/.liquibase/Data_alias/basic/2021.2.2/alter_display-value_task-status-completed_keyword.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/alter_display-value_task-status-completed_keyword.xml
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="8f556a75-720c-45b6-9cfe-c26308f96a65">
+        <update tableName="AB_KEYWORD_ENTRY">
+            <column name="TITLE" value="completed" />
+            <where>AB_KEYWORD_ENTRYID = '7311d8c5-edf2-492e-be4d-6f0469334611'</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/alter_relation-type-title_grandchildof.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/alter_relation-type-title_grandchildof.xml
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="d.tran" id="f420d656-da64-4ac2-aa10-8ce529479240">
+        <update tableName="AB_OBJECTRELATIONTYPE">
+            <column name="RELATION_TITLE" value="grandchild of" />
+            <where>AB_OBJECTRELATIONTYPEID = 'a2296f93-2371-4ab8-9f29-ef0795d1e9b2'</where>
+        </update>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
@@ -2,6 +2,21 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="alter_relation-type-title_grandchildof.xml"/>
+    <include relativeToChangelogFile="true" file="alter_display-value_task-status-completed_keyword.xml"/>
+    <include relativeToChangelogFile="true" file="alter_display-name_prospective-customer.xml"/>
+    <include relativeToChangelogFile="true" file="Offer/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="lead_nurturing/changelog.xml"/>
    <include relativeToChangelogFile="true" file="add_offer_showprice.xml"/>
    <include relativeToChangelogFile="true" file="Ticket/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="StandardColumns/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="Person/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="Offeritem/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="Salesorderitem/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="Salesproject/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="Employee/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="Mosaico/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="Mailbridge/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="OfferOrder/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="BulkMail/changelog.xml"/>
 </databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/alter_bulkmail.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/alter_bulkmail.xml
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="m.groppe" id="1801edd3-72d9-4297-8b9b-7ac14cb57884">
+      <addColumn tableName="BULKMAIL">
+          <column name="CAMPAIGN_ID" type="CHAR(36)"/>
+      </addColumn>
+      <createIndex indexName="IDX_BULKMAIL_CAMPAIGN_ID" tableName="BULKMAIL">
+          <column name="CAMPAIGN_ID" />
+      </createIndex>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/changelog.xml
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="alter_bulkmail.xml"/>
+    <include relativeToChangelogFile="true" file="insert_adHocMailBulkMailStatus.xml"/>
+    <include relativeToChangelogFile="true" file="insert_documentTemplateTypeDownload.xml"/>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_adHocMailBulkMailStatus.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_adHocMailBulkMailStatus.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="m.groppe" id="246a1182-ff3c-461a-b533-ae305f0468a6">
+      <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="b0fe2c5e-7195-497c-9a47-5837e0ce30a8"/>
+            <column name="KEYID" value="BULKMAILADHOC"/>
+            <column name="TITLE" value="Ad hoc"/>
+            <column name="CONTAINER" value="BulkMailStatus"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="76fc02b9-a1b6-4c76-bdd5-a52d0e1ef286"/>
+            <column name="SORTING" valueNumeric="6"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
+      </insert>
+      <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+          <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="cfb85e46-8af0-432c-a783-251333c999bf"/>
+          <column name="AB_KEYWORD_ATTRIBUTE_ID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
+          <column name="AB_KEYWORD_ENTRY_ID" value="b0fe2c5e-7195-497c-9a47-5837e0ce30a8"/>
+          <column name="CHAR_VALUE" value="VAADIN:ENVELOPE_OPEN"/>
+      </insert>
+  </changeSet>
+</databaseChangeLog>
--- a/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_documentTemplateTypeDownload.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_documentTemplateTypeDownload.xml
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+  <changeSet author="m.groppe" id="212e1f2b-9913-4555-b7d4-74b848c4712e">
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="ec364de4-a2ef-47f0-a9ec-adec4496fbd0"/>
+        <column name="AB_KEYWORD_CATEGORY_ID" value="b5afd40b-bfa7-4aee-89ea-06b8c7deb304"/>
+        <column name="KEYID" value="DOWNLOAD"/>
+        <column name="TITLE" value="Download"/>
+        <column name="SORTING" valueNumeric="5"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="1"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
@@ -90,7 +90,7 @@
      <column name="HIERARCHY" valueNumeric="0"/>
      <column name="ICON" value="VAADIN:FAMILY"/>
      <column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
-      <column name="RELATION_TITLE" value="Grandchild of"/>
+      <column name="RELATION_TITLE" value="grandchild of"/>
    </insert>
    <insert tableName="ab_objectrelationtype">
      <column name="SIDE" valueNumeric="2"/>

--- a/.liquibase/Data_alias/basic/_demoData/generatedData/communication.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/communication.xml
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/employeegroup.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/employeegroup.xml
@@ -3,13 +3,13 @@
  <changeSet author="autogenerated" id="4057e30a-6441-4457-8871-27cad7ec8c0d">
    <delete tableName="employeegroup"/>
    <insert tableName="employeegroup">
-      <column name="DATE" valueDate="2021-10-06T10:45:02"/>
+      <column name="DATE_NEW" valueDate="2021-10-06T10:45:02"/>
      <column name="EMPLOYEEGROUPID" value="777dc20b-15f1-4a81-9a5f-df2985cbf605"/>
      <column name="GROUPNAME" value="Kundenservice"/>
      <column name="STATUS" value="ACTIVE                              "/>
    </insert>
    <insert tableName="employeegroup">
-      <column name="DATE" valueDate="2021-10-07T12:06:29"/>
+      <column name="DATE_NEW" valueDate="2021-10-07T12:06:29"/>
      <column name="EMPLOYEEGROUPID" value="85268396-e3d7-4024-be9f-2632cc5ffb36"/>
      <column name="GROUPNAME" value="Allgemein"/>
      <column name="STATUS" value="ACTIVE                              "/>

--- a/.liquibase/Data_alias/basic/_demoData/generatedData/inboxfiltergroup.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/inboxfiltergroup.xml
@@ -3,13 +3,13 @@
  <changeSet author="autogenerated" id="7a59652f-1865-4172-b16b-f84e7dc927d6">
    <delete tableName="inboxfiltergroup"/>
    <insert tableName="inboxfiltergroup">
-      <column name="DATE" valueDate="2021-10-08T12:50:27"/>
+      <column name="DATE_NEW" valueDate="2021-10-08T12:50:27"/>
      <column name="INBOXFILTERGROUPID" value="1a0bf718-3e4e-489c-bfa9-c0e1041324b5"/>
      <column name="NAME" value="Allgemein "/>
      <column name="STATE" value="ACTIVE"/>
    </insert>
    <insert tableName="inboxfiltergroup">
-      <column name="DATE" valueDate="2021-10-06T10:52:30"/>
+      <column name="DATE_NEW" valueDate="2021-10-06T10:52:30"/>
      <column name="INBOXFILTERGROUPID" value="a21df88c-d5e5-486a-b57e-f4485fc6928d"/>
      <column name="NAME" value="Kundenservice"/>
      <column name="STATE" value="ACTIVE"/>

--- a/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml
@@ -144,6 +144,7 @@
      <column name="DATE_NEW" valueDate="2019-05-17T08:27:21"/>
      <column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
      <column name="STATUS" value="OFFERSTATWON"/>
+      <column name="PROBABILITY" valueNumeric="0"/>
    </insert>
    <insert tableName="offer">
      <column name="PAYMENTTERMS" value="PAYTERM7"/>
@@ -153,7 +154,6 @@
      <column name="CONTACT_ID" value="a059aa9d-0463-4dbd-8b54-e85e235e63e0"/>
      <column name="USER_NEW" value="Birgit Leicht"/>
      <column name="OBJECT_ROWID" value="cdaa7f90-6e3d-4199-974b-0847b867a419"/>
-      <column name="DISCOUNTED_VAT" valueNumeric="712.50"/>
      <column name="ISOLANGUAGE" value="deu"/>
      <column name="VERSNR" valueNumeric="1"/>
      <column name="OFFERID" value="4f877dc9-8fce-41d5-bce4-f3ac34b12fde"/>
@@ -165,7 +165,6 @@
      <column name="OBJECT_TYPE" value="Salesproject"/>
      <column name="PROBABILITY" valueNumeric="50"/>
      <column name="OFFERCODE" valueNumeric="1015"/>
-      <column name="DISCOUNTED_NET" valueNumeric="3750.00"/>
      <column name="VAT" valueNumeric="712.50"/>
      <column name="DATE_NEW" valueDate="2021-06-28T05:49:22"/>
      <column name="HEADER" value="Wir danken Ihnen für Ihre Anfrage und bieten Ihnen die von Ihnen genannten Produkte wie folgt an:"/>
@@ -220,7 +219,6 @@
      <column name="CONTACT_ID" value="aee383d4-a34a-45aa-b2f3-abab9da800e3"/>
      <column name="USER_NEW" value="Birgit Leicht"/>
      <column name="OBJECT_ROWID" value="7683f92d-a949-4b76-ba6f-57344d730f40"/>
-      <column name="DISCOUNTED_VAT" valueNumeric="1900.00"/>
      <column name="ISOLANGUAGE" value="deu"/>
      <column name="VERSNR" valueNumeric="1"/>
      <column name="OFFERID" value="98ee9b03-b4cb-4e69-bf3b-ab6fd63e7b7a"/>
@@ -232,7 +230,6 @@
      <column name="OBJECT_TYPE" value="Salesproject"/>
      <column name="PROBABILITY" valueNumeric="0"/>
      <column name="OFFERCODE" valueNumeric="1016"/>
-      <column name="DISCOUNTED_NET" valueNumeric="10600.00"/>
      <column name="VAT" valueNumeric="1900.00"/>
      <column name="DATE_NEW" valueDate="2021-06-28T06:29:59"/>
      <column name="ACTIONUSER" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
@@ -267,7 +264,6 @@
      <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="76950.00"/>
      <column name="ISOLANGUAGE" value="deu"/>
      <column name="VERSNR" valueNumeric="1"/>
      <column name="OFFERID" value="b25b1da5-c179-4142-a9c8-130c888a9b29"/>
@@ -279,7 +275,6 @@
      <column name="PROBABILITY" valueNumeric="0"/>
      <column name="APPROVAL" value="2"/>
      <column name="OFFERCODE" valueNumeric="1014"/>
-      <column name="DISCOUNTED_NET" valueNumeric="49000.00"/>
      <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:"/>

--- a/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml
@@ -14,6 +14,7 @@
      <column name="ITEMPOSITION" value="1.3"/>
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -27,6 +28,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="1000.00"/>
      <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="10.00"/>
@@ -41,6 +43,7 @@
      <column name="PRICE" valueNumeric="5000.00"/>
      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
      <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="800.00"/>
@@ -55,6 +58,7 @@
      <column name="UNIT" value="QUANTITYHOUR"/>
      <column name="PRICE" valueNumeric="125.00"/>
      <column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="3600.00"/>
@@ -83,6 +87,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="3500.00"/>
      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -96,6 +101,7 @@
      <column name="ITEMPOSITION" value="1.1"/>
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -110,6 +116,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="50000.00"/>
      <column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="2.00"/>
@@ -124,6 +131,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="210.00"/>
      <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="3.00"/>
@@ -137,6 +145,7 @@
      <column name="ITEMPOSITION" value="1.1.1"/>
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -151,6 +160,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="2500.00"/>
      <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="2.00"/>
@@ -164,6 +174,7 @@
      <column name="ITEMPOSITION" value="1.2"/>
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="1000.00"/>
@@ -177,6 +188,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="150.00"/>
      <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="3.00"/>
@@ -190,6 +202,7 @@
      <column name="ITEMPOSITION" value="1.1.2"/>
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -204,6 +217,7 @@
      <column name="UNIT" value="QUANTITYHOUR"/>
      <column name="PRICE" valueNumeric="1000.00"/>
      <column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -219,6 +233,7 @@
      <column name="PRICE" valueNumeric="10000.00"/>
      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
      <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="3600.00"/>
@@ -233,6 +248,7 @@
      <column name="UNIT" value="QUANTITYHOUR"/>
      <column name="PRICE" valueNumeric="125.00"/>
      <column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="5.00"/>
@@ -248,6 +264,7 @@
      <column name="PRICE" valueNumeric="10000.00"/>
      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
      <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -262,6 +279,7 @@
      <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"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -276,6 +294,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="210.00"/>
      <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -303,6 +322,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="250.00"/>
      <column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="2.00"/>
@@ -317,6 +337,7 @@
      <column name="UNIT" value="QUANTITYHOUR"/>
      <column name="PRICE" valueNumeric="210.00"/>
      <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="2.00"/>
@@ -331,6 +352,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="210.00"/>
      <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="3.00"/>
@@ -345,6 +367,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="210.00"/>
      <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -359,6 +382,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="50000.00"/>
      <column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="5.00"/>
@@ -388,6 +412,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="600.00"/>
      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="5.00"/>
@@ -402,6 +427,7 @@
      <column name="PRICE" valueNumeric="5000.00"/>
      <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
      <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="offeritem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -415,6 +441,7 @@
      <column name="UNIT" value="QUANTITYPIECES"/>
      <column name="PRICE" valueNumeric="25000.00"/>
      <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
  </changeSet>
 </databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
@@ -76,12 +76,10 @@
      <column name="OBJECT_ROWID" value="7683f92d-a949-4b76-ba6f-57344d730f40"/>
      <column name="SALESORDERDATE" valueDate="2020-08-11T12:00:00"/>
      <column name="DUNNINGDATE" valueDate="2021-06-29T12:00:00"/>
-      <column name="DISCOUNTED_VAT" valueNumeric="1900.00"/>
      <column name="ISOLANGUAGE" value="deu"/>
      <column name="CURRENCY" value="EUR"/>
      <column name="NET" valueNumeric="10600.00"/>
      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="DISCOUNTED_NET" valueNumeric="10600.00"/>
      <column name="VAT" valueNumeric="1900.00"/>
      <column name="PAYDUEDATE" valueDate="2020-08-18T12:00:00"/>
      <column name="PAYMENTADDRESS" value="Meister Messebau&#10;Aitrachstraße 5&#10;84130 Dingolfing"/>
@@ -104,12 +102,10 @@
      <column name="OBJECT_ROWID" value="cdaa7f90-6e3d-4199-974b-0847b867a419"/>
      <column name="SALESORDERDATE" valueDate="2021-06-29T12:00:00"/>
      <column name="DUNNINGDATE" valueDate="2021-06-29T12:02:24"/>
-      <column name="DISCOUNTED_VAT" valueNumeric="712.50"/>
      <column name="ISOLANGUAGE" value="deu"/>
      <column name="CURRENCY" value="EUR"/>
      <column name="NET" valueNumeric="3750.00"/>
      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="DISCOUNTED_NET" valueNumeric="3750.00"/>
      <column name="VAT" valueNumeric="712.50"/>
      <column name="PAYDUEDATE" valueDate="2020-08-15T12:00:00"/>
      <column name="PAYMENTADDRESS" value="Meister Messebau GmbH&#10;Aitrachstraße 7&#10;84130 Dingolfing"/>
@@ -158,12 +154,10 @@
      <column name="OBJECT_ROWID" value="7683f92d-a949-4b76-ba6f-57344d730f40"/>
      <column name="SALESORDERDATE" valueDate="2021-06-29T12:00:00"/>
      <column name="DUNNINGDATE" valueDate="2021-06-29T12:06:46"/>
-      <column name="DISCOUNTED_VAT" valueNumeric="1900.00"/>
      <column name="ISOLANGUAGE" value="deu"/>
      <column name="CURRENCY" value="EUR"/>
      <column name="NET" valueNumeric="10600.00"/>
      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="DISCOUNTED_NET" valueNumeric="10600.00"/>
      <column name="VAT" valueNumeric="1900.00"/>
      <column name="PAYDUEDATE" valueDate="2020-08-18T12:00:00"/>
      <column name="PAYMENTADDRESS" value="Meister Messebau&#10;Aitrachstraße 5&#10;84130 Dingolfing"/>
@@ -283,12 +277,10 @@
      <column name="OBJECT_ROWID" value="cdaa7f90-6e3d-4199-974b-0847b867a419"/>
      <column name="SALESORDERDATE" valueDate="2020-07-06T12:00:00"/>
      <column name="DUNNINGDATE" valueDate="2021-06-29T12:02:24"/>
-      <column name="DISCOUNTED_VAT" valueNumeric="712.50"/>
      <column name="ISOLANGUAGE" value="deu"/>
      <column name="CURRENCY" value="EUR"/>
      <column name="NET" valueNumeric="3750.00"/>
      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="DISCOUNTED_NET" valueNumeric="3750.00"/>
      <column name="VAT" valueNumeric="712.50"/>
      <column name="PAYDUEDATE" valueDate="2020-08-13T12:00:00"/>
      <column name="PAYMENTADDRESS" value="Meister Messebau GmbH&#10;Aitrachstraße 7&#10;84130 Dingolfing"/>
@@ -378,12 +370,10 @@
      <column name="OBJECT_ROWID" value="cdaa7f90-6e3d-4199-974b-0847b867a419"/>
      <column name="SALESORDERDATE" valueDate="2020-07-08T12:00:00"/>
      <column name="DUNNINGDATE" valueDate="2021-06-29T12:00:00"/>
-      <column name="DISCOUNTED_VAT" valueNumeric="712.50"/>
      <column name="ISOLANGUAGE" value="deu"/>
      <column name="CURRENCY" value="EUR"/>
      <column name="NET" valueNumeric="3750.00"/>
      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="DISCOUNTED_NET" valueNumeric="3750.00"/>
      <column name="VAT" valueNumeric="712.50"/>
      <column name="PAYDUEDATE" valueDate="2020-08-15T12:00:00"/>
      <column name="PAYMENTADDRESS" value="Meister Messebau GmbH&#10;Aitrachstraße 7&#10;84130 Dingolfing"/>
@@ -406,12 +396,10 @@
      <column name="OBJECT_ROWID" value="7683f92d-a949-4b76-ba6f-57344d730f40"/>
      <column name="SALESORDERDATE" valueDate="2020-08-11T12:00:00"/>
      <column name="DUNNINGDATE" valueDate="2021-06-29T12:07:39"/>
-      <column name="DISCOUNTED_VAT" valueNumeric="1900.00"/>
      <column name="ISOLANGUAGE" value="deu"/>
      <column name="CURRENCY" value="EUR"/>
      <column name="NET" valueNumeric="10600.00"/>
      <column name="OBJECT_TYPE" value="Salesproject"/>
-      <column name="DISCOUNTED_NET" valueNumeric="10600.00"/>
      <column name="VAT" valueNumeric="1900.00"/>
      <column name="PAYDUEDATE" valueDate="2020-08-18T12:00:00"/>
      <column name="PAYMENTADDRESS" value="Meister Messebau&#10;Aitrachstraße 5&#10;84130 Dingolfing"/>

--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
@@ -14,6 +14,7 @@
      <column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
      <column name="SALESORDERITEMID" value="001410e8-f70b-4041-901c-02275ff6deb5"/>
      <column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -26,6 +27,7 @@
      <column name="PRICE" valueNumeric="3500.00"/>
      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
      <column name="SALESORDERITEMID" value="07ceecff-e3cc-4891-b820-3fb6b977a9cc"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -38,6 +40,7 @@
      <column name="PRICE" valueNumeric="3500.00"/>
      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
      <column name="SALESORDERITEMID" value="08de406a-79bf-468f-8fea-29acfc79a1e8"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -51,6 +54,7 @@
      <column name="PRICE" valueNumeric="600.00"/>
      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
      <column name="SALESORDERITEMID" value="0b6823a7-7c89-4da8-a4fb-1f2ce4d3a6f0"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1200.00"/>
@@ -74,6 +78,7 @@
      <column name="PRICE" valueNumeric="210.00"/>
      <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
      <column name="SALESORDERITEMID" value="17856c63-10f8-46c6-9295-5ad5bedff8ba"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="5.00"/>
@@ -87,6 +92,7 @@
      <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
      <column name="SALESORDERITEMID" value="2f409cb9-4d85-4e39-8e78-4838cd9a9224"/>
      <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="10.00"/>
@@ -100,6 +106,7 @@
      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
      <column name="SALESORDERITEMID" value="35c54c0a-760c-4a6b-a5f1-4d6beaec07ac"/>
      <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="5.00"/>
@@ -113,6 +120,7 @@
      <column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
      <column name="SALESORDERITEMID" value="368569a0-4d4d-4535-b2a5-8e380d5612ef"/>
      <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -125,6 +133,7 @@
      <column name="PRICE" valueNumeric="25000.00"/>
      <column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
      <column name="SALESORDERITEMID" value="39da8def-662f-4904-b9bf-b4e97affbeb7"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="50.00"/>
@@ -138,6 +147,7 @@
      <column name="PRICE" valueNumeric="1060.00"/>
      <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
      <column name="SALESORDERITEMID" value="3d9a18ac-2182-4cd5-a2c4-140674466821"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="2.00"/>
@@ -151,6 +161,7 @@
      <column name="PRICE" valueNumeric="210.00"/>
      <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
      <column name="SALESORDERITEMID" value="45422c17-9626-4435-80ef-58c24fdf7559"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="2.00"/>
@@ -164,6 +175,7 @@
      <column name="PRICE" valueNumeric="210.00"/>
      <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
      <column name="SALESORDERITEMID" value="45c38cca-86b7-46f1-aee8-635c8f0603bc"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -177,6 +189,7 @@
      <column name="PRICE" valueNumeric="50000.00"/>
      <column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
      <column name="SALESORDERITEMID" value="468023b8-fb3e-4e4c-9d30-841d12888b73"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -190,6 +203,7 @@
      <column name="PRICE" valueNumeric="600.00"/>
      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
      <column name="SALESORDERITEMID" value="4c403665-3fc3-43cd-9921-1f07e2a358ef"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="2.00"/>
@@ -203,6 +217,7 @@
      <column name="PRICE" valueNumeric="210.00"/>
      <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
      <column name="SALESORDERITEMID" value="5396e85b-3144-400f-8f5d-c01e875679f7"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -216,6 +231,7 @@
      <column name="PRICE" valueNumeric="25000.00"/>
      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
      <column name="SALESORDERITEMID" value="692f2acd-08b6-45d1-bcdf-6f8e46999039"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -230,6 +246,7 @@
      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
      <column name="SALESORDERITEMID" value="6e12bc70-5607-4ee5-b40f-2d65fd07ba22"/>
      <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -266,6 +283,7 @@
      <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"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="5.00"/>
@@ -294,6 +312,7 @@
      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
      <column name="SALESORDERITEMID" value="950fd897-5ec0-4838-b45f-1b811ab391dd"/>
      <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -307,6 +326,7 @@
      <column name="PRICE" valueNumeric="600.00"/>
      <column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
      <column name="SALESORDERITEMID" value="a157e7c1-8ed3-4231-9b84-1db9aa4f6bc6"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -319,6 +339,7 @@
      <column name="PRICE" valueNumeric="1000.00"/>
      <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
      <column name="SALESORDERITEMID" value="b4f02784-4593-4caf-a845-40b426d00082"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1000.00"/>
@@ -331,6 +352,7 @@
      <column name="PRICE" valueNumeric="150.00"/>
      <column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
      <column name="SALESORDERITEMID" value="b5f17aaa-ffa7-4c8e-bbcb-d51cfecb06db"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="5.00"/>
@@ -359,6 +381,7 @@
      <column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
      <column name="SALESORDERITEMID" value="cd79054e-b74b-4c09-b49b-a62ee738818b"/>
      <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -372,6 +395,7 @@
      <column name="PRICE" valueNumeric="1000.00"/>
      <column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
      <column name="SALESORDERITEMID" value="cd7c9255-0de8-4b15-a952-caf9669b447a"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
    <insert tableName="salesorderitem">
      <column name="QUANTITY" valueNumeric="1.00"/>
@@ -385,6 +409,7 @@
      <column name="PRICE" valueNumeric="2500.00"/>
      <column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
      <column name="SALESORDERITEMID" value="e53aaecf-d8b6-4327-96cb-66f004e4b5fb"/>
+      <column name="DISCOUNT" valueNumeric="0"/>
    </insert>
  </changeSet>
 </databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
@@ -44,6 +44,7 @@
      <column name="PROJECTTITLE" value="Meister Messebau/ Umsetzung"/>
      <column name="STATUS" value="SALPROJSTATOPEN"/>
      <column name="CURRENCYRATE_ID" value=""/>
+      <column name="PROBABILITY" valueNumeric="0.00"/>
    </insert>
    <insert tableName="salesproject">
      <column name="PHASE" value="SALPROJPHASEOFFER"/>

--- a/.liquibase/Data_alias/basic/_demoData/generatedData/weblink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/weblink.xml
@@ -59,7 +59,7 @@
      <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
      <column name="USER_EDIT" value="Lisa Sommer"/>
      <column name="URL" value="http://www.adito.de"/>
-      <column name="USER_NEW" value="Admin"/>
+      <column name="USER_NEW" value="Lisa Sommer"/>
      <column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
      <column name="SCORE" valueNumeric="0"/>
      <column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
@@ -67,5 +67,44 @@
      <column name="ISREDIRECT" valueNumeric="1"/>
      <column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
    </insert>
+    <insert tableName="weblink">
+      <column name="WEBLINKID" value="c82da3d0-8156-4dd5-86f2-ad68ea3d11ef"/>
+      <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+      <column name="USER_EDIT" value="Lisa Sommer"/>
+      <column name="URL" value="https://www.adito.de/unternehmen/philosophie.html"/>
+      <column name="USER_NEW" value="Lisa Sommer"/>
+      <column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
+      <column name="SCORE" valueNumeric="0"/>
+      <column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
+      <column name="PLACEHOLDER" value="adito_about"/>
+      <column name="ISREDIRECT" valueNumeric="1"/>
+      <column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
+    </insert>
+    <insert tableName="weblink">
+      <column name="WEBLINKID" value="75b2ca5c-e270-45ad-9ade-7f70a15674b4"/>
+      <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+      <column name="USER_EDIT" value="Lisa Sommer"/>
+      <column name="URL" value="https://www.adito.de/impressum.html"/>
+      <column name="USER_NEW" value="Lisa Sommer"/>
+      <column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
+      <column name="SCORE" valueNumeric="0"/>
+      <column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
+      <column name="PLACEHOLDER" value="adito_impressum"/>
+      <column name="ISREDIRECT" valueNumeric="1"/>
+      <column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
+    </insert>
+    <insert tableName="weblink">
+      <column name="WEBLINKID" value="ea7300fc-ee2d-49e6-8eb2-ff5b5922737a"/>
+      <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+      <column name="USER_EDIT" value="Lisa Sommer"/>
+      <column name="URL" value="https://www.adito.de/kontakt/formular.html"/>
+      <column name="USER_NEW" value="Lisa Sommer"/>
+      <column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
+      <column name="SCORE" valueNumeric="0"/>
+      <column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
+      <column name="PLACEHOLDER" value="adito_contact"/>
+      <column name="ISREDIRECT" valueNumeric="1"/>
+      <column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
+    </insert>
  </changeSet>
 </databaseChangeLog>
\ No newline at end of file
--- a/.liquibase/Data_alias/basic/workflows/blob/advertisingShipment.xml
+++ b/.liquibase/Data_alias/basic/workflows/blob/advertisingShipment.xml
@@ -5,7 +5,7 @@
    <documentation>Workflow for handling Advertisingmaterials</documentation>
    <startEvent id="startEvent1" flowable:formFieldValidation="true"></startEvent>
    <exclusiveGateway id="sid-ADD3DA2A-E320-4E07-9D04-73D8A9625D1E"></exclusiveGateway>
-    <userTask id="sid-3EB74D83-9BE8-427C-A5E8-72D906429892" name="Test Post Versand" flowable:candidateGroups="PROJECT_OfficeStaff,PROJECT_Marketing" flowable:formFieldValidation="true">
+    <userTask id="sid-3EB74D83-9BE8-427C-A5E8-72D906429892" name="Post Versand" flowable:candidateGroups="PROJECT_OfficeStaff,PROJECT_Marketing" flowable:formFieldValidation="true">
      <extensionElements>
        <modeler:group-info-name-PROJECT_OfficeStaff xmlns:modeler="http://flowable.org/modeler"><![CDATA[Office staff]]></modeler:group-info-name-PROJECT_OfficeStaff>
        <modeler:group-info-name-PROJECT_Marketing xmlns:modeler="http://flowable.org/modeler"><![CDATA[Marketing]]></modeler:group-info-name-PROJECT_Marketing>

--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
--- a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
+++ b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod