Index: APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder.cls.xml
===================================================================
diff -u -r35597 -r35612
--- APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35597)
+++ APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35612)
@@ -104,7 +104,7 @@
 	{
 		#Dim E1EDP01 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP01 = E1EDP01Iterator.Next()
 		
-		Do ..VoegToeDefaultE1EDP20IndienABGRU10(E1EDP01.E1EDP20, E1EDP01.ABGRU)
+		Do ..VoegToeDefaultE1EDP20(E1EDP01.E1EDP20, E1EDP01.ABGRU)
 
 		#dim E1EDP20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP20)
 		While E1EDP20Iterator.HasNext()
@@ -118,9 +118,9 @@
 			Set ToeleveringDetail.PriceDimension = ..BepaalPriceDimension(E1EDP01.E1EDP05)
 			Set ToeleveringDetail.NetPrice = E1EDP01.E1EDP05.PREIS
 			Set ToeleveringDetail.GrossPrice = "0000000.00"
-			Do ..VoegToeDelDateCode(ToeleveringDetail, E1EDP01.ABGRU)
+			Do ..VoegToeDelDateCode(ToeleveringDetail, E1EDP20.WMENG)
 			Do ..VoegToeReasonCode(ToeleveringDetail, E1EDP01.ABGRU)
-			Do ..VoegToeShipmentStatus(ToeleveringDetail, E1EDP01.ABGRU)
+			Do ..VoegToeShipmentStatus(ToeleveringDetail, E1EDP01.ABGRU, E1EDP20.WMENG)
 			Do ..VoegToeOrderLineIdentificationCustomer(ToeleveringDetail,E1EDP01)
 			Do ..VoegToeOrderLineIdentNumberSupplierBAU(ToeleveringDetail,E1EDP01)
 			
@@ -130,11 +130,11 @@
 ]]></Implementation>
 </Method>
 
-<Method name="VoegToeDefaultE1EDP20IndienABGRU10">
-<FormalSpec>E1EDP20List:%ListOfObjects,ABGRU:%String</FormalSpec>
+<Method name="VoegToeDefaultE1EDP20">
+<FormalSpec>E1EDP20List:%ListOfObjects,ABGRU:%String=""</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	If (E1EDP20List.Count()=0) && '..IsOrderAanvaard(ABGRU)
+	If (E1EDP20List.Count()=0)
 	{
 		#dim E1EDP20 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP20 = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP20).%New()
 		Set E1EDP20.EDATU = ""
@@ -183,19 +183,23 @@
 </Method>
 
 <Method name="VoegToeDelDateCode">
-<FormalSpec>ToeleveringDetail:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail,ABGRU:%String</FormalSpec>
+<FormalSpec>ToeleveringDetail:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail,WMENG:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	// Kan nog afhankelijk worden van ABGRU. (te bevestigen door BLUM)
-	Set ToeleveringDetail.DelDateCode = "2" // Confirmed
+	if ..IsGeldigAantal(WMENG)
+	{
+		Set ToeleveringDetail.DelDateCode = "2" // Confirmed
+	} else {
+		Set ToeleveringDetail.DelDateCode = "1" // Not Confirmed
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="VoegToeReasonCode">
 <FormalSpec>ToeleveringDetail:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail,ABGRU:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	If ..IsOrderAanvaard(ABGRU)
+	If ..IsOrderLijnAanvaard(ABGRU)
 	{
 		Set ToeleveringDetail.ReasonCode = "V" // General amendement
 	}
@@ -207,10 +211,10 @@
 </Method>
 
 <Method name="VoegToeShipmentStatus">
-<FormalSpec>ToeleveringDetail:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail,ABGRU:%String</FormalSpec>
+<FormalSpec>ToeleveringDetail:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail,ABGRU:%String,WMENG:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	If ..IsOrderAanvaard(ABGRU)
+	If ..IsOrderLijnAanvaard(ABGRU) && ..IsGeldigAantal(WMENG)
 	{
 		Set ToeleveringDetail.ShipmentStatus = "3" // planned for shipment
 	}
@@ -221,13 +225,21 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsOrderAanvaard">
+<Method name="IsOrderLijnAanvaard">
 <FormalSpec>ABGRU:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit (ABGRU="") || (ABGRU="90")
 ]]></Implementation>
 </Method>
+
+<Method name="IsGeldigAantal">
+<FormalSpec>WMENG:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (WMENG>0)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r35454 -r35612
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35454)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35612)
@@ -211,7 +211,7 @@
 	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = Converteerder.Converteer(ORDERS05Double)
 	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).OrderQuantity, "")
 	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA, "")
-	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).DelDateCode,"2")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).DelDateCode,"1")
 	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).ReasonCode,"C")
 	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).ShipmentStatus,"0")
 ]]></Implementation>