Index: APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml
===================================================================
diff -u -r35184 -r35195
--- APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35184)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35195)
@@ -159,7 +159,8 @@
 	Set E1EDP01.NETWR = ToeleveringDetail.NetPrice
 	Set E1EDP01.PEINH = ..BepaalPUINH(ToeleveringDetail.PriceDimension)
 	Set E1EDP01.VPREI = ((E1EDP01.MENGE * E1EDP01.NETWR) / E1EDP01.PEINH ) 
-
+	Set E1EDP01.PREIS = ToeleveringDetail.ProductData.BrutoAankoopPrijs
+	
 	Set E1EDP01.E1EDP03.SEGMENT = "1"
 	Set E1EDP01.E1EDP03.IDDAT = "002" ; (expected delivery date)
 	Set E1EDP01.E1EDP03.DATUM = "20" _ToeleveringDetail.DeliveryDateAxBUA ; Delivery date
@@ -195,6 +196,7 @@
 	Set E1EDP19 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP19).%New()
 	Set E1EDP19.SEGMENT = "1"
 	Set E1EDP19.QUALF = "001" ; ###Customer material number###
+	Set E1EDP19.KTEXT = ToeleveringDetail.ProductData.KortTekst
 	Do E1EDP01.E1EDP19.Insert(E1EDP19)
 
 	Set E1EDP19 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP19).%New()
@@ -205,7 +207,8 @@
 
 	Set E1EDP19 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP19).%New()
 	Set E1EDP19.SEGMENT = "1"
-	Set E1EDP19.QUALF = "003" ; ###MAterial Number BLUM ###
+	Set E1EDP19.QUALF = "003" ; ###Material Number BLUM ###
+	Set E1EDP19.IDTNR = ToeleveringDetail.ProductData.EANCode
 	Do E1EDP01.E1EDP19.Insert(E1EDP19)
 	
 	Quit List
Index: APPS/EDIExport/AankoopOrder/BLUM/dto/ProductData.cls.xml
===================================================================
diff -u
--- APPS/EDIExport/AankoopOrder/BLUM/dto/ProductData.cls.xml	(revision 0)
+++ APPS/EDIExport/AankoopOrder/BLUM/dto/ProductData.cls.xml	(revision 35195)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDIExport.AankoopOrder.BLUM.dto.ProductData">
+<Super>%SerialObject</Super>
+
+<Property name="ProductID">
+<Type>%String</Type>
+</Property>
+
+<Property name="KortTekst">
+<Type>%String</Type>
+</Property>
+
+<Property name="EANCode">
+<Type>%String</Type>
+</Property>
+
+<Property name="BrutoAankoopPrijs">
+<Type>%Decimal</Type>
+</Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>ProductDataState</State>
+<StreamLocation>^APPS.EDIExport6749.ProductDataS</StreamLocation>
+<Data name="ProductDataState">
+<Value name="1">
+<Value>ProductID</Value>
+</Value>
+<Value name="2">
+<Value>KortTekst</Value>
+</Value>
+<Value name="3">
+<Value>EANCode</Value>
+</Value>
+<Value name="4">
+<Value>GrossPrice</Value>
+</Value>
+<Value name="5">
+<Value>BrutoAankoopPrijs</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar/GeefCOMSO/Test.cls.xml
===================================================================
diff -u -r35194 -r35195
--- vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar/GeefCOMSO/Test.cls.xml	(.../Test.cls.xml)	(revision 35194)
+++ vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar/GeefCOMSO/Test.cls.xml	(.../Test.cls.xml)	(revision 35195)
@@ -36,7 +36,15 @@
 
 <Method name="Test : GeefCOMSO() geeft COMSO object weer uit BLExport">
 <Implementation><![CDATA[
-	#dim DataVerzamelaar As APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar).%New()
+	#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 ProductMock.IndienMethodCall("GeefKorttekst").DanReturn("KortTekst")
+	Do ProductMock.IndienMethodCall("GeefEANCode").DanReturn("EANCode")
+	Do ProductMock.IndienMethodCall("GeefBrutoAankoopPrijs").DanReturn(90.25)
+	
+	#dim DataVerzamelaar As APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar).%New(ProductAPIMock)
 	#dim COMSO As APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO = DataVerzamelaar.GeefCOMSO() 
 	
 	Do $$$AssertIsObject(COMSO)
@@ -76,13 +84,21 @@
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).PriceDimension ,"2")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA ,"160613")
 	
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).ProductData.KortTekst,"KortTekst")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).ProductData.EANCode,"EANCode")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).ProductData.BrutoAankoopPrijs,90.25)
+	
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.Count(),1)
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).OrderLineIdentificationCustomer,"206418.01")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).IdentNumberSupplierBAU ,"01588000")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).OrderQuantity ,"0000020")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).NetPrice ,"0000196.31")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).PriceDimension ,"2")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA ,"160620")
+
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).ProductData.KortTekst,"KortTekst")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).ProductData.EANCode,"EANCode")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).ProductData.BrutoAankoopPrijs,90.25)
 	
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.Count(),2)
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).OrderLineIdentificationCustomer,"206558.01")
@@ -91,6 +107,10 @@
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).NetPrice ,"0000168.25")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).PriceDimension ,"2")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA ,"160627")
+
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).ProductData.KortTekst,"KortTekst")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).ProductData.EANCode,"EANCode")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).ProductData.BrutoAankoopPrijs,90.25)
 	
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).OrderLineIdentificationCustomer,"206558.02")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).IdentNumberSupplierBAU ,"05977682")
@@ -99,6 +119,10 @@
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).PriceDimension ,"2")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).DeliveryDateAxBUA ,"160627")
 	
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).ProductData.KortTekst,"KortTekst")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).ProductData.EANCode,"EANCode")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).ProductData.BrutoAankoopPrijs,90.25)
+
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.Count(),1)
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).OrderLineIdentificationCustomer,"206595.01")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).IdentNumberSupplierBAU ,"06143434")
@@ -107,13 +131,21 @@
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).PriceDimension ,"0")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA ,"160530")
 	
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).ProductData.KortTekst,"KortTekst")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).ProductData.EANCode,"EANCode")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).ProductData.BrutoAankoopPrijs,90.25)
+
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.Count(),1)
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).OrderLineIdentificationCustomer,"206816.01")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).IdentNumberSupplierBAU ,"00007411")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).OrderQuantity ,"0000002")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).NetPrice ,"0000004.46")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).PriceDimension ,"0")
 	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA ,"170109")
+
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).ProductData.KortTekst,"KortTekst")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).ProductData.EANCode,"EANCode")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).ProductData.BrutoAankoopPrijs,90.25)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml
===================================================================
diff -u -r35184 -r35195
--- vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml	(.../COMSO.cls.xml)	(revision 35184)
+++ vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml	(.../COMSO.cls.xml)	(revision 35195)
@@ -23,6 +23,10 @@
 	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.ProductData = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ProductData).%New()
+	Set ToeleveringDetail.ProductData.EANCode = "EANCODE"
+	Set ToeleveringDetail.ProductData.KortTekst = "Korttekst"
+	Set ToeleveringDetail.ProductData.BrutoAankoopPrijs = 90.25
 	
 	Do Toelevering.ToeleveringDetail.Insert(ToeleveringDetail)
 	
Index: APPS/EDIExport/AankoopOrder/BLUM/dto/ToeleveringDetail.cls.xml
===================================================================
diff -u -r35114 -r35195
--- APPS/EDIExport/AankoopOrder/BLUM/dto/ToeleveringDetail.cls.xml	(.../ToeleveringDetail.cls.xml)	(revision 35114)
+++ APPS/EDIExport/AankoopOrder/BLUM/dto/ToeleveringDetail.cls.xml	(.../ToeleveringDetail.cls.xml)	(revision 35195)
@@ -76,6 +76,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="ProductData">
+<Type>APPS.EDIExport.AankoopOrder.BLUM.dto.ProductData</Type>
+</Property>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <State>COMSOLineDetailState</State>
@@ -118,6 +122,12 @@
 <Value name="12">
 <Value>ProductIdentificationCustomer</Value>
 </Value>
+<Value name="13">
+<Value>ProductInfo</Value>
+</Value>
+<Value name="14">
+<Value>ProductData</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r35190 -r35195
--- vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35190)
+++ vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35195)
@@ -79,6 +79,7 @@
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).NETWR, 6.96)
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).PEINH, 100)
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).VPREI, ((1000 * 6.96) / 100) )
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).PREIS, 90.25)
 	
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP03.SEGMENT, "1")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP03.IDDAT, "002")
@@ -90,12 +91,14 @@
 	
 	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).KTEXT, "Korttekst")
 	
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.GetAt(2).SEGMENT, "1")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.GetAt(2).QUALF,"002")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.GetAt(2).IDTNR,"01026503")
 	
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.GetAt(3).SEGMENT, "1")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.GetAt(3).IDTNR,"EANCODE")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).E1EDP19.GetAt(3).QUALF,"003")
 ]]></Implementation>
 </Method>
Index: APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml
===================================================================
diff -u -r35194 -r35195
--- APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml	(.../DataVerzamelaar.cls.xml)	(revision 35194)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml	(.../DataVerzamelaar.cls.xml)	(revision 35195)
@@ -13,6 +13,23 @@
 <Default>21</Default>
 </Parameter>
 
+<Property name="ProductAPI">
+<Type>DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ProductAPI:DOM.PM.ProductAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..ProductAPI = $$$Inject(ProductAPI,##class(DOM.DomeinContext).Instance().GeefProductAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefCOMSO">
 <ReturnType>APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO</ReturnType>
 <Implementation><![CDATA[
@@ -64,14 +81,29 @@
 <Implementation><![CDATA[
 	#dim ToeleveringDetail As APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail).%New()
 	Set ToeleveringDetail.OrderLineIdentificationCustomer = $$$Trim($Extract(BLExportLijn,4,14))
-	Set ToeleveringDetail.IdentNumberSupplierBAU = $Extract(BLExportLijn,20,27)
+	Set ToeleveringDetail.IdentNumberSupplierBAU = $$$Trim($Extract(BLExportLijn,20,27))
 	Set ToeleveringDetail.OrderQuantity = $Extract(BLExportLijn,28,34)
 	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)
 	Quit ToeleveringDetail
 ]]></Implementation>
 </Method>
+
+<Method name="GeefProductData">
+<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() 
+	Quit ProductData
+]]></Implementation>
+</Method>
 </Class>