Index: APPS/EDIExport/AankoopOrder/BLUM/dto/ToeleveringHeader.cls.xml
===================================================================
diff -u -r35171 -r35208
--- APPS/EDIExport/AankoopOrder/BLUM/dto/ToeleveringHeader.cls.xml	(.../ToeleveringHeader.cls.xml)	(revision 35171)
+++ APPS/EDIExport/AankoopOrder/BLUM/dto/ToeleveringHeader.cls.xml	(.../ToeleveringHeader.cls.xml)	(revision 35208)
@@ -72,12 +72,13 @@
 
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
-<State>COMSOLineHeaderState</State>
-<StreamLocation>^APPS.EDIEx6749.COMSOLineHeEF05S</StreamLocation>
-<Data name="COMSOLineHeaderState">
-<Subscript>"COMSOLineHeader"</Subscript>
+<State>ToeleveringHeaderState</State>
+<StreamLocation>^APPS.EDIEx6749.Toelevering53B7S</StreamLocation>
+<Data name="ToeleveringHeaderState">
+<Structure>listnode</Structure>
+<Subscript/>
 <Value name="1">
-<Value>CustomerNumberForShipMent</Value>
+<Value>CustomerNumberForShipment</Value>
 </Value>
 <Value name="2">
 <Value>DeliveryAddressID</Value>
@@ -109,9 +110,6 @@
 <Value name="11">
 <Value>CustomerOrderEntryDate</Value>
 </Value>
-<Value name="12">
-<Value>CustomerNumberForShipment</Value>
-</Value>
 </Data>
 </Storage>
 </Class>
Index: APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml
===================================================================
diff -u -r35195 -r35208
--- APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml	(.../DataVerzamelaar.cls.xml)	(revision 35195)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml	(.../DataVerzamelaar.cls.xml)	(revision 35208)
@@ -18,14 +18,19 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ToeleveringAPI">
+<Type>DOM.AKP.ToeleveringAPI</Type>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ProductAPI:DOM.PM.ProductAPI</FormalSpec>
+<FormalSpec>ProductAPI:DOM.PM.ProductAPI,ToeleveringAPI:DOM.AKP.ToeleveringAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..ProductAPI = $$$Inject(ProductAPI,##class(DOM.DomeinContext).Instance().GeefProductAPI())
+	set ..ToeleveringAPI = $$$Inject(ToeleveringAPI,##class(DOM.DomeinContext).Instance().GeefToeleveringAPI())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -70,6 +75,7 @@
 	Set Toelevering.ToeleveringHeader.CustomerNumberForInvoice = $Extract(BLExportLijn,12,17)
 	Set Toelevering.ToeleveringHeader.CustomerOrderReference = $$$Trim($Extract(BLExportLijn,20,31))
 	Set Toelevering.ToeleveringHeader.CustomerOrderEntryDate = $Extract(BLExportLijn,54,59)
+
 	Quit Toelevering
 ]]></Implementation>
 </Method>
@@ -86,24 +92,51 @@
 	Set ToeleveringDetail.NetPrice = $Extract(BLExportLijn,35,44)
 	Set ToeleveringDetail.PriceDimension = $Extract(BLExportLijn,45,45) 
 	Set ToeleveringDetail.DeliveryDateAxBUA = $Extract(BLExportLijn,46,51)
-	Set ToeleveringDetail.ProductData = ..GeefProductData(ToeleveringDetail.IdentNumberSupplierBAU)
+	Set ToeleveringDetail.ProductIdentificationCustomer = ..GeefLVHProductNummer(ToeleveringDetail.OrderLineIdentificationCustomer, BLExportLijn)
+	Set ToeleveringDetail.ProductData = ..GeefProductData(ToeleveringDetail.ProductIdentificationCustomer)
 	Quit ToeleveringDetail
 ]]></Implementation>
 </Method>
 
 <Method name="GeefProductData">
-<FormalSpec>ProductID:%String</FormalSpec>
+<FormalSpec>ProductID:%String=""</FormalSpec>
 <Private>1</Private>
 <ReturnType>APPS.EDIExport.AankoopOrder.BLUM.dto.ProductData</ReturnType>
 <Implementation><![CDATA[
 	set ProductData = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ProductData).%New()
-	#dim Product As DOM.PM.Product = ..ProductAPI.GeefProduct(ProductID)
-	set ProductData.KortTekst = Product.GeefKorttekst()
-	set ProductData.EANCode = Product.GeefEANCode()
-	set ProductData.BrutoAankoopPrijs = Product.GeefBrutoAankoopPrijs() 
+	If (ProductID '= "")
+	{
+		#dim Product As DOM.PM.Product = ..ProductAPI.GeefProduct(ProductID)
+		if $IsObject(Product)
+		{
+			set ProductData.KortTekst = Product.GeefKorttekst()
+			set ProductData.EANCode = Product.GeefEANCode()
+			set ProductData.BrutoAankoopPrijs = Product.GeefBrutoAankoopPrijs() 
+		} 
+	}
+	
 	Quit ProductData
 ]]></Implementation>
 </Method>
+
+<Method name="GeefLVHProductNummer">
+<FormalSpec>OrderLineIdentificationCustomer:%String,BLExportLijn:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim ToeleveringID As %String = $Piece(OrderLineIdentificationCustomer,".",1)
+	#dim ToeleveringLijnID As %String = "1" _$Piece(OrderLineIdentificationCustomer,".",2)
+	#dim LVHProductNummer As %String = $$$Trim($Extract(BLExportLijn,56,74))
+	
+	if (LVHProductNummer = "")
+	{
+		#dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringAPI.GeefToelevering(ToeleveringID)
+		#dim ToeleveringLijn As DOM.AKP.impl.DataM.DataMProductToeleveringLijn = Toelevering.GeefToeleveringLijnViaVolgNr(ToeleveringLijnID)
+		Quit:(ToeleveringLijn '= "") ToeleveringLijn.GeefProductID()
+	} 
+	Quit LVHProductNummer
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender/Verzend/Test.cls.xml
===================================================================
diff -u -r35188 -r35208
--- vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender/Verzend/Test.cls.xml	(.../Test.cls.xml)	(revision 35188)
+++ vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender/Verzend/Test.cls.xml	(.../Test.cls.xml)	(revision 35208)
@@ -22,7 +22,7 @@
 	#dim ORDERS05DoubleList As %ListOfObjects = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05).GeefORDERS05()
 	Do ConverteerderMock.VerwachtMethodCall("Converteer",$$$ElkeWaarde).DanReturn(ORDERS05DoubleList)
 	
-	#dim BLUMVerzender As APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender).%New(FileAPIFake, ConverteerderMock, FileUtilsFake)
+	#dim BLUMVerzender As APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender).%New(FileAPIFake, ConverteerderMock, FileUtilsFake, ..GeefDataVerzamelaar())
 	Do BLUMVerzender.Verzend()
 	
 	Do ConverteerderMock.Verifieer()
@@ -184,7 +184,7 @@
 	#dim ORDERS05DoubleList As %ListOfObjects = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05).GeefORDERS05()
 	Do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(ORDERS05DoubleList)
 	
-	#dim BLUMVerzender As APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender).%New(, ConverteerderMock, FileUtilsFake)
+	#dim BLUMVerzender As APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender).%New(, ConverteerderMock, FileUtilsFake, ..GeefDataVerzamelaar())
 	Do BLUMVerzender.Verzend()
 	
 	do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
@@ -202,7 +202,7 @@
 	#dim ORDERS05DoubleList As %ListOfObjects = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05).GeefORDERS05()
 	Do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(ORDERS05DoubleList)
 	
-	#dim BLUMVerzender As APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender).%New(FileAPIFake, ConverteerderMock, FileUtilsFake)
+	#dim BLUMVerzender As APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender).%New(FileAPIFake, ConverteerderMock, FileUtilsFake, ..GeefDataVerzamelaar())
 	Do BLUMVerzender.Verzend()
 	
 	#dim XMlStream As %Stream = FileAPIFake.GeefFileWriter().GeefInhoudBestandNaam(..GeefSafeToSendMailBestandVolledigNaam())
@@ -228,7 +228,7 @@
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes(VerwachteError)
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
 	
-	#dim BLUMVerzender As APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender).%New(FileAPIFake, ConverteerderMock, FileUtilsFake)
+	#dim BLUMVerzender As APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender).%New(FileAPIFake, ConverteerderMock, FileUtilsFake, ..GeefDataVerzamelaar())
 	Do BLUMVerzender.Verzend()
 ]]></Implementation>
 </Method>
@@ -244,7 +244,13 @@
 	#dim ORDERS05DoubleList As %ListOfObjects = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrder.BLUM.XML.ORDERS05).GeefORDERS05()
 	Do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(ORDERS05DoubleList)
 	
-	#dim DataVerzamelaarMock As vhTest.Mock.APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar = ##class(vhTest.Mock.APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar).%New()
+	#dim ToeleveringAPIMock As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).%New()
+	#dim ToeleveringLijnMock As vhTest.Mock.DOM.AKP.ProductToeleveringLijn = ##class(vhTest.Mock.DOM.AKP.ProductToeleveringLijn).%New()
+	Do ToeleveringLijnMock.IndienMethodCall("GeefProductID").DanReturn("DummyProductID")
+	Do ToeleveringAPIMock.IndienMethodCall("GeefToeleveringLijn",$$$ElkeWaarde, $$$ElkeWaarde).DanReturn(ToeleveringLijnMock)
+
+	#dim DataVerzamelaarMock As vhTest.Mock.APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar = ##class(vhTest.Mock.APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar).%New(, ToeleveringAPIMock)
+	
 	Do DataVerzamelaarMock.VerwachtMethodCall("GeefCOMSO").DanDoeNiks()
 	
 	#dim BLUMVerzender As APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender).%New(FileAPIFake, ConverteerderMock, FileUtilsFake, DataVerzamelaarMock)
@@ -276,6 +282,21 @@
 	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\EDI_BLUM_XML_OUT\AankoopOrder\")
 ]]></Implementation>
 </Method>
+
+<Method name="GeefDataVerzamelaar">
+<Private>1</Private>
+<ReturnType>APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar</ReturnType>
+<Implementation><![CDATA[
+	#dim ToeleveringAPIMock As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).%New()
+	#dim ToeleveringLijnMock As vhTest.Mock.DOM.AKP.ProductToeleveringLijn = ##class(vhTest.Mock.DOM.AKP.ProductToeleveringLijn).%New()
+	Do ToeleveringLijnMock.IndienMethodCall("GeefProductID").DanReturn("DummyProductID")
+	Do ToeleveringAPIMock.IndienMethodCall("GeefToeleveringLijn",$$$ElkeWaarde, $$$ElkeWaarde).DanReturn(ToeleveringLijnMock)
+
+	#dim DataVerzamelaarMock As vhTest.Mock.APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar = ##class(vhTest.Mock.APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar).%New(, ToeleveringAPIMock)
+	Do DataVerzamelaarMock.IndienMethodCall("GeefCOMSO").DanDoeNiks()
+	Quit DataVerzamelaarMock
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml
===================================================================
diff -u -r35195 -r35208
--- vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml	(.../COMSO.cls.xml)	(revision 35195)
+++ vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml	(.../COMSO.cls.xml)	(revision 35208)
@@ -23,6 +23,7 @@
 	Set ToeleveringDetail.PriceDimension = 2 ; 0,1,2,3,4 / E,H,H,M / 1,100,100,1000 Geeft x weer. Prijs per x stuks.
 	Set ToeleveringDetail.DeliveryDateAxBUA = "160612" ; delivery date.
 	Set ToeleveringDetail.IdentNumberSupplierBAU = "01026503" ;
+	Set ToeleveringDetail.ProductIdentificationCustomer = "LVHProductNummer"
 	Set ToeleveringDetail.ProductData = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ProductData).%New()
 	Set ToeleveringDetail.ProductData.EANCode = "EANCODE"
 	Set ToeleveringDetail.ProductData.KortTekst = "Korttekst"
Index: vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r35195 -r35208
--- vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35195)
+++ vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35208)
@@ -9,9 +9,6 @@
 	#dim COMSODouble As APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO).%New().GeefCOMSO()
 	#dim ORDERS05List As %ListOfObjects = Converteerder.Converteer(COMSODouble)
 	
-	///#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(ORDERS05List)
 	
 	Do $$$AssertEquals(ORDERS05List.Count(),1)
@@ -46,13 +43,6 @@
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK02.BELNR, "230123")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK02.QUALF,"001")
 	
-	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")
@@ -62,6 +52,7 @@
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(2).SEGMENT, "1")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(2).PARVW, "WE")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(2).PARTN, "2222222222")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(2).NAME1, "Van Hoecke nv")
 	
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(3).SEGMENT, "1")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(3).PARVW, "LF")
@@ -85,12 +76,11 @@
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP03.IDDAT, "002")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP03.DATUM, "20160612")
 	
-	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDPT1.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(1).QUALF,"001")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.GetAt(1).IDTNR,"LVHProductNummer")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.GetAt(1).KTEXT, "Korttekst")
 	
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.GetAt(2).SEGMENT, "1")
Index: APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml
===================================================================
diff -u -r35195 -r35208
--- APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35195)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35208)
@@ -30,9 +30,6 @@
 		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)
 		
 		#Dim ToeleveringDetailIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(Toelevering.ToeleveringDetail)
@@ -96,29 +93,6 @@
 ]]></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>
@@ -133,6 +107,7 @@
 	Set E1EDKA1.SEGMENT = "1"
 	set E1EDKA1.PARVW = "WE"
 	set E1EDKA1.PARTN = Toelevering.ToeleveringHeader.CustomerNumberForShipment
+	set E1EDKA1.NAME1 = "Van Hoecke nv"
 	Do ORDERS05.IDOC.E1EDKA1.Insert(E1EDKA1)
 
 	Set E1EDKA1 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDKA1).%New()
@@ -165,8 +140,6 @@
 	Set E1EDP01.E1EDP03.IDDAT = "002" ; (expected delivery date)
 	Set E1EDP01.E1EDP03.DATUM = "20" _ToeleveringDetail.DeliveryDateAxBUA ; Delivery date
 	
-	Set E1EDP01.E1EDPT1.SEGMENT = "1"
-
 	Do ..VoegToeE1EDP19(E1EDP01, ToeleveringDetail)
 	
 	Do ORDERS05.IDOC.E1EDP01.Insert(E1EDP01)
@@ -196,6 +169,7 @@
 	Set E1EDP19 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP19).%New()
 	Set E1EDP19.SEGMENT = "1"
 	Set E1EDP19.QUALF = "001" ; ###Customer material number###
+	Set E1EDP19.IDTNR = ToeleveringDetail.ProductIdentificationCustomer
 	Set E1EDP19.KTEXT = ToeleveringDetail.ProductData.KortTekst
 	Do E1EDP01.E1EDP19.Insert(E1EDP19)
 
Index: vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar/GeefCOMSO/Test.cls.xml
===================================================================
diff -u -r35195 -r35208
--- vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar/GeefCOMSO/Test.cls.xml	(.../Test.cls.xml)	(revision 35195)
+++ vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar/GeefCOMSO/Test.cls.xml	(.../Test.cls.xml)	(revision 35208)
@@ -30,6 +30,7 @@
 <Implementation><![CDATA[
 	Kill ^BLExport
 	Lock -^BLExport
+	
 	Do ##super()
 ]]></Implementation>
 </Method>
@@ -38,19 +39,32 @@
 <Implementation><![CDATA[
 	#dim ProductAPIMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	#dim ProductMock As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	
 	Do ProductAPIMock.IndienMethodCall("GeefProduct",$$$ElkeWaarde).DanReturn(ProductMock)
-
+	Do ProductAPIMock.IndienMethodCall("BestaatProduct",$$$ElkeWaarde).DanReturn(1)
+	Do ProductAPIMock.IndienMethodCall("BestaatIdentNr",$$$ElkeWaarde).DanReturn(1)
+	
 	Do ProductMock.IndienMethodCall("GeefKorttekst").DanReturn("KortTekst")
 	Do ProductMock.IndienMethodCall("GeefEANCode").DanReturn("EANCode")
 	Do ProductMock.IndienMethodCall("GeefBrutoAankoopPrijs").DanReturn(90.25)
+
+	#dim ToeleveringAPIMock As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).%New()
+
+	#dim ToeleveringMock As vhTest.Mock.DOM.AKP.Toelevering = ##class(vhTest.Mock.DOM.AKP.Toelevering).%New()
+	Do ToeleveringAPIMock.IndienMethodCall("GeefToelevering",$$$ElkeWaarde).DanReturn(ToeleveringMock)
 	
-	#dim DataVerzamelaar As APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar).%New(ProductAPIMock)
+	#dim ToeleveringLijnMock As vhTest.Mock.DOM.AKP.ProductToeleveringLijn = ##class(vhTest.Mock.DOM.AKP.ProductToeleveringLijn).%New()
+	Do ToeleveringLijnMock.IndienMethodCall("GeefProductID").DanReturn("DummyProductID")
+
+	Do ToeleveringMock.IndienMethodCall("GeefToeleveringLijnViaVolgNr", $$$ElkeWaarde).DanReturn(ToeleveringLijnMock)
+	
+	#dim DataVerzamelaar As APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar).%New(ProductAPIMock, ToeleveringAPIMock)
 	#dim COMSO As APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO = DataVerzamelaar.GeefCOMSO() 
 	
 	Do $$$AssertIsObject(COMSO)
 	
 	Do $$$AssertEquals(COMSO.ToeleveringList.Count(),5)
-
+	
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringHeader.CustomerNumberForShipment,"271250")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringHeader.CustomerNumberForInvoice,"271250")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringHeader.CustomerOrderReference,"206397")