Index: vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r35027 -r35153
--- vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35027)
+++ vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35153)
@@ -6,12 +6,21 @@
 <Method name="Test : Converteer BLUM aankooporder COMSO naar ORDERS05">
 <Implementation><![CDATA[
 	#dim Converteerder As APPS.EDIExport.AankoopOrder.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.Converteerder).%New()
-	#dim ORDERS05Result As APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05 = Converteerder.Converteer()
+	#dim COMSODouble As vhTest.Utils.APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO).%New()
+	#dim ORDERS05List As %ListOfObjects = Converteerder.Converteer(COMSODouble.GeefCOMSO())
 	
 	///#dim TestORDERS05 As APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05).GeefORDERS05()
 	///Do $$$AssertEquals(ORDERS05Result, TestORDERS05)
 	
-	Do $$$AssertIsObject(ORDERS05Result)
+	Do $$$AssertIsObject(ORDERS05List)
+	
+	Do $$$AssertEquals(ORDERS05List.Count(),1)
+	
+	#dim ORDERS05Result As APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05 = ORDERS05List.GetAt(1)
+	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.IDOCTYP,"ORDERS05")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK01.CURCY,"EUR")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK03.DATUM,"20160609")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.Count(), 3)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender.cls.xml
===================================================================
diff -u -r35118 -r35153
--- APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender.cls.xml	(.../Verzender.cls.xml)	(revision 35118)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender.cls.xml	(.../Verzender.cls.xml)	(revision 35153)
@@ -25,7 +25,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..FileAPI = $$$Implementation(FileAPI,##class(TECH.Context).Instance().GeefFileAPI())
+	set ..FileAPI = $$$Inject(FileAPI,##class(TECH.Context).Instance().GeefFileAPI())
 	set ..Converteerder = $$$Inject(Converteerder, ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.Converteerder).%New())
 	Set ..FileUtils = $$$Inject(FileUtils,##class(TECH.File.impl.FileUtils).%New())
 	
Index: vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml
===================================================================
diff -u
--- vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml	(revision 0)
+++ vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml	(revision 35153)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="GeefCOMSO">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO</ReturnType>
+<Implementation><![CDATA[
+	#dim COMSO As APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO).%New()
+	
+	#dim Toelevering As APPS.EDIExport.AankoopOrder.BLUM.dto.Toelevering = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.Toelevering).%New()
+	Set Toelevering.ToeleveringHeader = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringHeader).%New()
+	Set Toelevering.ToeleveringHeader.CustomerOrderEntryDate = "160609"
+	
+	Do COMSO.ToeleveringList.Insert(Toelevering) 
+	
+	Quit COMSO
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml
===================================================================
diff -u -r35118 -r35153
--- APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35118)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35153)
@@ -1,19 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EDIExport.AankoopOrder.impl.BLUM.Converteerder">
-<Super>TECH.RegisteredObject,TECH.Mockable</Super>
+<Super>TECH.RegisteredObject</Super>
 
+<Property name="COMSO">
+<Type>APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="Converteer">
-<FormalSpec>COMSO:APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO</FormalSpec>
+<FormalSpec>COMSO:APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO=""</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
+	Set ..COMSO = COMSO
+	
 	#dim List As %ListOfObjects = ##class(%ListOfObjects).%New()
 	
-	Do List.Insert(##class(APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05).%New())
+	#Dim ToeleveringList As TECH.ListIterator = ##class(TECH.ListIterator).%New(..COMSO.ToeleveringList)
 	
+	while ToeleveringList.HasNext()
+	{
+		#Dim Toelevering As APPS.EDIExport.AankoopOrder.BLUM.dto.Toelevering = ToeleveringList.Next()
+		
+		#dim ORDERS05 As APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05).%New()
+		
+		Do ..GeefEDIDC40(.ORDERS05)
+		Do ..GeefE1EDK01(.ORDERS05)
+		Do ..GeefE1EDK03(.ORDERS05, Toelevering)
+		Do ..GeefE1EDKA1(.ORDERS05, Toelevering)
+		
+		Do List.Insert(ORDERS05)
+	}
 	Quit List
 ]]></Implementation>
 </Method>
+
+<Method name="GeefEDIDC40">
+<FormalSpec><![CDATA[&ORDERS05:APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	 Set ORDERS05.IDOC.EDIDC40.IDOCTYP = "ORDERS05"
+]]></Implementation>
+</Method>
+
+<Method name="GeefE1EDK01">
+<FormalSpec><![CDATA[&ORDERS05:APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Set ORDERS05.IDOC.E1EDK01.CURCY = "EUR"
+]]></Implementation>
+</Method>
+
+<Method name="GeefE1EDK03">
+<FormalSpec><![CDATA[&ORDERS05:APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05,Toelevering:APPS.EDIExport.AankoopOrder.BLUM.dto.Toelevering]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Set ORDERS05.IDOC.E1EDK03.DATUM = "20" _Toelevering.ToeleveringHeader.CustomerOrderEntryDate
+]]></Implementation>
+</Method>
+
+<Method name="GeefE1EDKA1">
+<FormalSpec><![CDATA[&ORDERS05:APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05,Toelevering:APPS.EDIExport.AankoopOrder.BLUM.dto.Toelevering]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim E1EDKA1 As APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDKA1 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDKA1).%New()
+	Do ORDERS05.IDOC.E1EDKA1.Insert(E1EDKA1)
+
+	Set E1EDKA1 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDKA1).%New()
+	Do ORDERS05.IDOC.E1EDKA1.Insert(E1EDKA1)
+
+	Set E1EDKA1 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDKA1).%New()
+	Do ORDERS05.IDOC.E1EDKA1.Insert(E1EDKA1)
+]]></Implementation>
+</Method>
 </Class>