Index: APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder.cls.xml
===================================================================
diff -u -r37140 -r38954
--- APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 37140)
+++ APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 38954)
@@ -3,6 +3,22 @@
 <Class name="APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="ToeleveringAPI">
+<Type>DOM.AKP.ToeleveringAPI</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ToeleveringAPI:DOM.AKP.ToeleveringAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..ToeleveringAPI = $$$Inject(ToeleveringAPI,##class(DOM.DomeinContext).Instance().GeefToeleveringAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Converteer">
 <FormalSpec>ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
 <ReturnType>APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO</ReturnType>
@@ -99,12 +115,13 @@
 <FormalSpec>Toelevering:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering,ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim E1EDP01Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ORDERS05.IDOC.E1EDP01)
+	#Dim E1EDP01Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ORDERS05.IDOC.E1EDP01)
+	#Dim GeenLeverSchema as %Integer = 0
 	While E1EDP01Iterator.HasNext()
 	{
 		#Dim E1EDP01 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP01 = E1EDP01Iterator.Next()
-		
-		Do ..VoegToeDefaultE1EDP20(E1EDP01.E1EDP20, E1EDP01.ABGRU)
+		;TODO hier bijhouden of het een default lijn is of niet
+		Set GeenLeverSchema = ..VoegToeDefaultE1EDP20(E1EDP01.E1EDP20, E1EDP01.ABGRU)
 
 		#dim E1EDP20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP20)
 		While E1EDP20Iterator.HasNext()
@@ -126,24 +143,55 @@
 			Do ..VoegToeShipmentStatus(ToeleveringDetail, E1EDP01.ABGRU, E1EDP20.WMENG)
 			Do ..VoegToeOrderLineIdentificationCustomer(ToeleveringDetail,E1EDP01)
 			Do ..VoegToeOrderLineIdentNumberSupplierBAU(ToeleveringDetail,E1EDP01)
-			
+			;TODO
+			;Indien we hier een default lijn hebben, de verwachte lev datum van de toelevlijn gaan halen, en hier pas invullen zodat de status confirmed etc goed blijft in de KAL.
+			;Niet voor gecancelde lijn.
+			if GeenLeverSchema & (ToeleveringDetail.ReasonCode '= "C") { 
+				Set ToeleveringDetail.DeliveryDateAxBUA = ..GeefToeleveringLijnVerwachteDatum(Toelevering.ToeleveringHeader.CustomerOrderReference,$Piece(ToeleveringDetail.OrderLineIdentificationCustomer,".",2))
+			}
 			Do Toelevering.ToeleveringDetail.Insert(ToeleveringDetail)
 		}
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="GeefToeleveringLijnVerwachteDatum">
+<FormalSpec>ToeleveringNr:%String,ToeleveringLijnNummer:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#Dim VerwachtDatum as %String = ""
+	if ..ToeleveringAPI.BestaatToelevering(ToeleveringNr){		
+		#Dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringAPI.GeefToelevering(ToeleveringNr)	
+		#Dim ToeleveringLijnID As %Integer = ToeleveringLijnNummer * 100
+		#Dim count as %Integer
+		;het kan een gesplitste lijn zijn
+		for count=0:1:9 {
+			set ToeleveringLijnID = ToeleveringLijnNummer * 100 + count
+			quit:Toelevering.BestaatToeleveringLijn(ToeleveringLijnID)
+		}		
+		if Toelevering.BestaatToeleveringLijn(ToeleveringLijnID){
+			#Dim ToeleveringLijn As DOM.AKP.impl.DataM.DataMProductToeleveringLijn = Toelevering.GeefToeleveringLijn(ToeleveringLijnID)				
+			set VerwachtDatum = $$EXTDATE^vhLib.DataTypes(ToeleveringLijn.GeefLeverdag() ,"DSN2")
+		}
+	}
+	quit VerwachtDatum
+]]></Implementation>
+</Method>
+
 <Method name="VoegToeDefaultE1EDP20">
 <FormalSpec>E1EDP20List:%ListOfObjects,ABGRU:%String=""</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	#Dim DefaultToegevoegd as %Integer = 0
 	If (E1EDP20List.Count()=0)
 	{
 		#dim E1EDP20 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP20 = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP20).%New()
 		Set E1EDP20.EDATU = ""
 		Set E1EDP20.WMENG = ""
-		Do E1EDP20List.Insert(E1EDP20)
+		Do E1EDP20List.Insert(E1EDP20)		
+		set DefaultToegevoegd = 1
 	}
+	quit DefaultToegevoegd
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r37140 -r38954
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 37140)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 38954)
@@ -3,6 +3,70 @@
 <Class name="vhUnitTest.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder.Converteer.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="Test : Converteer BLUM aankooporderresponse ORDERS05 waaronder 1 prod zonder schedule naar COASO">
+<Implementation><![CDATA[
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
+	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
+	; verwijder E1EDP20 tags voor 1 artikel
+	
+	do ##class(vhUnitTest.DataHelper).VerwijderToelevering(277788)
+	set ^KTO(5005,277788,1)="\29.04.13\AB 817.873/STOCK\\\6332\\9365\\\\\\\\\\EUR\62969,61200\\\2\\\\"
+	set ^KTO(5005,277788,101)="\784192\240\\\1030.9\47.1550#0\\1307.47\1307.47\\L\8\4000\100\2474.16\KTRPL\\\\H\EUR\\\16/01\\\\\\\\\\\"
+	do ##class(vhUnitTest.DataHelper).MaakToeleveringCompleet(5005,277788)
+	
+	Do ORDERS05Double.IDOC.E1EDP01.GetAt(1).E1EDP20.RemoveAt(1)
+	
+	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = Converteerder.Converteer(ORDERS05Double)
+
+	Do $$$AssertIsObject(COASO)
+	Do $$$AssertEquals(COASO.COASOHeader.MIIDEF, "BAU745532") 
+	Do $$$AssertEquals(COASO.COASOHeader.LEVNUR, "5005")
+	Do $$$AssertEquals(COASO.COASOHeader.MIINTY, "COA")
+	Do $$$AssertEquals(COASO.COASOHeader.MIINTS, "SO")
+	Do $$$AssertEquals(COASO.COASOHeader.MINETC, "C")
+	Do $$$AssertEquals(COASO.COASOHeader.MIOTCR, "21-12-15")
+	Do $$$AssertEquals(COASO.COASOHeader.MITICR, "1200")
+	Do $$$AssertEquals(COASO.COASOHeader.MICOUN, "0")
+	Do $$$AssertEquals(COASO.COASOHeader.MINNCR, "")
+	Do $$$AssertEquals(COASO.COASOHeader.MINNRE, "")
+	Do $$$AssertEquals(COASO.COASOHeader.MIACRQ, "1")
+	Do $$$AssertEquals(COASO.COASOHeader.MESPRO, "")
+
+	Do $$$AssertEquals(COASO.ToeleveringList.Count(),1)
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringHeader.InternalOrderNumberBLUM,"745532")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringHeader.CustomerOrderEntryDate,"151221")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringHeader.CustomerNumberForShipment ,"212250")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringHeader.CustomerOrderReference,"277788")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringHeader.CustomerNumberForInvoice ,"212250")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringHeader.ReasonCode ,"G ")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringHeader.TransportationMode ,"L ")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringHeader.CurrencyInCOScode ,"W30")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringHeader.AverageTransportTime ,"000")
+	
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.Count(),3)
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).OrderQuantity,"500")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA,"160106")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).OrderLineNumberSupplierBAU,"")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).GrossPrice,"0000000.00")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).ReasonCode,"V")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).PriceDimension,"2")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).NetPrice,"")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).OrderLineIdentificationCustomer,"277788.01")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).IdentNumberSupplierBAU,"09002253")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).DelDateCode,"0")
+	
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(2).OrderQuantity,"5")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(2).DeliveryDateAxBUA,"160106")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(2).PriceDimension,"3")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(2).NetPrice,"0000082.36")
+	
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(3).OrderQuantity,"10")
+	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(3).DeliveryDateAxBUA,"160107")
+	
+	do ##class(vhUnitTest.DataHelper).VerwijderToelevering(277788)
+]]></Implementation>
+</Method>
+
 <Method name="Test : Converteer BLUM aankooporderresponse ORDERS05 naar COASO">
 <Implementation><![CDATA[
 	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
@@ -122,9 +186,7 @@
 	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).ABGRU ="10"
-	
 	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = Converteerder.Converteer(ORDERS05Double)
-	
 	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).ShipmentStatus,"0")
 ]]></Implementation>
 </Method>
@@ -208,12 +270,20 @@
 	Do ORDERS05Double.IDOC.E1EDP01.GetAt(1).E1EDP20.Clear()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).ABGRU ="10"
 	
+	do ##class(vhUnitTest.DataHelper).VerwijderToelevering(277788)
+	set ^KTO(5005,277788,1)="\29.04.13\AB 817.873/STOCK\\\6332\\9365\\\\\\\\\\EUR\62969,61200\\\2\\\\"
+	set ^KTO(5005,277788,101)="\784192\240\\\1030.9\47.1550#0\\1307.47\1307.47\\L\8\4000\100\2474.16\KTRPL\\\\H\EUR\\\16/01\\\\\\\\\\\"
+	do ##class(vhUnitTest.DataHelper).MaakToeleveringCompleet(5005,277788)
+
+
 	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = Converteerder.Converteer(ORDERS05Double)
 	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).OrderQuantity, ORDERS05Double.IDOC.E1EDP01.GetAt(1).MENGE )
 	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA, "")
 	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).DelDateCode,"0")
 	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).ReasonCode,"C")
 	Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).ShipmentStatus,"0")
+
+	do ##class(vhUnitTest.DataHelper).VerwijderToelevering(277788)
 ]]></Implementation>
 </Method>
 </Class>