diff --git a/.liquibase/Data_alias/basic/2021.2.2/Offer/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Offer/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..43d3f1056899fb14bc1b977c3a956d5a35346b4a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Offer/changelog.xml
@@ -0,0 +1,6 @@
+<?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
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Offer/update_OfferSetZeroProbability.xml b/.liquibase/Data_alias/basic/2021.2.2/Offer/update_OfferSetZeroProbability.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c473d075052c034844cc364b734fcb90884efae4
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Offer/update_OfferSetZeroProbability.xml
@@ -0,0 +1,19 @@
+<?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
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Offeritem/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Offeritem/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..17b59f34cb8941cf482c762276660a4c7099f156
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Offeritem/changelog.xml
@@ -0,0 +1,6 @@
+<?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
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Offeritem/update_OfferitemSetZeroDiscount.xml b/.liquibase/Data_alias/basic/2021.2.2/Offeritem/update_OfferitemSetZeroDiscount.xml
new file mode 100644
index 0000000000000000000000000000000000000000..206cf4f999182c0d71aa169971235c39d0d334ff
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Offeritem/update_OfferitemSetZeroDiscount.xml
@@ -0,0 +1,19 @@
+<?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
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Salesorderitem/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Salesorderitem/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e2399a10ecb43adf4f250ceaad663cc85e190084
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Salesorderitem/changelog.xml
@@ -0,0 +1,6 @@
+<?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_SalesorderitemSetZeroDiscount.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Salesorderitem/update_SalesorderitemSetZeroDiscount.xml b/.liquibase/Data_alias/basic/2021.2.2/Salesorderitem/update_SalesorderitemSetZeroDiscount.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f50ad6ccaddfc3e85b4d7f8439acc1d254daac25
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Salesorderitem/update_SalesorderitemSetZeroDiscount.xml
@@ -0,0 +1,19 @@
+<?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="f1176133-6149-4e3a-a19c-0199c2ea6c00">
+ <update tableName="SALESORDERITEM">
+ <column name="DISCOUNT" valueNumeric="0"/>
+ <where>DISCOUNT is null</where>
+ </update>
+ <addDefaultValue
+ columnDataType="NUMERIC(14,2)"
+ columnName="DISCOUNT"
+ defaultValueNumeric="0"
+ tableName="SALESORDERITEM"/>
+ <addNotNullConstraint
+ columnDataType="NUMERIC(14,2)"
+ columnName="DISCOUNT"
+ tableName="SALESORDERITEM"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Salesproject/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Salesproject/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..be255f7f32e9a0ec54ec66b2dc76f5b5eacccbe1
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Salesproject/changelog.xml
@@ -0,0 +1,6 @@
+<?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_SalesprojectSetZeroProbability.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Salesproject/update_SalesprojectSetZeroProbability.xml b/.liquibase/Data_alias/basic/2021.2.2/Salesproject/update_SalesprojectSetZeroProbability.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ab47beff7163fd059ca3d260ab064c1dbac32f5f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Salesproject/update_SalesprojectSetZeroProbability.xml
@@ -0,0 +1,19 @@
+<?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="c32865a9-ed82-44e5-814c-b8953d710e4d">
+ <update tableName="SALESPROJECT">
+ <column name="PROBABILITY" valueNumeric="0"/>
+ <where>PROBABILITY is null</where>
+ </update>
+ <addDefaultValue
+ columnDataType="DECIMAL(6, 2)"
+ columnName="PROBABILITY"
+ defaultValueNumeric="0"
+ tableName="SALESPROJECT"/>
+ <addNotNullConstraint
+ columnDataType="DECIMAL(6, 2)"
+ columnName="PROBABILITY"
+ tableName="SALESPROJECT"/>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
index 4b2a1007c30cdfbc172d305ecc3fa5f45b03b30c..9b38a15ca494138c36c731dcb63a82e8013d1ef7 100644
--- a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
@@ -1,11 +1,14 @@
<?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">
+ 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="Offer/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/insert_mosaico_color_keyword.xml"/>
<include relativeToChangelogFile="true" file="Mailbridge/changelog.xml"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml
index d129c2559996f8555a7a63db20ae4fa1bf3856cf..3df9e9fd415d60f98f1e8a2fca811a4966a6a6e2 100644
--- 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"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml
index 393b314d4ef6e0f1b0d7c79f591e645f587db6b9..70437cfb1f191cce14b47c762be2dda9fb20f610 100644
--- 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
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
index 743844503622c2e957f5627f4ca5d518abec683f..f0d59d1e5e460741cf7cf5a8c3cefa187501acc0 100644
--- 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
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
index 571a4489a807e1581709dcced953f52352c9a928..ae504db23f5b56a81d527ad993272f9d15562dd2 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
@@ -41,6 +41,7 @@
<column name="SALESPROJECTID" value="7683f92d-a949-4b76-ba6f-57344d730f40"/>
<column name="PROJECTTITLE" value="Meister Messebau/ Umsetzung"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
+ <column name="PROBABILITY" valueNumeric="0.00"/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASEOFFER"/>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 9b143fe1e1a0d957a48705e44b631f8a1f040590..2dbe5967ccd2153fecdda665416384b29e63eae1 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -77,6 +77,7 @@
<minValue v="0" />
<outputFormat>0'%'</outputFormat>
<groupable v="true" />
+ <mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="false" />
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/stateProcess.js</stateProcess>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 8791f8cf6abb0d5a2632c3b425aea6ba1c603faa..539426a9accdeccf35ae7df22f09485107038217 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -25,6 +25,7 @@
<outputFormat>0.00'%'</outputFormat>
<inputFormat>0.00</inputFormat>
<titleProcess>%aditoprj%/entity/Offeritem_entity/entityfields/discount/titleProcess.js</titleProcess>
+ <mandatory v="true" />
<onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/discount/onValidation.js</onValidation>
</entityField>
<entityField>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index da6218d0b5296177dbd061e7e3c4222128d21b0d..a22087028d3fb3ac617b40b7989e5cb94a5b6d3b 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -26,6 +26,7 @@
<inputFormat>0.00</inputFormat>
<titleProcess>%aditoprj%/entity/Orderitem_entity/entityfields/discount/titleProcess.js</titleProcess>
<onValidation>%aditoprj%/entity/Orderitem_entity/entityfields/discount/onValidation.js</onValidation>
+ <mandatory v="true" />
</entityField>
<entityField>
<name>GROUPCODEID</name>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index a4a0042cb90cf0ddb5708954771988e46a813a7c..ff7f6cbe34e6b06d62d6be56fc468277910e8119 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -136,6 +136,7 @@
<outputFormat>0'%'</outputFormat>
<inputFormat>0'%'</inputFormat>
<groupable v="true" />
+ <mandatory v="true" />
</entityField>
<entityConsumer>
<name>SalesprojectSources</name>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index a999bcaf06a29fcf35a982150f23055d946d65e2..96d637d84255a3b1fecfcbe9cfdb61e023552faf 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -2240,6 +2240,10 @@
<key>Discount</key>
<value>Rabatt</value>
</entry>
+ <entry>
+ <key>Discount in %</key>
+ <value>Rabatt in %</value>
+ </entry>
<entry>
<key>Sales</key>
<value>Vertrieb</value>