Index: APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml
===================================================================
diff -u -r35160 -r35166
--- APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35160)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35166)
@@ -54,6 +54,15 @@
 <Implementation><![CDATA[
 	Set ORDERS05.IDOC.EDIDC40.SEGMENT = "1"
 	Set ORDERS05.IDOC.EDIDC40.IDOCTYP = "ORDERS05"
+	Set ORDERS05.IDOC.EDIDC40.DIRECT = 1 ; 1 = outbound  (net zoals bij INVRPT & SLSFCT)
+	Set ORDERS05.IDOC.EDIDC40.RCVPRN = "9002617000009" ; ###Receiver GLN - Julius Blum GmbH###
+	Set ORDERS05.IDOC.EDIDC40.SNDPRN = "212250" ; ###Partner GLN, Unique Partner ID###
+	Set ORDERS05.IDOC.EDIDC40.MANDT = "01"
+	Set ORDERS05.IDOC.EDIDC40.MESTYP = "ORDERS"
+	Set ORDERS05.IDOC.EDIDC40.DOCREL = "46C"
+	Set ORDERS05.IDOC.EDIDC40.STATUS = 30
+	Set ORDERS05.IDOC.EDIDC40.STDMES = "ORDERS"
+	Set ORDERS05.IDOC.EDIDC40.TABNAM = "EDI_DC40"
 ]]></Implementation>
 </Method>
 
@@ -72,13 +81,18 @@
 <Implementation><![CDATA[
 	Set ORDERS05.IDOC.E1EDK03.SEGMENT = "1"
 	Set ORDERS05.IDOC.E1EDK03.DATUM = "20" _Toelevering.ToeleveringHeader.CustomerOrderEntryDate
+	Set ORDERS05.IDOC.E1EDK03.IDDAT = "011"
 ]]></Implementation>
 </Method>
 
 <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><![CDATA[
+	Set ORDERS05.IDOC.E1EDK02.SEGMENT = "1"
+	Set ORDERS05.IDOC.E1EDK02.DATUM = "20" _Toelevering.ToeleveringHeader.CustomerOrderEntryDate
+	Set ORDERS05.IDOC.E1EDK02.BELNR = Toelevering.ToeleveringHeader.CustomerOrderReference
+	Set ORDERS05.IDOC.E1EDK02.QUALF = "001" ; Customer Purchase order
 ]]></Implementation>
 </Method>
 
@@ -112,16 +126,25 @@
 	#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"
+	set E1EDKA1.PARTN = Toelevering.ToeleveringHeader.CustomerNumberForInvoice
 	Do ORDERS05.IDOC.E1EDKA1.Insert(E1EDKA1)
 
 	Set E1EDKA1 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDKA1).%New()
 	Set E1EDKA1.SEGMENT = "1"
 	set E1EDKA1.PARVW = "WE"
+	set E1EDKA1.PARTN = Toelevering.ToeleveringHeader.CustomerNumberForShipMent
 	Do ORDERS05.IDOC.E1EDKA1.Insert(E1EDKA1)
 
 	Set E1EDKA1 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDKA1).%New()
 	Set E1EDKA1.SEGMENT = "1"
 	set E1EDKA1.PARVW = "LF"
+	set E1EDKA1.PARTN = "9002617000009"
+    set E1EDKA1.NAME1 = "Julius Blum GmbH"
+    set E1EDKA1.STRAS = ">Industrie. 1"
+    set E1EDKA1.ORT01 = "Hoechst"
+    set E1EDKA1.COUNC = "AT"
+    set E1EDKA1.PSTLZ = "6973"
+
 	Do ORDERS05.IDOC.E1EDKA1.Insert(E1EDKA1)
 ]]></Implementation>
 </Method>
@@ -132,6 +155,21 @@
 <Implementation><![CDATA[
 	#dim E1EDP01 As APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP01 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP01).%New()
 	Set E1EDP01.SEGMENT = "1"
+	Set E1EDP01.POSEX = ToeleveringDetail.OrderLineIdentificationCustomer
+	Set E1EDP01.ACTION = "001" ; item added
+	Set E1EDP01.MENGE = ToeleveringDetail.OrderQuantity
+	Set E1EDP01.MENEE = "PCE" ; Units of measure
+	Set E1EDP01.PMENE = "PCE" ; Units of Price
+	Set E1EDP01.NETWR = ToeleveringDetail.NetPrice
+	Set E1EDP01.PEINH = ToeleveringDetail.PriceDimension
+	Set E1EDP01.VPREI = ((ToeleveringDetail.OrderQuantity * ToeleveringDetail.NetPrice) / ToeleveringDetail.PriceDimension ) 
+	
+	Set E1EDP01.E1EDP03.SEGMENT = "1"
+	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)
@@ -148,14 +186,18 @@
 
 	Set E1EDP19 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP19).%New()
 	Set E1EDP19.SEGMENT = "1"
+	Set E1EDP19.QUALF = "001" ; ###Customer material number###
 	Do E1EDP01.E1EDP19.Insert(E1EDP19)
 
 	Set E1EDP19 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP19).%New()
 	Set E1EDP19.SEGMENT = "1"
+	Set E1EDP19.QUALF = "002" ; ###Material Number BLUM ###
+	Set E1EDP19.IDTNR = ToeleveringDetail.IdentNumberSupplierBAU
 	Do E1EDP01.E1EDP19.Insert(E1EDP19)
 
 	Set E1EDP19 = ##class(APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP19).%New()
 	Set E1EDP19.SEGMENT = "1"
+	Set E1EDP19.QUALF = "003" ; ###MAterial Number BLUM ###
 	Do E1EDP01.E1EDP19.Insert(E1EDP19)
 	
 	Quit List
Index: vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml
===================================================================
diff -u -r35160 -r35166
--- vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml	(.../COMSO.cls.xml)	(revision 35160)
+++ vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml	(.../COMSO.cls.xml)	(revision 35166)
@@ -12,8 +12,18 @@
 	#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"
+	Set Toelevering.ToeleveringHeader.CustomerOrderReference = "230123" ; ToeleveringsNummer / BonNr in oude code
+	Set Toelevering.ToeleveringHeader.CustomerNumberForInvoice = "1111111111" ; BLUM kundennummer AG
+	Set Toelevering.ToeleveringHeader.CustomerNumberForShipMent = "2222222222" ; BLUM kundennummer WE
 	
 	#dim ToeleveringDetail As APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail).%New()
+	Set ToeleveringDetail.OrderLineIdentificationCustomer = "230123.21" ; ToeleveringsNummer + ToeleveringsLijnNummer
+	Set ToeleveringDetail.OrderQuantity = "1000" ; aantal (opgelsagen in toeleveringslijn)
+	Set ToeleveringDetail.NetPrice = 6.96 ; Netto prijs
+	Set ToeleveringDetail.PriceDimension = 100 ; Geeft x weer. Prijs per x stuks.
+	Set ToeleveringDetail.DeliveryDateAxBUA = "160612" ; delivery date.
+	Set ToeleveringDetail.IdentNumberSupplierBAU = "01026503" ;
+	
 	Do Toelevering.ToeleveringDetail.Insert(ToeleveringDetail)
 	
 	Do COMSO.ToeleveringList.Insert(Toelevering) 
Index: vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r35160 -r35166
--- vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35160)
+++ vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35166)
@@ -22,14 +22,29 @@
 
 	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.SEGMENT,"1")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.IDOCTYP,"ORDERS05")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.DIRECT, 1)
+	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.MESTYP,"ORDERS")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.RCVPRN, "9002617000009") ; ###Receiver GLN - Julius Blum GmbH###
+	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.SNDPRN, "212250") ; ###Partner GLN, Unique Partner ID###
+	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.MANDT, "01")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.MESTYP, "ORDERS")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.DOCREL, "46C")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.STATUS, 30)
+	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.STDMES, "ORDERS")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.EDIDC40.TABNAM, "EDI_DC40")
+
 	
 	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.E1EDK03.IDDAT,"011")
 	
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK02.SEGMENT,"1")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK02.DATUM,"20160609")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK02.BELNR, "230123")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK02.QUALF,"001")
 	
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDK17.SEGMENT,"1")
 	
@@ -42,20 +57,50 @@
 	
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(1).SEGMENT, "1")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(1).PARVW, "AG")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(1).PARTN, "1111111111")
 
 	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(3).SEGMENT, "1")
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(3).PARVW, "LF")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(3).PARTN, "9002617000009")
+    Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(3).NAME1, "Julius Blum GmbH")
+    Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(3).STRAS, ">Industrie. 1")
+    Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(3).ORT01, "Hoechst")
+    Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(3).COUNC, "AT")
+    Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDKA1.GetAt(3).PSTLZ, "6973")
 	
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.Count(), 1)
+	
 	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).SEGMENT, "1")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).POSEX, "230123.21") 
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).ACTION, "001")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).MENEE, "PCE")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).PMENE, "PCE")
+	Do $$$AssertEquals(ORDERS05Result.IDOC.E1EDP01.GetAt(1).MENGE, 1000)
+	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).E1EDP03.SEGMENT, "1")
+	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(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).QUALF,"003")
 ]]></Implementation>
 </Method>
 </Class>