Index: APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml
===================================================================
diff -u -r35153 -r35160
--- APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35153)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35160)
@@ -23,53 +23,144 @@
 		#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()
+	
+		Set ORDERS05.IDOC.BEGIN = "1"
+	
+		Do ..VoegToeEDIDC40(.ORDERS05)
+		Do ..VoegToeE1EDK01(.ORDERS05)
+		Do ..VoegToeE1EDK03(.ORDERS05, Toelevering)
+		Do ..VoegToeE1EDK02(.ORDERS05, Toelevering)
+		Do ..VoegToeE1EDK17(.ORDERS05, Toelevering)
+		Do ..VoegToeE1EDK18(.ORDERS05, Toelevering)
+		Do ..VoegToeE1EDKT1(.ORDERS05, Toelevering)
+		Do ..VoegToeE1EDKA1(.ORDERS05, Toelevering)
 		
-		Do ..GeefEDIDC40(.ORDERS05)
-		Do ..GeefE1EDK01(.ORDERS05)
-		Do ..GeefE1EDK03(.ORDERS05, Toelevering)
-		Do ..GeefE1EDKA1(.ORDERS05, Toelevering)
+		#Dim ToeleveringDetailIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(Toelevering.ToeleveringDetail)
+		While ToeleveringDetailIterator.HasNext()
+		{
+			#Dim ToeleveringDetail As APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail = ToeleveringDetailIterator.Next()
+			Do ..VoegToeE1EDP01(.ORDERS05, ToeleveringDetail)
+		}
 		
 		Do List.Insert(ORDERS05)
 	}
 	Quit List
 ]]></Implementation>
 </Method>
 
-<Method name="GeefEDIDC40">
+<Method name="VoegToeEDIDC40">
 <FormalSpec><![CDATA[&ORDERS05:APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05]]></FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	 Set ORDERS05.IDOC.EDIDC40.IDOCTYP = "ORDERS05"
+<Implementation><![CDATA[
+	Set ORDERS05.IDOC.EDIDC40.SEGMENT = "1"
+	Set ORDERS05.IDOC.EDIDC40.IDOCTYP = "ORDERS05"
 ]]></Implementation>
 </Method>
 
-<Method name="GeefE1EDK01">
+<Method name="VoegToeE1EDK01">
 <FormalSpec><![CDATA[&ORDERS05:APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05]]></FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Set ORDERS05.IDOC.E1EDK01.CURCY = "EUR"
+<Implementation><![CDATA[
+	Set ORDERS05.IDOC.E1EDK01.SEGMENT = "1"
+	Set ORDERS05.IDOC.E1EDK01.CURCY = "EUR"
 ]]></Implementation>
 </Method>
 
-<Method name="GeefE1EDK03">
+<Method name="VoegToeE1EDK03">
 <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><![CDATA[
+	Set ORDERS05.IDOC.E1EDK03.SEGMENT = "1"
+	Set ORDERS05.IDOC.E1EDK03.DATUM = "20" _Toelevering.ToeleveringHeader.CustomerOrderEntryDate
 ]]></Implementation>
 </Method>
 
-<Method name="GeefE1EDKA1">
+<Method name="VoegToeE1EDK02">
 <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.E1EDK02.SEGMENT = "1"
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeE1EDK17">
+<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.E1EDK17.SEGMENT = "1"
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeE1EDK18">
+<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.E1EDK18.SEGMENT = "1"
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeE1EDKT1">
+<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.E1EDKT1.SEGMENT = "1"
+	Set ORDERS05.IDOC.E1EDKT1.E1EDKT2.SEGMENT = "1"
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeE1EDKA1">
+<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()
+	Set E1EDKA1.SEGMENT = "1"
+	set E1EDKA1.PARVW = "AG"
 	Do ORDERS05.IDOC.E1EDKA1.Insert(E1EDKA1)
 
 	Set E1EDKA1 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDKA1).%New()
+	Set E1EDKA1.SEGMENT = "1"
+	set E1EDKA1.PARVW = "WE"
 	Do ORDERS05.IDOC.E1EDKA1.Insert(E1EDKA1)
 
 	Set E1EDKA1 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDKA1).%New()
+	Set E1EDKA1.SEGMENT = "1"
+	set E1EDKA1.PARVW = "LF"
 	Do ORDERS05.IDOC.E1EDKA1.Insert(E1EDKA1)
 ]]></Implementation>
 </Method>
+
+<Method name="VoegToeE1EDP01">
+<FormalSpec><![CDATA[&ORDERS05:APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05,ToeleveringDetail:APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim E1EDP01 As APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP01 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP01).%New()
+	Set E1EDP01.SEGMENT = "1"
+	Do ..VoegToeE1EDP19(E1EDP01, ToeleveringDetail)
+	
+	Do ORDERS05.IDOC.E1EDP01.Insert(E1EDP01)
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeE1EDP19">
+<Final>1</Final>
+<FormalSpec>E1EDP01:APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP01,ToeleveringDetail:APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	set List = ##class(%ListOfObjects).%New()
+
+	Set E1EDP19 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP19).%New()
+	Set E1EDP19.SEGMENT = "1"
+	Do E1EDP01.E1EDP19.Insert(E1EDP19)
+
+	Set E1EDP19 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP19).%New()
+	Set E1EDP19.SEGMENT = "1"
+	Do E1EDP01.E1EDP19.Insert(E1EDP19)
+
+	Set E1EDP19 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP19).%New()
+	Set E1EDP19.SEGMENT = "1"
+	Do E1EDP01.E1EDP19.Insert(E1EDP19)
+	
+	Quit List
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml
===================================================================
diff -u -r35153 -r35160
--- vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml	(.../COMSO.cls.xml)	(revision 35153)
+++ vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml	(.../COMSO.cls.xml)	(revision 35160)
@@ -13,6 +13,9 @@
 	Set Toelevering.ToeleveringHeader = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringHeader).%New()
 	Set Toelevering.ToeleveringHeader.CustomerOrderEntryDate = "160609"
 	
+	#dim ToeleveringDetail As APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail).%New()
+	Do Toelevering.ToeleveringDetail.Insert(ToeleveringDetail)
+	
 	Do COMSO.ToeleveringList.Insert(Toelevering) 
 	
 	Quit COMSO
Index: vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r35153 -r35160
--- vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35153)
+++ vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35160)
@@ -17,10 +17,45 @@
 	Do $$$AssertEquals(ORDERS05List.Count(),1)
 	
 	#dim ORDERS05Result As APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05 = ORDERS05List.GetAt(1)
+
+	Do $$$AssertEquals(ORDERS05Result.IDOC.BEGIN,"1")
+
+	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.SEGMENT,"1")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.IDOCTYP,"ORDERS05")
+	
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK01.SEGMENT,"1")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK01.CURCY,"EUR")
+	
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK03.SEGMENT,"1")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK03.DATUM,"20160609")
+	
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK02.SEGMENT,"1")
+	
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK17.SEGMENT,"1")
+	
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK18.SEGMENT,"1")
+	
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKT1.SEGMENT,"1")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKT1.E1EDKT2.SEGMENT,"1")
+	
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.Count(), 3)
+	
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(1).SEGMENT, "1")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(1).PARVW, "AG")
+
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(2).SEGMENT, "1")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(2).PARVW, "WE")
+
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(3).SEGMENT, "1")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(3).PARVW, "LF")
+	
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.Count(), 1)
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).SEGMENT, "1")
+	
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.Count(), 3)
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.GetAt(1).SEGMENT, "1")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.GetAt(2).SEGMENT, "1")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.GetAt(3).SEGMENT, "1")
 ]]></Implementation>
 </Method>
 </Class>