Merge commit '8b813edc'

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

aliasDefinition/Data_alias/Data_alias.aod

@@ -3569,20 +3569,6 @@
                   </customBooleanProperty>
                 </customProperties>
               </entityFieldDb>
-              <entityFieldDb>
-                <name>SHOWPRICE</name>
-                <dbName></dbName>
-                <primaryKey v="false" />
-                <columnType v="-7" />
-                <size v="3" />
-                <scale v="0" />
-                <notNull v="false" />
-                <isUnique v="false" />
-                <index v="false" />
-                <documentation></documentation>
-                <title></title>
-                <description></description>
-              </entityFieldDb>
               <entityFieldDb>
                 <name>SHOWPRICE</name>
                 <dbName></dbName>

entity/Offer_entity/Offer_entity.aod

@@ -1508,10 +1508,6 @@
           <name>netForeignCurrency.value</name>
           <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/netforeigncurrency.value/expression.js</expression>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TotalGross.value</name>
-          <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js</expression>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>TotalGrossForeignCurrency.value</name>
           <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgrossforeigncurrency.value/expression.js</expression>

entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js

-import("system.result");
-import("Sql_lib");
-
-var netValue = SqlBuilder.caseWhen(newWhere("OFFER.DISCOUNT", "0", SqlBuilder.GREATER())).then("OFFER.DISCOUNTED_NET").elseValue("OFFER.NET").toString();
-var vatValue = SqlBuilder.caseWhen(newWhere("OFFER.DISCOUNT", "0", SqlBuilder.GREATER())).then("OFFER.DISCOUNTED_VAT").elseValue("OFFER.VAT").toString();
-
-result.string(netValue + " + " + vatValue);//SqlBuilder?
\ No newline at end of file

entity/Order_entity/Order_entity.aod

@@ -1077,24 +1077,6 @@
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
       <stateProcess>%aditoprj%/entity/Order_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
-    <entityConsumer>
-          <name>Products</name>
-          <dependency>
-            <name>dependency</name>
-            <entityName>Product_entity</entityName>
-            <fieldName>Products</fieldName>
-          </dependency>
-          <children>
-            <entityParameter>
-              <name>OrderOfferInformations_param</name>
-              <valueProcess>%aditoprj%/entity/Order_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js</valueProcess>
-            </entityParameter>
-            <entityParameter>
-             <name>ShownInOrderMainView_param</name>
-           <valueProcess>%aditoprj%/entity/Order_entity/entityfields/products/children/showninordermainview_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
     <entityField>
       <name>paidForeignCurrency</name>
       <outputFormat>#,##0.00</outputFormat>