Index: AXimpl/Dynamics/DocumentLocationOut/DocumentLocationService.cls.xml
===================================================================
diff -u -r61751 -r73176
--- AXimpl/Dynamics/DocumentLocationOut/DocumentLocationService.cls.xml	(.../DocumentLocationService.cls.xml)	(revision 61751)
+++ AXimpl/Dynamics/DocumentLocationOut/DocumentLocationService.cls.xml	(.../DocumentLocationService.cls.xml)	(revision 73176)
@@ -70,7 +70,8 @@
 		Set FilenamePDF = ..getFilenamePDF(Request).FilenamePDF
 	} Catch {
 		 #dim Exception As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
-		 Do ##class(TECH.ExceptionHandler).Throw(Exception)
+		 Do ..Logger.Debug("GeefBestandslocatieError","WS AXimpl DocumentLocationService : Return FilenamePDF mislukt")
+		 //Do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
 	
 	Do ..Logger.Debug("GeefBestandslocatie","WS AXimpl DocumentLocationService : Return FilenamePDF : '"_FilenamePDF_"'.")
Index: AXimpl/Controle/OrdDiff/AX/AxOrderLijnIterator.cls.xml
===================================================================
diff -u -r69259 -r73176
--- AXimpl/Controle/OrdDiff/AX/AxOrderLijnIterator.cls.xml	(.../AxOrderLijnIterator.cls.xml)	(revision 69259)
+++ AXimpl/Controle/OrdDiff/AX/AxOrderLijnIterator.cls.xml	(.../AxOrderLijnIterator.cls.xml)	(revision 73176)
@@ -41,7 +41,7 @@
 	Set SqlStatement = "Select salesLine.SALESID,salesLine.CUSTACCOUNT,salesline.INVENTTRANSID,salesline.ITEMID,salesline.CONFIRMEDDLV,salesline.RECEIPTDATECONFIRMED,salesline.QTYORDERED"
 	_"  ,isnull(( select -sum(qty) from inventtrans where INVENTTRANSORIGIN.RECID = inventtrans.INVENTTRANSORIGIN and INVENTTRANS.STATUSISSUE = 3 and "
 	_"            inventtrans.STATUSRECEIPT = 0 and inventtrans.DATAAREAID = INVENTTRANSORIGIN.DATAAREAID and inventtrans.PARTITION = INVENTTRANSORIGIN.PARTITION),0) as GEPICKTEHOEVEELHEID"
-	_"  ,salesline.REMAINSALESPHYSICAL as OPENSTAANDEHOEVEELHEID, QtyOpBon,ADMINPRODUCTNUMMER "
+	_"  ,salesline.REMAINSALESPHYSICAL as OPENSTAANDEHOEVEELHEID, QtyOpBon,ADMINPRODUCTNUMMER,transnl.NAME as KORTTEKST  "
 	_"  ,INVENTTRANSORIGIN.ADUSOPRCONTRACTID "
 	_"  ,InventDim.CONFIGID "
 	_"  ,isnull(LogisticsPostalAddress.CountryRegionId,'') as COUNTRYREGIONID "
@@ -54,7 +54,17 @@
 	_" join SALESTABLE on SALESTABLE.SALESID = salesline.SALESID and SALESTABLE.DATAAREAID = salesline.DATAAREAID and salestable.PARTITION = salesline.PARTITION "
 	_" left outer join ADUEcoResAttributeCombination as Kenmerk on InventDim.ConfigId=Kenmerk.ConfigId "
     _"   and SalesLine.ITEMID=Kenmerk.ITEMID "
-    _"   and InventDim.ConfigId<>'' "
+    _"   and InventDim.ConfigId<>'' "   
+    _" join INVENTDIM dim "
+    _"	on dim.DATAAREAID = SALESLINE.DATAAREAID and dim.INVENTDIMID = SALESLINE.INVENTDIMID and dim.Partition=SALESLINE.PARTITION"
+	_" left outer join INVENTDIM dimbase "
+    _"	on dimbase.DATAAREAID = dim.DATAAREAID and dimbase.Partition=dim.PARTITION and dim.ConfigID =dimbase.configid and dimbase.WMSLOCATIONID='' and dimbase.inventlocationid ='' and dimbase.inventsiteid='' and dimbase.inventbatchid='' and dimbase.inventsizeid='' and dimbase.recversion=dim.recversion"
+	_" left outer join INVENTDIMCOMBINATION as Idc "
+    _"	on  Idc.DATAAREAID= SALESLINE.DATAAREAID and Idc.ITEMID=SALESLINE.ITEMID and Idc.INVENTDIMID=DimBase.INVENTDIMID and idc.PARTITION = SALESLINE.PARTITION"
+  	_" left outer join ECORESPRODUCT ResProduct "
+   	_"	on idc.DISTINCTPRODUCTVARIANT= ResProduct.RecID and ResProduct.PARTITION = SALESLINE.PARTITION "
+    _" left outer join ECORESPRODUCTTRANSLATION transNL "
+	_"  on transNL.PRODUCT = Resproduct.RECID and transNL.LANGUAGEID='nl-be' and inventdim.partition=transNL.PARTITION "
 	_" left outer join LOGISTICSPOSTALADDRESS on LOGISTICSPOSTALADDRESS.RECID = salesline.DELIVERYPOSTALADDRESS and LOGISTICSPOSTALADDRESS.PARTITION = salesline.PARTITION "
 	_" join INVENTTRANSORIGIN on INVENTTRANSORIGIN.INVENTTRANSID = salesline.INVENTTRANSID and INVENTTRANSORIGIN.DATAAREAID = salesline.DATAAREAID and "
 	_"   INVENTTRANSORIGIN.PARTITION = salesline.PARTITION "
Index: AXimpl/Controle/OrdDiff/Admin/DataBouwer.cls.xml
===================================================================
diff -u -r72049 -r73176
--- AXimpl/Controle/OrdDiff/Admin/DataBouwer.cls.xml	(.../DataBouwer.cls.xml)	(revision 72049)
+++ AXimpl/Controle/OrdDiff/Admin/DataBouwer.cls.xml	(.../DataBouwer.cls.xml)	(revision 73176)
@@ -76,8 +76,8 @@
 			Set AdminData = ##class(AXimpl.Controle.OrdDiff.Admin.OrderData).%New()
 			Set AdminData.OrderLijnId = OrderLijnId
 			Set AdminData.ProductNr = ProductNr
-			Set AXPRNr=..SoprConvertor.GeefVervangProductDoorSOPRInAX(ProductNr)
-			Set:AXPRNr'="" ProductNr=AXPRNr
+			;Set AXPRNr=..SoprConvertor.GeefVervangProductDoorSOPRInAX(ProductNr)
+			;Set:AXPRNr'="" ProductNr=AXPRNr
 
 			Do AdminData.ProductSetObjectId(ProductNr)
 
Index: AXimpl/Controle/OrdDiff/VergelijkLijn.cls.xml
===================================================================
diff -u -r69259 -r73176
--- AXimpl/Controle/OrdDiff/VergelijkLijn.cls.xml	(.../VergelijkLijn.cls.xml)	(revision 69259)
+++ AXimpl/Controle/OrdDiff/VergelijkLijn.cls.xml	(.../VergelijkLijn.cls.xml)	(revision 73176)
@@ -98,7 +98,7 @@
 </Method>
 
 <Method name="ControleerProduct">
-<Implementation><![CDATA[	Set ..Diff.Product=(..OrderLijn.AX.ProductNr'=..OrderLijn.Admin.ProductNr)&&($TR(..OrderLijn.AX.ItemId," ")'=$TR(..OrderLijn.Admin.ItemId," "))
+<Implementation><![CDATA[	Set ..Diff.Product=((..OrderLijn.AX.ProductNr'=..OrderLijn.Admin.ProductNr)&&($TR(..OrderLijn.AX.ItemId," ")'=$TR(..OrderLijn.Admin.ItemId," ")))||($TR(..OrderLijn.AX.KortTekst," ")'=$TR(..OrderLijn.Admin.Product.KortTekst," "))
 ]]></Implementation>
 </Method>
 
Index: AXimpl/Controle/OrdDiff/AX/DataBouwer.cls.xml
===================================================================
diff -u -r72049 -r73176
--- AXimpl/Controle/OrdDiff/AX/DataBouwer.cls.xml	(.../DataBouwer.cls.xml)	(revision 72049)
+++ AXimpl/Controle/OrdDiff/AX/DataBouwer.cls.xml	(.../DataBouwer.cls.xml)	(revision 73176)
@@ -48,6 +48,7 @@
 
 		#dim ItemId As %String =rs.Data("ITEMID")
 		#dim ProductNr As %String = $$$Strip0(rs.Data("ADMINPRODUCTNUMMER"))
+		#dim KortTekst As %String = $$$Strip0(rs.Data("KORTTEKST"))
 		If ProductNr=""
 		{
 			Set ProductNr=..Translator.GeefPRNrForAdmin(ItemId)
@@ -61,6 +62,8 @@
 		;Set:(ProductNr="")||('$D(^KPR(ProductNr))) ProductNr=1793108 ;SERV.TRANSPORT - Product is nodig anders wordt de AX lijn genegeerd
 		Set AXData.ProductNr = ProductNr
 		Do AXData.ProductSetObjectId(ProductNr)
+		Set AXData.KortTekst = KortTekst ; wordt alleen ingevuld indien maatwerk
+		Set:KortTekst="" AXData.KortTekst=AXData.Product.KortTekst
 		
 		Set AXData.AantalBesteld = AantalBesteld
 		Set AXData.AantalGeleverd = AantalGepickt
Index: AXimpl/Controle/OrdDiff/AX/OrderData.cls.xml
===================================================================
diff -u -r69259 -r73176
--- AXimpl/Controle/OrdDiff/AX/OrderData.cls.xml	(.../OrderData.cls.xml)	(revision 69259)
+++ AXimpl/Controle/OrdDiff/AX/OrderData.cls.xml	(.../OrderData.cls.xml)	(revision 73176)
@@ -52,6 +52,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="KortTekst">
+<Type>%String</Type>
+</Property>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <State>OrderDataState</State>
@@ -108,6 +112,9 @@
 <Value name="17">
 <Value>ValidatieBlokkering</Value>
 </Value>
+<Value name="18">
+<Value>KortTekst</Value>
+</Value>
 </Data>
 </Storage>
 </Class>