Order resolve Merge Conflicts and small Changes

.liquibase/Data_alias/basic/2020.1.2/changelog.xml

@@ -5,6 +5,4 @@
     <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />    
     <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
     <include file="Notification/changelog.xml" relativeToChangelogFile="true" />
-    <include relativeToChangelogFile="true" file="drop_salesorder_unpaid.xml"/>
-    <include relativeToChangelogFile="true" file="drop_salesorder_versnr.xml"/>
 </databaseChangeLog>

.liquibase/Data_alias/basic/2020.1.3/changelog.xml

@@ -5,4 +5,6 @@
     <include file="DeleteNotificationtypeKeywords.xml" relativeToChangelogFile="true" />
     <include file="add_Address_LatLon.xml" relativeToChangelogFile="true"/>
     <include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />
+    <include file="drop_salesorder_unpaid.xml" relativeToChangelogFile="true"/>
+    <include file="drop_salesorder_versnr.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

entity/Order_entity/Order_entity.aod

@@ -872,6 +872,7 @@
     <entityParameter>
       <name>Copy_param</name>
       <expose v="true" />
+      <documentation>%aditoprj%/entity/Order_entity/entityfields/copy_param/documentation.adoc</documentation>
     </entityParameter>
     <entityField>
       <name>COUNT</name>
@@ -1140,4 +1141,4 @@
       </indexFieldMappings>
     </indexRecordContainer>
   </recordContainers>
-</entity>
\ No newline at end of file
+</entity>

entity/Order_entity/entityfields/copy_param/documentation.adoc

+This Param is filled after the action "new Order" is activated. It fills close to all fields with values from the order before. 
+Therefor it uses a stringified JSON-Object, look up "OrderUtils.copyOrder()" for more details
\ No newline at end of file

process/Order_lib/process.js

@@ -480,8 +480,8 @@ OrderUtils.buildReminderReport = function (pOrderID)
     var sums = [];
     var vatsum = 0;
     var printDiscount = false;
-    var brutto=eMath.addDec(orderData[16], orderData[9]);
-    var offen=eMath.subDec(brutto, orderData[15]);
+    var grossPrice=eMath.addDec(orderData[16], orderData[9]);
+    var open=eMath.subDec(grossPrice, orderData[15]);
     itemData = itemData.map(function (item)
     {
         //quantity * price
@@ -512,8 +512,8 @@ OrderUtils.buildReminderReport = function (pOrderID)
             text.formatDouble(orderData[9], "#,##0.00", true), //vat
             orderData[10], //ordercode
             orderData[16],       //net      
-            text.formatDouble(brutto, "#,##0.00", true),//brutto
-            text.formatDouble(offen, "#,##0.00", true),//offen
+            text.formatDouble(grossPrice, "#,##0.00", true),//grossPrice
+            text.formatDouble(open, "#,##0.00", true),//open
             orderData[17], //due date
             orderData[19], //dunning text
             orderData[18]  //dunninglevel