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

.aditoprj/ignoredScanServiceTasks.json

@@ -78,144 +78,6 @@
       "description": "There is no index for the column \"DEPLOYMENT_ID\" in the table \"DATABASECHANGELOG\" [59]",
       "groupName": "nb-tasklist-warning"
     },
-    {
-      "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"NOTIFICATION_PRIO\" located in: ObserverationEditGeneric/fields/entityField/NOTIFICATION_PRIO [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"OBJECT_FIELD\" located in: ObserverationEditGeneric/fields/entityField/OBJECT_FIELD [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"OBJECT_FILTER\" located in: ObserverationEditGeneric/fields/entityField/OBJECT_FILTER [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"OBJECT_ID\" located in: ObserverationEditGeneric/fields/entityField/OBJECT_ID [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"OBJECT_TYPE\" located in: ObserverationEditGeneric/fields/entityField/OBJECT_TYPE [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"OBSERVER\" located in: ObserverationEditGeneric/fields/entityField/OBSERVER [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"TRIGGEREVENTDELETE\" located in: ObserverationEditGeneric/fields/entityField/TRIGGEREVENTDELETE [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"TRIGGEREVENTINSERT\" located in: ObserverationEditGeneric/fields/entityField/TRIGGEREVENTINSERT [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"TRIGGEREVENTUPDATE\" located in: ObserverationEditGeneric/fields/entityField/TRIGGEREVENTUPDATE [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"FilterActions\" located in: ObservationFilterTreeTable/favoriteActionGroup1/FilterActions [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"NOTIFICATION_PRIO\" located in: ObservationFilterTreeTable/columns/entityField/NOTIFICATION_PRIO [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"OBJECT_TYPE\" located in: ObservationFilterTreeTable/columns/entityField/OBJECT_TYPE [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"OBSERVATION_ID\" located in: ObservationFilterTreeTable/parentField/OBSERVATION_ID [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"OnlyMyObservations_param\" located in: neonDashletConfiguration/parameters/OnlyMyObservations_param [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"observationType\" located in: ObservationFilterTreeTable/columns/entityField/observationType [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"NOTIFICATION_PRIO\" located in: ObservationPreviewCard/subtitleField/NOTIFICATION_PRIO [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"OBJECT_FIELD\" located in: ObservationPreviewGeneric/fields/entityField/OBJECT_FIELD [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"OBJECT_FILTER\" located in: ObservationPreviewGeneric/fields/entityField/OBJECT_FILTER [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"OBJECT_ID\" located in: ObservationPreviewGeneric/fields/entityField/OBJECT_ID [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"OBJECT_TYPE\" located in: ObservationPreviewCard/titleField/OBJECT_TYPE [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"TRIGGEREVENTDELETE\" located in: ObservationPreviewScoreCard/fields/entityField/TRIGGEREVENTDELETE [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"TRIGGEREVENTINSERT\" located in: ObservationPreviewScoreCard/fields/entityField/TRIGGEREVENTINSERT [67]",
-      "groupName": "nb-tasklist-warning"
-    },
-    {
-      "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
-      "line": -1,
-      "description": "Dead Reference \"TRIGGEREVENTUPDATE\" located in: ObservationPreviewScoreCard/fields/entityField/TRIGGEREVENTUPDATE [67]",
-      "groupName": "nb-tasklist-warning"
-    },
     {
       "target": "neonView/SalesprojectAnalysesPhases_view/SalesprojectAnalysesPhases_view.aod",
       "line": -1,

.liquibase/Data_alias/basic/2021.2.0/changelog.xml

@@ -13,4 +13,4 @@
     <include relativeToChangelogFile="true" file="EwsContactSync/changelog.xml"/>
     <include relativeToChangelogFile="true" file="Export/changelog.xml"/>
     <include relativeToChangelogFile="true" file="insert_ProductGroupcode.xml"/>
-</databaseChangeLog>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/BulkMail/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="insertBulkMailSenderAddressKeyword.xml"/>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.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="50badea9-da46-4aa0-94ed-a2c3db2874ac">
+        <insert tableName="AB_KEYWORD_CATEGORY">
+            <column name="AB_KEYWORD_CATEGORYID" value="3f31d08d-bf59-4bb7-9e96-7f026571cb79"/>
+            <column name="NAME" value="BulkmailSenderAddress"/>
+            <column name="SORTINGBY" valueNumeric="0"/>
+            <column name="SORTINGDIRECTION" value="ASC"/>
+        </insert>
+
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="c4773a13-314d-4f00-a7d3-ab65947586ba"/>
+            <column name="KEYID" value="news@adito.de"/>
+            <column name="TITLE" value="news@adito.de"/>
+            <column name="CONTAINER"/>
+            <column name="SORTING" valueNumeric="1"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="AB_KEYWORD_CATEGORY_ID" value="3f31d08d-bf59-4bb7-9e96-7f026571cb79"/>
+        </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/Employee/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="insert_ServiceDepartment.xml"/>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/Employee/insert_ServiceDepartment.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="v.broens" id="ce4bcbe5-e2a6-468d-8481-6bef9d538de5">
+    <update tableName="AB_ATTRIBUTE">
+      <column name="ATTRIBUTE_NAME" value="IT"/>
+      <where> AB_ATTRIBUTEID = 'e47c7fb1-1072-4f03-a275-e4b6331deec1'</where>
+    </update>    
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="de14c675-2734-4991-82c7-88e8c6dfe3b7"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="ATTRIBUTE_NAME" value="Service"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
+      <column name="SORTING" valueNumeric="5"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="30324d52-53c6-4e2b-a604-38a35a2184e0"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="ATTRIBUTE_NAME" value="Office staff"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="de14c675-2734-4991-82c7-88e8c6dfe3b7"/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
+      <column name="SORTING" valueNumeric="1"/>
+    </insert>
+    <insert tableName="AB_ATTRIBUTE">
+      <column name="AB_ATTRIBUTEID" value="a4048b9a-1c5e-45b5-8996-9b68d3e78af8"/>
+      <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+      <column name="ATTRIBUTE_NAME" value="Field staff"/>
+      <column name="ATTRIBUTE_PARENT_ID" value="de14c675-2734-4991-82c7-88e8c6dfe3b7"/>
+      <column name="ATTRIBUTE_TYPE" value="VOID"/>
+      <column name="SORTING" valueNumeric="0"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/Mailbridge/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="insert_InboxFilterComponent.xml"/>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/Mailbridge/insert_InboxFilterComponent.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="" id="27c0ee46-a456-479e-a5b6-27e4624f6b18">
+         <insert tableName="ab_keyword_entry">  
+            <column  name="AB_KEYWORD_ENTRYID"  value="958021c1-e025-4d8c-8cfb-0d963d609dc2"/>  
+            <column  name="KEYID"  value="SUBJECT_BODY"/>  
+            <column  name="TITLE"  value="Subject and Body"/>  
+            <column  name="CONTAINER"  value="InboxFilterComponent"/>  
+            <column  name="SORTING"  valueNumeric="3"/>  
+            <column  name="ISACTIVE"  valueNumeric="1"/>  
+            <column  name="ISESSENTIAL"  valueNumeric="0"/>  
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="7723f275-e9b2-4a77-92de-e2e558638664"/>
+        </insert> 
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/Mosaico/append_mosaicoTemplateCategory.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="a.fraeder" id="b564a74d-cba8-406d-8a54-f56663f02c09">
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="a5e6edd3-35cb-4da0-b1c2-463e5ad5cae9"/>
+        <column name="AB_KEYWORD_CATEGORY_ID" value="be28e8a4-08d4-4697-b248-8b97b4e6e749"/>
+        <column name="KEYID" value="LANDINGPAGE"/>
+        <column name="TITLE" value="Landingpage"/>
+        <column name="CONTAINER" value="MosaicoTemplateCategory"/>
+        <column name="SORTING" valueNumeric="5"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/Mosaico/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="insert_mosaico_color_keyword.xml"/>
+    <include relativeToChangelogFile="true" file="append_mosaicoTemplateCategory.xml"/>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/Mosaico/insert_mosaico_color_keyword.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="38c3216e-d0dd-4f4b-97fd-2a76d8892a72">
+    <insert tableName="AB_KEYWORD_CATEGORY">
+      <column name="AB_KEYWORD_CATEGORYID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+      <column name="NAME" value="MosaicoColor"/>
+      <column name="SORTINGBY" valueNumeric="0"/>
+      <column name="SORTINGDIRECTION" value="ASC"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="0037e823-4e16-4504-9f26-82dd226733f0"/>
+        <column name="AB_KEYWORD_CATEGORY_ID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+        <column name="KEYID" value="0B2D3A"/>
+        <column name="TITLE" value="Adito dark blue"/>
+        <column name="CONTAINER" value="MosaicoColor"/>
+        <column name="SORTING" valueNumeric="1"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="6f3b9635-679c-47b4-9fe3-0770aaca719c"/>
+        <column name="AB_KEYWORD_CATEGORY_ID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+        <column name="KEYID" value="009AB9"/>
+        <column name="TITLE" value="Adito light blue"/>
+        <column name="CONTAINER" value="MosaicoColor"/>
+        <column name="SORTING" valueNumeric="2"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="b9ce199e-a4e1-4b48-ba61-85ee6139b89c"/>
+        <column name="AB_KEYWORD_CATEGORY_ID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+        <column name="KEYID" value="ED1652"/>
+        <column name="TITLE" value="Adito red"/>
+        <column name="CONTAINER" value="MosaicoColor"/>
+        <column name="SORTING" valueNumeric="3"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="09f299f7-9faa-40c4-a53d-e7b5c33dca53"/>
+        <column name="AB_KEYWORD_CATEGORY_ID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+        <column name="KEYID" value="EEF5F7"/>
+        <column name="TITLE" value="Adito grey"/>
+        <column name="CONTAINER" value="MosaicoColor"/>
+        <column name="SORTING" valueNumeric="4"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+    <insert tableName="AB_KEYWORD_ENTRY">
+        <column name="AB_KEYWORD_ENTRYID" value="692699de-d7ad-4500-b71e-153555a2ceac"/>
+        <column name="AB_KEYWORD_CATEGORY_ID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+        <column name="KEYID" value="FFFFFF"/>
+        <column name="TITLE" value="White"/>
+        <column name="CONTAINER" value="MosaicoColor"/>
+        <column name="SORTING" valueNumeric="5"/>
+        <column name="ISACTIVE" valueNumeric="1"/>
+        <column name="ISESSENTIAL" valueNumeric="0"/>
+    </insert>
+  </changeSet>
+</databaseChangeLog>

.liquibase/Data_alias/basic/2021.2.2/Offer/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="update_OfferSetZeroProbability.xml"/>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/Offer/update_OfferSetZeroProbability.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="b.ulrich" id="02eac203-25b5-480c-a73b-364d1c76d051">
+        <update tableName="OFFER">
+            <column name="PROBABILITY" valueNumeric="0"/>
+            <where>PROBABILITY is null</where>
+        </update>
+        <addDefaultValue 
+            columnDataType="NUMERIC(14,2)"
+            columnName="PROBABILITY"  
+            defaultValueNumeric="0"
+            tableName="OFFER"/>
+        <addNotNullConstraint
+           columnDataType="NUMERIC(14,2)"
+           columnName="PROBABILITY"  
+           tableName="OFFER"/>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/OfferOrder/alter_offer.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="p.neub" id="a76dd9e5-5b66-4b5d-8c93-9fc8104f695e">
+        <dropColumn tableName="OFFER">
+            <column name="DISCOUNTED_NET"/>
+            <column name="DISCOUNTED_VAT"/>
+        </dropColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/OfferOrder/alter_order.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="p.neub" id="b5cd257d-1df9-4704-9e66-45c220c67158">
+        <dropColumn tableName="SALESORDER">
+            <column name="DISCOUNTED_NET"/>
+            <column name="DISCOUNTED_VAT"/>
+        </dropColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/OfferOrder/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_offer.xml"/>
+    <include relativeToChangelogFile="true" file="alter_order.xml"/>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/Offeritem/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="update_OfferitemSetZeroDiscount.xml"/>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/Offeritem/update_OfferitemSetZeroDiscount.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="b.ulrich" id="2372c4db-0f58-474a-bb00-71ddd5776ff7">
+        <update tableName="OFFERITEM">
+            <column name="DISCOUNT" valueNumeric="0"/>
+            <where>DISCOUNT is null</where>
+        </update>
+        <addDefaultValue 
+            columnDataType="NUMERIC(14,2)"
+            columnName="DISCOUNT"  
+            defaultValueNumeric="0"
+            tableName="OFFERITEM"/>
+        <addNotNullConstraint
+           columnDataType="NUMERIC(14,2)"
+           columnName="DISCOUNT"  
+           tableName="OFFERITEM"/>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/Person/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="insert_ServiceRole.xml"/>
+    <include relativeToChangelogFile="true" file="insert_ServiceDeparment.xml"/>
+</databaseChangeLog>
\ No newline at end of file

.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceDeparment.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="v.broens" id="bf635bf3-a1db-4c23-8a09-718b98847aa4">
+        <insert tableName="AB_KEYWORD_ENTRY">
+            <column name="AB_KEYWORD_ENTRYID" value="26c175af-c13d-4056-8ac3-b69a3dcb387c"/>
+            <column name="KEYID" value="CONTACTSERVICE"/>
+            <column name="TITLE" value="Service"/>
+            <column name="CONTAINER" value="ContactDepartment"/>
+            <column name="SORTING" valueNumeric="5"/>
+            <column name="ISACTIVE" valueNumeric="1"/>
+            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column  name="AB_KEYWORD_CATEGORY_ID"  value="cda5deac-5b7c-4c98-9904-2eb3b224235d"/>
+        </insert>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file