Merge branch '1055225_FixOfferReportSorting' into '2020.1.0'

1055225 fix offer report sorting

See merge request xrm/basic!218

process/Offer_lib/process.js

+import("system.SQLTYPES");
 import("system.vars");
 import("system.util");
 import("system.datetime");
@@ -103,7 +104,7 @@ OfferUtils.createNewOffer = function(pContextId, pRowId, pRelationId, pActivityI
 OfferUtils.buildOfferReport = function (pOfferID)
 {
     var offerReport = new Report("Offer_report");  
-    
+
     var sqlUtil = new SqlMaskingUtils();
     
     var offerFields = [
@@ -159,11 +160,12 @@ OfferUtils.buildOfferReport = function (pOfferID)
         "0", 
         "''"
     ]; 
-    
+
     var itemData = newSelect(offerItemFields)
                             .from("OFFERITEM")
                             .leftJoin("PRODUCT", "PRODUCT.PRODUCTID = OFFERITEM.PRODUCT_ID")
                             .where("OFFERITEM.OFFER_ID", pOfferID)
+                            .orderBy("OFFERITEM.ITEMSORT asc")
                             .table();
             
     if (itemData.length == 0)

report/Offer_report/reportData.jrxml

@@ -2,7 +2,7 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
 	<property name="ireport.zoom" value="1.9487171000000014"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="233"/>
+	<property name="ireport.y" value="190"/>
 	<parameter name="myAddr" class="java.lang.String"/>
 	<parameter name="Pos" class="java.lang.String"/>
 	<parameter name="Articledescription" class="java.lang.String"/>
@@ -24,7 +24,7 @@
 	<parameter name="OfferDeliveryTerm" class="java.lang.String"/>
 	<parameter name="responsible" class="java.lang.String"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["C:\\Entwicklung\\stable2019\\project\\basic\\report\\Offer_report\\"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["C:\\Entwicklung\\0.0\\project\\basic2\\report\\Offer_report\\"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
 	<parameter name="SUMITEMSUM" class="java.lang.Double"/>
@@ -55,7 +55,6 @@
 	<field name="OFFER_VERSNR" class="java.lang.String"/>
 	<field name="OFFER_FOOTER" class="java.lang.String"/>
 	<sortField name="OFFER_OFFERID"/>
-	<sortField name="OFFERITEM_ITEMPOSITION"/>
 	<group name="OFFERID" isStartNewPage="true">
 		<groupExpression><![CDATA[$F{OFFER_OFFERID}]]></groupExpression>
 		<groupHeader>