Index: APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder.cls.xml
===================================================================
diff -u -r38954 -r38960
--- APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 38954)
+++ APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 38960)
@@ -23,9 +23,9 @@
 <FormalSpec>ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
 <ReturnType>APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO</ReturnType>
 <Implementation><![CDATA[
-	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).%New()
+	#Dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).%New()
 
-	#dim Toelevering As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering).%New()
+	#Dim Toelevering As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering).%New()
 
 	Do ..VoegToeHeader(COASO, ORDERS05)
 	Do ..VoegToeToeleveringHeader(Toelevering, ORDERS05)
@@ -74,10 +74,10 @@
 <FormalSpec>COASO:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO,ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim E1EDK03Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ORDERS05.IDOC.E1EDK03)
+	#Dim E1EDK03Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ORDERS05.IDOC.E1EDK03)
 	While E1EDK03Iterator.HasNext()
 	{
-		#dim E1EDK03 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDK03 = E1EDK03Iterator.Next()
+		#Dim E1EDK03 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDK03 = E1EDK03Iterator.Next()
 		Set:(E1EDK03.IDDAT="11") COASO.COASOHeader.MIOTCR = $EXTRACT(E1EDK03.DATUM,7,8) _"-" _$EXTRACT(E1EDK03.DATUM,5,6) _"-" _$EXTRACT(E1EDK03.DATUM,3,4)
 	}
 ]]></Implementation>
@@ -87,10 +87,10 @@
 <FormalSpec>Toelevering:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering,ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim E1EDK03Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ORDERS05.IDOC.E1EDK03)
+	#Dim E1EDK03Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ORDERS05.IDOC.E1EDK03)
 	While E1EDK03Iterator.HasNext()
 	{
-		#dim E1EDK03 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDK03 = E1EDK03Iterator.Next()
+		#Dim E1EDK03 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDK03 = E1EDK03Iterator.Next()
 		Set:(E1EDK03.IDDAT="11") Toelevering.ToeleveringHeader.CustomerOrderEntryDate = $EXTRACT(E1EDK03.DATUM,3,*)
 	}
 ]]></Implementation>
@@ -100,10 +100,10 @@
 <FormalSpec>Toelevering:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering,ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim E1EDKA1Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ORDERS05.IDOC.E1EDKA1)
+	#Dim E1EDKA1Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ORDERS05.IDOC.E1EDKA1)
 	While E1EDKA1Iterator.HasNext()
 	{
-		#dim E1EDKA1 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDKA1 = E1EDKA1Iterator.Next()
+		#Dim E1EDKA1 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDKA1 = E1EDKA1Iterator.Next()
 		Set:(E1EDKA1.PARVW="WE") Toelevering.ToeleveringHeader.CustomerNumberForShipment = E1EDKA1.PARTN
 		Set:(E1EDKA1.PARVW="AG") Toelevering.ToeleveringHeader.CustomerNumberForInvoice = E1EDKA1.PARTN
 		
@@ -120,13 +120,12 @@
 	While E1EDP01Iterator.HasNext()
 	{
 		#Dim E1EDP01 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP01 = E1EDP01Iterator.Next()
-		;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)
+		#Dim E1EDP20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP20)
 		While E1EDP20Iterator.HasNext()
 		{
-			#dim E1EDP20 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP20 = E1EDP20Iterator.Next()
+			#Dim E1EDP20 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP20 = E1EDP20Iterator.Next()
 			#Dim ToeleveringDetail As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail).%New()
 			if E1EDP20.WMENG = "" { ;geen geplande hoeveelheid, dan de hoeveelheid van de lijn maar zonder datum
 				Set ToeleveringDetail.OrderQuantity = E1EDP01.MENGE
@@ -143,10 +142,9 @@
 			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") { 
+			If GeenLeverSchema & (ToeleveringDetail.ReasonCode '= "C") { 
 				Set ToeleveringDetail.DeliveryDateAxBUA = ..GeefToeleveringLijnVerwachteDatum(Toelevering.ToeleveringHeader.CustomerOrderReference,$Piece(ToeleveringDetail.OrderLineIdentificationCustomer,".",2))
 			}
 			Do Toelevering.ToeleveringDetail.Insert(ToeleveringDetail)
@@ -160,21 +158,21 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#Dim VerwachtDatum as %String = ""
-	if ..ToeleveringAPI.BestaatToelevering(ToeleveringNr){		
+	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)
+		For count=0:1:9 {
+			Set ToeleveringLijnID = ToeleveringLijnNummer * 100 + count
+			Quit:Toelevering.BestaatToeleveringLijn(ToeleveringLijnID)
 		}		
-		if 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")
+			Set VerwachtDatum = $$EXTDATE^vhLib.DataTypes(ToeleveringLijn.GeefLeverdag() ,"DSN2")
 		}
 	}
-	quit VerwachtDatum
+	Quit VerwachtDatum
 ]]></Implementation>
 </Method>
 
@@ -185,7 +183,7 @@
 	#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()
+		#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)		
@@ -199,10 +197,10 @@
 <FormalSpec>ToeleveringDetail:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail,E1EDP01:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP01</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim E1EDP02Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP02)
+	#Dim E1EDP02Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP02)
 	While E1EDP02Iterator.HasNext()
 	{
-		#dim E1EDP02 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP02 = E1EDP02Iterator.Next()
+		#Dim E1EDP02 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP02 = E1EDP02Iterator.Next()
 		Set:(E1EDP02.QUALF="ZON") ToeleveringDetail.OrderLineIdentificationCustomer = E1EDP02.BELNR  ;_"." _E1EDP02.ZEILE _"  "
 	}
 ]]></Implementation>
@@ -212,10 +210,10 @@
 <FormalSpec>ToeleveringDetail:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail,E1EDP01:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP01</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim E1EDP19Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP19)
+	#Dim E1EDP19Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP19)
 	While E1EDP19Iterator.HasNext()
 	{
-		#dim E1EDP19 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP19 = E1EDP19Iterator.Next()
+		#Dim E1EDP19 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP19 = E1EDP19Iterator.Next()
 		Set:(E1EDP19.QUALF="002") ToeleveringDetail.IdentNumberSupplierBAU = E1EDP19.IDTNR
 	}
 ]]></Implementation>
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r38954 -r38960
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 38954)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 38960)
@@ -5,18 +5,18 @@
 
 <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()
+	#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 ##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)
+	#Dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = Converteerder.Converteer(ORDERS05Double)
 
 	Do $$$AssertIsObject(COASO)
 	Do $$$AssertEquals(COASO.COASOHeader.MIIDEF, "BAU745532") 
@@ -63,7 +63,7 @@
 	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)
+	Do ##class(vhUnitTest.DataHelper).VerwijderToelevering(277788)
 ]]></Implementation>
 </Method>
 
@@ -265,25 +265,25 @@
 
 <Method name="Test : BLUM order niet aanvaard geeft een lijn zonder aantallen en status No shipment en Position cancelled">
 <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()
+	#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()
 	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)
+	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)
+	#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)
+	Do ##class(vhUnitTest.DataHelper).VerwijderToelevering(277788)
 ]]></Implementation>
 </Method>
 </Class>