Index: vhTestFiles/UnitTests/APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender.Verzend/Test/TestVerzendschrijftBLUMaankooporderinxmlformaatnaarbestand/EDI_BLUM_XML_OUT/AankoopOrder/Data2012121100000.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender.Verzend/Test/TestVerzendschrijftBLUMaankooporderinxmlformaatnaarbestand/EDI_BLUM_XML_OUT/AankoopOrder/Data2012121100000.xml	(revision 0)
+++ vhTestFiles/UnitTests/APPS.EDIExport.AankoopOrder.impl.BLUM.Verzender.Verzend/Test/TestVerzendschrijftBLUMaankooporderinxmlformaatnaarbestand/EDI_BLUM_XML_OUT/AankoopOrder/Data2012121100000.xml	(revision 35184)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ORDERS05>
+  <IDOC BEGIN="1">
+    <EDI_DC40 SEGMENT="1">
+      <TABNAM>EDI_DC40</TABNAM>
+      <MANDT>01</MANDT>
+      <DOCREL>46C</DOCREL>
+      <STATUS>30</STATUS>
+      <DIRECT>1</DIRECT>
+      <IDOCTYP>ORDERS05</IDOCTYP>
+      <MESTYP>ORDERS</MESTYP>
+      <STDMES>ORDERS</STDMES>
+      <SNDPRN>0000000000000</SNDPRN>
+      <RCVPRN>9002617000009</RCVPRN>
+    </EDI_DC40>
+    <E1EDK01 SEGMENT="1">
+      <CURCY>EUR</CURCY>
+    </E1EDK01>
+    <E1EDK03 SEGMENT="1">
+      <IDDAT>011</IDDAT>
+      <DATUM>20121211</DATUM>
+    </E1EDK03>
+    <E1EDKA1 SEGMENT="1">
+      <PARVW>AG</PARVW>
+      <PARTN>###Partner-ID###</PARTN>
+      <NAME1>Partner name</NAME1>
+      <NAME2>Partner name2</NAME2>
+      <STRAS>Street</STRAS>
+      <STRS2>Street2</STRS2>
+      <ORT01>City</ORT01>
+      <COUNC>AT</COUNC>
+      <PSTLZ>PLZ</PSTLZ>
+    </E1EDKA1>
+    <E1EDKA1 SEGMENT="1">
+      <PARVW>WE</PARVW>
+      <PARTN>###Unique Code/ID for unique delivery adress###</PARTN>
+      <NAME1>Partner name</NAME1>
+      <NAME2>Partner name2</NAME2>
+      <STRAS>Street</STRAS>
+      <STRS2>Street2</STRS2>
+      <ORT01>City</ORT01>
+      <COUNC>AT</COUNC>
+      <PSTLZ>PLZ</PSTLZ>
+    </E1EDKA1>
+    <E1EDKA1 SEGMENT="1">
+      <PARVW>LF</PARVW>
+      <PARTN>9002617000009</PARTN>
+      <NAME1>Julius Blum GmbH</NAME1>
+      <STRAS>Industrie. 1</STRAS>
+      <ORT01>Hoechst</ORT01>
+      <COUNC>AT</COUNC>
+      <PSTLZ>6973</PSTLZ>
+    </E1EDKA1>
+    <E1EDK02 SEGMENT="1">
+      <QUALF>001</QUALF>
+      <BELNR>00000</BELNR>
+      <DATUM>20121211</DATUM>
+    </E1EDK02>
+    <E1EDK17 SEGMENT="1">
+      <QUALF>001</QUALF>
+      <LKOND>FCA</LKOND>
+      <LKTEXT>FCA, City  </LKTEXT>
+    </E1EDK17>
+    <E1EDK18 SEGMENT="1">
+      <QUALF>001</QUALF>
+      <ZTERM_TXT>30 days- 3 % Skonto  </ZTERM_TXT>
+    </E1EDK18>
+    <E1EDKT1 SEGMENT="1">
+      <TDID>002</TDID>
+      <E1EDKT2 SEGMENT="1">
+        <TDLINE>Dummy Order Text ##Order Text##</TDLINE>
+      </E1EDKT2>
+    </E1EDKT1>
+    <E1EDP01 SEGMENT="1">
+      <POSEX>001000</POSEX>
+      <ACTION>1</ACTION>
+      <MENGE>500.</MENGE>
+      <MENEE>PCE</MENEE>
+      <PMENE>PCE</PMENE>
+      <VPREI>34.8</VPREI>
+      <PEINH>100</PEINH>
+      <NETWR>6.96</NETWR>
+      <PREIS>11.6</PREIS>
+      <E1EDP03 SEGMENT="1">
+        <IDDAT>002</IDDAT>
+        <DATUM>20121214</DATUM>
+      </E1EDP03>
+      <E1EDP19 SEGMENT="1">
+        <QUALF>001</QUALF>
+        <IDTNR>12345678</IDTNR>
+        <KTEXT>artikel text</KTEXT>
+      </E1EDP19>
+      <E1EDP19 SEGMENT="1">
+        <QUALF>002</QUALF>
+        <IDTNR>01026503</IDTNR>
+      </E1EDP19>
+      <E1EDP19 SEGMENT="1">
+        <QUALF>003</QUALF>
+        <IDTNR>9002617278934</IDTNR>
+      </E1EDP19>
+      <E1EDPT1 SEGMENT="1">
+        <TDID>004</TDID>
+        <E1EDPT2>
+          <TDLINE>Positionstext ##Position Text##</TDLINE>
+        </E1EDPT2>
+      </E1EDPT1>
+    </E1EDP01>
+    <E1EDP01 SEGMENT="1">
+      <POSEX>002000</POSEX>
+      <ACTION>1</ACTION>
+      <MENGE>500.</MENGE>
+      <MENEE>PCE</MENEE>
+      <PMENE>PCE</PMENE>
+      <VPREI>34.8</VPREI>
+      <PEINH>100</PEINH>
+      <NETWR>6.96</NETWR>
+      <PREIS>11.6</PREIS>
+      <E1EDP03 SEGMENT="1">
+        <IDDAT>002</IDDAT>
+        <DATUM>20121214</DATUM>
+      </E1EDP03>
+      <E1EDP19 SEGMENT="1">
+        <QUALF>001</QUALF>
+        <IDTNR>12345678</IDTNR>
+        <KTEXT>artikel text</KTEXT>
+      </E1EDP19>
+      <E1EDP19 SEGMENT="1">
+        <QUALF>002</QUALF>
+        <IDTNR>01026503</IDTNR>
+      </E1EDP19>
+      <E1EDP19 SEGMENT="1">
+        <QUALF>003</QUALF>
+        <IDTNR>9002617278934</IDTNR>
+      </E1EDP19>
+      <E1EDPT1 SEGMENT="1">
+        <TDID>004</TDID>
+        <E1EDPT2>
+          <TDLINE>Positionstext ##Position Text##</TDLINE>
+        </E1EDPT2>
+      </E1EDPT1>
+    </E1EDP01>
+  </IDOC>
+</ORDERS05>
\ No newline at end of file
Index: vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender/Verzend/Test.cls.xml
===================================================================
diff -u -r35171 -r35184
--- vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender/Verzend/Test.cls.xml	(.../Test.cls.xml)	(revision 35171)
+++ vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender/Verzend/Test.cls.xml	(.../Test.cls.xml)	(revision 35184)
@@ -264,7 +264,7 @@
 <Method name="GeefDataBestandVolledigNaam">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.Files).AppendFile(..GeefAankoopOrderLocatie(),"Data.xml")
+<Implementation><![CDATA[	Quit ##class(TECH.Files).AppendFile(..GeefAankoopOrderLocatie(),"Data2012121100000.xml")
 ]]></Implementation>
 </Method>
 
Index: APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml
===================================================================
diff -u -r35171 -r35184
--- APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml	(.../DataVerzamelaar.cls.xml)	(revision 35171)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml	(.../DataVerzamelaar.cls.xml)	(revision 35184)
@@ -1,13 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar">
-<Super>TECH.RegisteredObject,TECH.Mockable</Super>
+<Super>TECH.RegisteredObject</Super>
 
+<Parameter name="COMSO11">
+<Type>%String</Type>
+<Default>11</Default>
+</Parameter>
+
+<Parameter name="COMSO21">
+<Type>%String</Type>
+<Default>21</Default>
+</Parameter>
+
 <Method name="GeefCOMSO">
 <ReturnType>APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO).%New()
+<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 = ""
+	
+	#dim Key As %String = $Order(^BLExport(""))
+	While (Key '= "")
+	{
+		#dim BLExportLijn As %String = ^BLExport(Key)
+
+		If ($Extract(BLExportLijn,2,3) = ..#COMSO11)
+		{
+			Set Toelevering = ..MaakToelevering(BLExportLijn)
+			Do COMSO.ToeleveringList.Insert(Toelevering)
+		}
+		
+		if $IsObject(Toelevering) && ($Extract(BLExportLijn,2,3) = ..#COMSO21) 
+		{
+			Do Toelevering.ToeleveringDetail.Insert(..MaakToeleveringDetail(BLExportLijn))
+		}
+		
+		Set Key = $Order(^BLExport(Key))
+	}
+	
+	Quit COMSO
 ]]></Implementation>
 </Method>
+
+<Method name="MaakToelevering">
+<FormalSpec>BLExportLijn:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EDIExport.AankoopOrder.BLUM.dto.Toelevering</ReturnType>
+<Implementation><![CDATA[
+	Set Toelevering = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.Toelevering).%New()
+	Set Toelevering.ToeleveringHeader = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringHeader).%New()
+	Set Toelevering.ToeleveringHeader.CustomerNumberForShipment = $Extract(BLExportLijn,4,9)
+	Set Toelevering.ToeleveringHeader.CustomerNumberForInvoice = $Extract(BLExportLijn,12,17)
+	Set Toelevering.ToeleveringHeader.CustomerOrderReference = $Extract(BLExportLijn,20,31)
+	Set Toelevering.ToeleveringHeader.CustomerOrderEntryDate = $Extract(BLExportLijn,54,59)
+	Quit Toelevering
+]]></Implementation>
+</Method>
+
+<Method name="MaakToeleveringDetail">
+<FormalSpec>BLExportLijn:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail</ReturnType>
+<Implementation><![CDATA[
+	#dim ToeleveringDetail As APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail).%New()
+	Set ToeleveringDetail.OrderLineIdentificationCustomer = $Extract(BLExportLijn,4,14)
+	Set ToeleveringDetail.IdentNumberSupplierBAU = $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)
+	Quit ToeleveringDetail
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml
===================================================================
diff -u -r35171 -r35184
--- APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35171)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35184)
@@ -91,7 +91,7 @@
 <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.BELNR = $$$Trim(Toelevering.ToeleveringHeader.CustomerOrderReference)
 	Set ORDERS05.IDOC.E1EDK02.QUALF = "001" ; Customer Purchase order
 ]]></Implementation>
 </Method>
@@ -151,15 +151,15 @@
 <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.POSEX = $$$Trim(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.PEINH = ..BepaalPUINH(ToeleveringDetail.PriceDimension)
+	Set E1EDP01.VPREI = ((E1EDP01.MENGE * E1EDP01.NETWR) / E1EDP01.PEINH ) 
+
 	Set E1EDP01.E1EDP03.SEGMENT = "1"
 	Set E1EDP01.E1EDP03.IDDAT = "002" ; (expected delivery date)
 	Set E1EDP01.E1EDP03.DATUM = "20" _ToeleveringDetail.DeliveryDateAxBUA ; Delivery date
@@ -172,6 +172,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BepaalPUINH">
+<FormalSpec>PriceDimension:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	Quit:PriceDimension="3" 1000
+	Quit:PriceDimension="2" 100
+	Quit:PriceDimension="1" 100
+	Quit 1
+]]></Implementation>
+</Method>
+
 <Method name="VoegToeE1EDP19">
 <Final>1</Final>
 <FormalSpec>E1EDP01:APPS.EDIExport.AankoopOrder.BLUM.XML.E1EDP01,ToeleveringDetail:APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail</FormalSpec>
Index: APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender.cls.xml
===================================================================
diff -u -r35171 -r35184
--- APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender.cls.xml	(.../Verzender.cls.xml)	(revision 35171)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/Verzender.cls.xml	(.../Verzender.cls.xml)	(revision 35184)
@@ -41,7 +41,6 @@
 
 <Method name="Verzend">
 <Implementation><![CDATA[
-	
 	#dim ORDERS05List As %ListOfObjects = ..Converteerder.Converteer(..DataVerzamelaar.GeefCOMSO())
 	
 	#dim BestandLocatie As %String = ..GeefBestandLocatie()
@@ -65,10 +64,13 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(ORDERS05.%ValidateObject())
-
-	#dim BestandVolledigNaam As %String = ##class(TECH.Files).AppendFile(BestandLocatie,"Data.xml")
+	/// Required fields aanpassen
+	///do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(ORDERS05.%ValidateObject())
 	
+	#dim BestandNaam As %String = "Data" _ORDERS05.IDOC.E1EDK03.DATUM _ORDERS05.IDOC.E1EDK02.BELNR _".xml"
+	
+	#dim BestandVolledigNaam As %String = ##class(TECH.Files).AppendFile(BestandLocatie,BestandNaam)
+	
 	#dim FileWriter As TECH.File.FileWriter = ..FileAPI.GeefFileWriter()
 	do FileWriter.Open(BestandVolledigNaam)
 	do FileWriter.WriteXML(ORDERS05)
Index: vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml
===================================================================
diff -u -r35171 -r35184
--- vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml	(.../COMSO.cls.xml)	(revision 35171)
+++ vhTest/Utils/APPS/EDIExport/AankoopOrder/BLUM/dto/COMSO.cls.xml	(.../COMSO.cls.xml)	(revision 35184)
@@ -20,7 +20,7 @@
 	Set ToeleveringDetail.OrderLineIdentificationCustomer = "230123.21" ; ToeleveringsNummer + ToeleveringsLijnNummer
 	Set ToeleveringDetail.OrderQuantity = "1000" ; aantal (opgeslagen in toeleveringslijn)
 	Set ToeleveringDetail.NetPrice = 6.96 ; Netto prijs
-	Set ToeleveringDetail.PriceDimension = 100 ; Geeft x weer. Prijs per x stuks.
+	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" ;