diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml index 1c85cb3902af93aedea0ecdcb568ade70245a5d0..f8307f5735c950188735a65f66ca1e5607e2c2f8 100644 --- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml +++ b/.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> diff --git a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml index 2144ba2aa05757e48e229d77a6615145bdfde80c..93e891be3d7887f00f3e9908d368c3be0b68f713 100644 --- a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml +++ b/.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> diff --git a/.liquibase/Data_alias/basic/2020.1.2/drop_salesorder_unpaid.xml b/.liquibase/Data_alias/basic/2020.1.3/drop_salesorder_unpaid.xml similarity index 100% rename from .liquibase/Data_alias/basic/2020.1.2/drop_salesorder_unpaid.xml rename to .liquibase/Data_alias/basic/2020.1.3/drop_salesorder_unpaid.xml diff --git a/.liquibase/Data_alias/basic/2020.1.2/drop_salesorder_versnr.xml b/.liquibase/Data_alias/basic/2020.1.3/drop_salesorder_versnr.xml similarity index 100% rename from .liquibase/Data_alias/basic/2020.1.2/drop_salesorder_versnr.xml rename to .liquibase/Data_alias/basic/2020.1.3/drop_salesorder_versnr.xml diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod index dab543deb07ef650b7e12fe02ddbcaffb527c076..4afa1212c435facdf91b5bb2fd49649ee520f789 100644 --- a/entity/Order_entity/Order_entity.aod +++ b/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> diff --git a/entity/Order_entity/entityfields/copy_param/documentation.adoc b/entity/Order_entity/entityfields/copy_param/documentation.adoc new file mode 100644 index 0000000000000000000000000000000000000000..5ec36081ee1fbd4fee417e0ac3cce5a2ba999624 --- /dev/null +++ b/entity/Order_entity/entityfields/copy_param/documentation.adoc @@ -0,0 +1,2 @@ +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 diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js index 73b3a8ff6fe3bafdea48abc90e605773b2236905..22b0f95f8fefc6596f8bfb5cd9f66146a09610d4 100644 --- a/process/Order_lib/process.js +++ b/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