Index: APPS/AKP/AankoopControle/BLUM/impl/VrachtwagenVerwerker.cls.xml
===================================================================
diff -u -r38551 -r38553
--- APPS/AKP/AankoopControle/BLUM/impl/VrachtwagenVerwerker.cls.xml	(.../VrachtwagenVerwerker.cls.xml)	(revision 38551)
+++ APPS/AKP/AankoopControle/BLUM/impl/VrachtwagenVerwerker.cls.xml	(.../VrachtwagenVerwerker.cls.xml)	(revision 38553)
@@ -28,13 +28,6 @@
 <Private>1</Private>
 </Property>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*Method %OnNew(FileAPI As TECH.File.FileAPI = "", FileUtils As TECH.File.FileUtils, VrachtwagenBestandenRepo As APPS.AKP.AankoopControle.BLUM.impl.VrachtwagenBestandenRepo, XmlCorrelater As TECH.XMLCorrelater, VrachtwagenVerwerker As APPS.AKP.AankoopControle.BLUM.VrachtwagenVerwerker) As %Status [ Private, ProcedureBlock = 1, ServerOnly = 1 ]
-      */
-]]></Content>
-</UDLText>
-
 <Method name="%OnNew">
 <FormalSpec>VrachtwagenBestandenRepo:APPS.AKP.AankoopControle.BLUM.impl.VrachtwagenBestandenRepo,XmlCorrelater:TECH.XMLCorrelater</FormalSpec>
 <Private>1</Private>
Index: vhTest/Mock/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2.cls.xml	(revision 38553)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Converteer">
+<FormalSpec>DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<ReturnType>APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Converteer",DELVRY03)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiPallet5Plus.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiPallet5Plus.cls.xml	(revision 0)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiPallet5Plus.cls.xml	(revision 38553)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer.TestMultiPallet5Plus">
+<Super>vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer.Base</Super>
+
+<Method name="aTest">
+<Implementation><![CDATA[
+	#dim Filename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"Bestand.xml")
+	set BerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvangerV2).%New()
+	
+	Set Converteerder = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2).%New()
+	#dim CSBSO As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = Converteerder.Converteer(BerichtOntvanger.LeesXMLBestand(Filename))
+
+	do ..DataExporteerder.ExporteerObject(CSBSO,"Result.txt")
+	
+	do $$$AssertReferentieBestanden(..GeefBestandLocatie())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiDESADV.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiDESADV.cls.xml	(revision 0)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiDESADV.cls.xml	(revision 38553)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer.TestMultiDESADV">
+<Super>vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer.Base</Super>
+
+<Method name="aTest">
+<Implementation><![CDATA[
+	#dim Filename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"Bestand.xml")
+	Set BerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvangerV2).%New()
+	
+	Set Converteerder = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2).%New()
+	#dim CSBSO As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = Converteerder.Converteer(BerichtOntvanger.LeesXMLBestand(Filename))
+
+	do ..DataExporteerder.ExporteerObject(CSBSO,"Result.txt")
+	
+	do $$$AssertReferentieBestanden(..GeefBestandLocatie())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2.cls.xml
===================================================================
diff -u
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2.cls.xml	(revision 0)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2.cls.xml	(revision 38553)
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2">
+<Super>TECH.Mockable</Super>
+
+<Property name="ToeleveringInfoVerzamelaar">
+<Type>APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaarV2</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ToeleveringInfoVerzamelaar:APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaar</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ToeleveringInfoVerzamelaar = $$$Inject(ToeleveringInfoVerzamelaar, ##class(APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaarV2).%New())	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Converteer">
+<FormalSpec>DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<ReturnType>APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</ReturnType>
+<Implementation><![CDATA[
+	#Dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO).%New()
+	#Dim CSBSO11 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011
+	#Dim L20Iterator as TECH.ListIterator
+	#Dim E1EDL20 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20
+	do ..VoegToeCSBSOHeader(CSBSO,DELVRY03)
+	
+	set CSBSO11 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011).%New()
+	do ..VoegToeCSBSO11(CSBSO11,DELVRY03)	
+	do CSBSO.CSBSO11List.Insert(CSBSO11)
+	quit CSBSO
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeCSBSO11">
+<FormalSpec>CSBSO11:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	
+	set CSBSO11.ShipmentID = DELVRY03.IDOC.E1EDL20.GetAt(1).BOLNR
+	set CSBSO11.DeliveryAddress = "Van Hoecke -XL"
+	set CSBSO11.TransportationMode = "L"	
+		
+	#Dim CSBSO21 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021 = ##Class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021).%New()	
+	do ..VoegToeCSBSO21(CSBSO21, DELVRY03)	
+	do CSBSO11.CSBSO21List.Insert(CSBSO21)
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeCSBSO21">
+<FormalSpec>CSBSO21:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#Dim counter as %Integer = 1
+	#Dim L20counter as %Integer = 1
+	#Dim varnaam as %String
+	#Dim E1EDL24Iterator As TECH.ListIterator
+	#Dim E1EDL24 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL24	
+
+	set CSBSO21.ShipmentID = DELVRY03.IDOC.E1EDL20.GetAt(1).BOLNR
+	set CSBSO21.ShipmentDate = ..GeefShipmentDateYYMMDD(DELVRY03.IDOC.E1EDL20.GetAt(1))
+	set CSBSO21.GrosWeight = DELVRY03.IDOC.E1EDL20.GetAt(1).BTGEW
+	set CSBSO21.NetWeight = 0
+	;set CSBSO21.ShiptoCustomerNr = ..GeefShipToCustomerNr(E1EDL20)
+	set CSBSO21.ShiptoCustomerNr = "212250"
+
+	;tel alle BTGEW, europalletten en pakjes op	
+	for L20counter=1:1:DELVRY03.IDOC.E1EDL20.Count(){	
+		set counter = 1
+		set E1EDL24Iterator = ##Class(TECH.ListIterator).%New(DELVRY03.IDOC.E1EDL20.GetAt(L20counter).E1EDL24)		
+		While E1EDL24Iterator.HasNext(){
+			set E1EDL24 = E1EDL24Iterator.Next()
+			Set $Property(CSBSO21,"Colli"_ counter) =  E1EDL24.MATKL
+			Set $Property(CSBSO21,"NrOfColli"_ counter) = $Property(CSBSO21,"NrOfColli"_ counter) +E1EDL24.LGMNG
+			set counter = counter + 1
+		}
+	}
+	
+	#Dim CSBSO31 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031 = ##Class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031).%New()	
+	do ..VoegToeCSBSO31(CSBSO31,DELVRY03)	
+	do CSBSO21.CSBSO31List.Insert(CSBSO31)
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeCSBSO31">
+<FormalSpec>CSBSO31:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#Dim index as %Integer
+	#Dim L20Iterator as TECH.ListIterator
+	#Dim E1EDL20 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20
+
+	set CSBSO31.InvoiceNr = "999999"
+	set CSBSO31.InvoiceType = "99"
+	set CSBSO31.InvoiceDate = ..GeefShipmentDateYYMMDD(DELVRY03.IDOC.E1EDL20.GetAt(1))
+	set CSBSO31.ValutaDate = CSBSO31.InvoiceDate
+	set CSBSO31.Currency = "W30"
+	Set CSBSO31.NetValue = 0
+	set CSBSO31.Tax = 0
+	set CSBSO31.DeliveryCustomerNr = ..GeefShipToCustomerNr(DELVRY03.IDOC.E1EDL20.GetAt(1))
+	set CSBSO31.InvoicingCustomerNr = CSBSO31.DeliveryCustomerNr
+
+	set L20Iterator = ##class(TECH.ListIterator).%New(DELVRY03.IDOC.E1EDL20)
+	while L20Iterator.HasNext(){
+		set E1EDL20 = L20Iterator.Next()
+
+		#Dim E1EDL37Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL20.E1EDL37)
+		#Dim E1EDL37 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL37
+		While E1EDL37Iterator.HasNext(){ ;loop over palletten
+			set E1EDL37 = E1EDL37Iterator.Next()
+			#Dim E1EDL44Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL37.E1EDL44)
+			#Dim E1EDL44 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL44
+			While E1EDL44Iterator.HasNext(){ // producten per pallet
+				set E1EDL44 = E1EDL44Iterator.Next()
+				#Dim arraysleutel as %String = E1EDL44.KDMAT _ E1EDL44.VBELN _ E1EDL44.POSNR
+				if $$$Not(CSBSO31.CSBSO41Array.IsDefined(arraysleutel)) {
+					#Dim CSBSO41 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041).%New()
+					set CSBSO41.ABNr = ..GeefABNr(E1EDL44)
+					set CSBSO41.ABLijnNr = ..GeefABLnNr(E1EDL44)
+					set CSBSO41.OrderLineCompletion = "C"
+					set CSBSO41.SetCode = "E"
+					set CSBSO41.OrderLineCustomer = ..GeefOrderlineCustomer(E1EDL44)
+					set CSBSO41.IdentNr = E1EDL44.KDMAT
+					set CSBSO41.Weigth = 0
+					set CSBSO41.CustomsClassification = "830242"
+					set CSBSO41.UnitOfMeasure = "ST"
+					set CSBSO41.CountryOfOrigin = "AT"
+					set CSBSO41.KundeStamNummer = ..GeefShipToCustomerNr(E1EDL20) ; nu zit deze wel goed in het xml bestand tov V1)
+					do CSBSO31.CSBSO41Array.SetAt(CSBSO41, arraysleutel)
+				} else {
+					set CSBSO41 = CSBSO31.CSBSO41Array.GetAt(arraysleutel)
+				}
+				
+				set CSBSO31.CSBSO41Array.GetAt(arraysleutel).QuantityInvoiced = + CSBSO31.CSBSO41Array.GetAt(arraysleutel).QuantityInvoiced + E1EDL44.VEMNG
+				set CSBSO31.CSBSO41Array.GetAt(arraysleutel).QuantityShipped = CSBSO31.CSBSO41Array.GetAt(arraysleutel).QuantityInvoiced 			
+				do ..ToeleveringInfoVerzamelaar.ZetVHProduktInfo(CSBSO31,CSBSO41,E1EDL44.VBELN, E1EDL44.POSNR,E1EDL44.MATNR)			
+				
+				set CSBSO31.NetValue = CSBSO31.NetValue + CSBSO31.CSBSO41Array.GetAt(arraysleutel).Value
+
+				; dan de pallet info toevoegen: tot 5 palletten op 1 record, dan volgend aanmaken etc.
+				do ..VoorzieCSBSO44(CSBSO41,arraysleutel)
+				for index=1:1:5{
+					if $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"SpecialMarking"_ index) = ""{
+						set $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"SpecialMarking"_ index) = $E( E1EDL37.EXIDV,*-9,*-0)
+						set $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"NumberOfParcels"_ index) = ..GeefNrOfPackages(E1EDL44)
+						set $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"PiecesPerParcels"_ index) = ..GeefPiecesPerPackage(E1EDL44)					
+						quit
+					}
+				}
+			}		
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeCSBSOHeader">
+<FormalSpec>CSBSO:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	;set CSBSO.CSBSOHeader.MIIDEF = "BAU" _ DELVRY03.IDOC.E1EDL20.GetAt(1).VBELN ; eigenlijk transportnr, en niet berichtnummer, maar beter is er niet voor handen.
+	set CSBSO.CSBSOHeader.MIIDEF = "BAU" _ DELVRY03.IDOC.E1EDL20.GetAt(1).BOLNR ; eigenlijk Vrachtwagennr, en niet berichtnummer, maar beter is er niet voor handen.
+	Set CSBSO.CSBSOHeader.LEVNUR = "5005"
+	Set CSBSO.CSBSOHeader.MIINTY = "CSB"
+	Set CSBSO.CSBSOHeader.MIINTS = "SO"
+	Set CSBSO.CSBSOHeader.MINETC = "C"
+	Do ..VoegToeMIOTCR(CSBSO, DELVRY03)
+	Set CSBSO.CSBSOHeader.MITICR = "1200"
+	Set CSBSO.CSBSOHeader.MICOUN = "0"
+	Set CSBSO.CSBSOHeader.MINNCR = ""
+	Set CSBSO.CSBSOHeader.MINNRE = ""
+	Set CSBSO.CSBSOHeader.MIACRQ = "1"
+	Set CSBSO.CSBSOHeader.MESPRO = ""
+]]></Implementation>
+</Method>
+
+<Method name="VoorzieCSBSO44">
+<FormalSpec>CSBSO41:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041,arraysleutel:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	if $$$Not(CSBSO41.CSBSO44List.Count()) {
+		set CSBSO44 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS044).%New()
+		do CSBSO41.CSBSO44List.Insert(CSBSO44)
+	} else {
+		set CSBSO44 = CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count())			
+		;check if this record is 'full' and create new if so
+		if $length(CSBSO44.SpecialMarking5) {
+			set CSBSO44 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS044).%New()				
+			do CSBSO41.CSBSO44List.Insert(CSBSO44)
+		}									
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrderlineCustomer">
+<FormalSpec>E1EDL44:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL44</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#Dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
+	#Dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
+	#Dim orderlinecustomer as %String = ""
+	While (E1EDL46Iterator.HasNext()) && (orderlinecustomer =""){ 
+		set E1EDL46 = E1EDL46Iterator.Next()		
+		set:(E1EDL46.UII = "ZON" ) orderlinecustomer = E1EDL46.SERNR
+	}
+	quit orderlinecustomer
+]]></Implementation>
+</Method>
+
+<Method name="GeefNrOfPackages">
+<FormalSpec>E1EDL44:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL44</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#Dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
+	#Dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
+	#Dim nrofpackages as %Integer = 0
+	While (E1EDL46Iterator.HasNext()) && (nrofpackages = 0){ 
+		set E1EDL46 = E1EDL46Iterator.Next()		
+		set:(E1EDL46.UII = "ZNP" ) nrofpackages = E1EDL46.SERNR
+	}
+	quit nrofpackages
+]]></Implementation>
+</Method>
+
+<Method name="GeefPiecesPerPackage">
+<FormalSpec>E1EDL44:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL44</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#Dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
+	#Dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
+	#Dim pieces as %Integer = 0
+	While (E1EDL46Iterator.HasNext()) && (pieces = 0){ 
+		set E1EDL46 = E1EDL46Iterator.Next()		
+		set:(E1EDL46.UII = "ZQP" ) pieces = E1EDL46.SERNR
+	}
+	quit pieces
+]]></Implementation>
+</Method>
+
+<Method name="GeefABNr">
+<FormalSpec>E1EDL44:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL44</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#Dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
+	#Dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
+	#Dim abnr as %String = ""
+	While (E1EDL46Iterator.HasNext()) && (abnr = ""){ 
+		set E1EDL46 = E1EDL46Iterator.Next()		
+		set:(E1EDL46.UII = "ZVN" ) abnr = E1EDL46.SERNR
+	}
+	quit abnr
+]]></Implementation>
+</Method>
+
+<Method name="GeefABLnNr">
+<FormalSpec>E1EDL44:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL44</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#Dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
+	#Dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
+	#Dim ablnnr as %String = ""
+	While (E1EDL46Iterator.HasNext()) && (ablnnr = ""){ 
+		set E1EDL46 = E1EDL46Iterator.Next()		
+		set:(E1EDL46.UII = "ZVP" ) ablnnr = E1EDL46.SERNR
+	}
+	quit ablnnr
+]]></Implementation>
+</Method>
+
+<Method name="GeefShipToCustomerNr">
+<FormalSpec>E1EDL20:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#Dim E1ADRM1Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL20.E1ADRM1)
+	#Dim E1ADRM1 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1ADRM1
+	
+	#Dim CustomerNr as String = ""
+	
+	While E1ADRM1Iterator.HasNext(){
+		set E1ADRM1 = E1ADRM1Iterator.Next()
+		set:( E1ADRM1.PARTNERQ="DP" ) CustomerNr = E1ADRM1.PARTNERID		
+	}
+	Quit CustomerNr
+]]></Implementation>
+</Method>
+
+<Method name="GeefShipmentDateYYMMDD">
+<FormalSpec>E1EDL20:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#Dim E1EDT13Iterator As TECH.ListIterator
+	#Dim E1EDT13 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDT13
+	#Dim Shipmentdate as %String = ""
+	
+	set E1EDT13Iterator = ##class(TECH.ListIterator).%New(E1EDL20.E1EDT13)
+	While E1EDT13Iterator.HasNext(){
+		set E1EDT13 = E1EDT13Iterator.Next()
+		Set:(E1EDT13.QUALF ="10") Shipmentdate = $EXTRACT(E1EDT13.ISDD ,3,4) _ $EXTRACT(E1EDT13.ISDD,5,6) _ $EXTRACT(E1EDT13.ISDD,7,8)
+	}
+	Quit Shipmentdate
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeMIOTCR">
+<FormalSpec>CSBSO:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	
+	#Dim E1EDL20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(DELVRY03.IDOC.E1EDL20)
+	#Dim E1EDL20 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20
+	
+	#Dim E1EDT13Iterator As TECH.ListIterator
+	#Dim E1EDT13 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDT13
+	
+	While E1EDL20Iterator.HasNext(){
+		set E1EDL20 = E1EDL20Iterator.Next()
+		set E1EDT13Iterator = ##class(TECH.ListIterator).%New(E1EDL20.E1EDT13)
+		While E1EDT13Iterator.HasNext(){
+			set E1EDT13 = E1EDT13Iterator.Next()
+			Set:(E1EDT13.QUALF ="10") CSBSO.CSBSOHeader.MIOTCR = $EXTRACT(E1EDT13.ISDD,7,8) _"-" _$EXTRACT(E1EDT13.ISDD,5,6) _"-" _$EXTRACT(E1EDT13.ISDD,3,4)
+		}
+	}
+	
+	/* ofwel 
+	#Dim ISDD as %String = DELVRY03.IDOC.E1EDL20.GetAt(1).E1EDT13.GetAt(1).ISDD
+	set CSBSO.CSBSOHeader.MIOTCR = $EXTRACT(ISDD,7,8) _"-" _$EXTRACT(ISDD,5,6) _"-" _$EXTRACT(ISDD,3,4)
+	wegens maar één occurence of E1EDL20 en E1EDT13 in een bestand.
+	*/
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaarV2.cls.xml
===================================================================
diff -u
--- APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaarV2.cls.xml	(revision 0)
+++ APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaarV2.cls.xml	(revision 38553)
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaarV2">
+<IncludeCode>vhLib.Macro</IncludeCode>
+<Super>TECH.Mockable</Super>
+
+<Property name="ToeleveringAPI">
+<Type>DOM.AKP.ToeleveringAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BlumProductAPI">
+<Type>DOM.PM.BlumProductAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>BlumProductAPI:DOM.PM.BlumProductAPI,ToeleveringAPI:DOM.AKP.ToeleveringAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..ToeleveringAPI = $$$Inject(ToeleveringAPI,##class(DOM.DomeinContext).Instance().GeefToeleveringAPI())
+	set ..BlumProductAPI = $$$Inject(BlumProductAPI,##class(DOM.PM.impl.BlumProductAPI).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ZetVHProduktInfo">
+<FormalSpec>CSBSO31:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031,CSBSO41:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041,ToeleveringNr:%String,ToeleveringLijnNr:%String,ProductNr:%String</FormalSpec>
+<Implementation><![CDATA[
+	if ..ToeleveringAPI.BestaatToelevering(ToeleveringNr){		
+		#Dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringAPI.GeefToelevering(ToeleveringNr)	
+		#Dim ToeleveringLijnID As %Integer = ToeleveringLijnNr * 100
+		#Dim count as %Integer
+
+		;set CSBSO41.KundeStamNummer = Toelevering.GeefKlantNummerBijLeverancier()
+
+		;het kan een gesplitste lijn zijn
+		for count=0:1:9 {
+			set ToeleveringLijnID = ToeleveringLijnNr * 100 + count
+			quit:Toelevering.BestaatToeleveringLijn(ToeleveringLijnID)
+		}		
+		//haa linfo van toelevering, blum kan iets anders leveren dan we verwachten (vervang product)
+		if Toelevering.BestaatToeleveringLijn(ToeleveringLijnID){
+			#Dim ToeleveringLijn As DOM.AKP.impl.DataM.DataMProductToeleveringLijn = Toelevering.GeefToeleveringLijn(ToeleveringLijnID)	
+			set CSBSO41.ProductNrCustomer = ToeleveringLijn.GeefProductID()
+		} else {
+			#Dim Error As %String = ""
+			if ToeleveringLijnNr = "" {
+				set Error = "Geen lijnnr gespecifieerd voor lijn van toelevering " _ ToeleveringNr _" in xml bestand"
+				set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New(Error)
+				do ##class(TECH.ExceptionHandler).Throw(Exception)	
+
+			} else {
+				// de lijn zit niet meer in KTO : Blum levert te veel of wij hebben de toelevering niet opgesplitst en er is al een deel gerecepteerd en ingeboekt.
+				// daar door is de lijn uit KTO en moeten we product gegevens op andere manier ophalen dan uit KTO.
+				// we gaan er vanuit da Blum hetzelfde product levert als we gevraagd hebben : productnr zit mee in xml bericht.
+				set CSBSO41.ProductNrCustomer = ProductNr
+				//TODO : mail nog te sturen
+				do ..StuurMailNietGesplitsteToeleveringLijn(ToeleveringNr,CSBSO41.IdentNr,CSBSO41.ProductNrCustomer)
+			}
+		}		
+		#Dim Product as DOM.PM.Product = ..BlumProductAPI.GeefProduct(CSBSO41.ProductNrCustomer)
+		;is de prijs die we verwachten -> dummy factuur, prijs die blum gaat rekenen zit niet in despatch bericht.
+		set CSBSO41.Value = CSBSO41.QuantityInvoiced * ..GeefVHProductPrijs(CSBSO41.ProductNrCustomer)
+
+	} else {		
+		if (ToeleveringLijnNr=""){ ;manual order
+			set:(CSBSO41.KundeStamNummer="") CSBSO41.KundeStamNummer = CSBSO31.InvoicingCustomerNr ;geen toelevering om kundestamnummer op te halen, we gebruiken de shipto
+			set CSBSO41.ProductNrCustomer = ..BlumProductAPI.GeefProductIdVolgensIdentNummer(CSBSO41.KundeStamNummer,CSBSO41.IdentNr)
+
+			if ##class(Blum.Product).%ExistsId(CSBSO41.IdentNr) {
+				;Theorische prijs volgens product
+				#Dim BlumProduct as Blum.Product = ##class(Blum.Product).%OpenId(CSBSO41.IdentNr)
+				#Dim ProductPrijs as Blum.ProductPrijs = ##class(Blum.ProductPrijs).%OpenId(CSBSO41.IdentNr_"||"_ $Select(CSBSO31.InvoicingCustomerNr="212250":"E12",1:"E24"))
+				#Dim Rabat as Blum.Rabat = ##class(Blum.Rabat).%OpenId(CSBSO31.InvoicingCustomerNr)
+
+				set CSBSO41.Value = CSBSO41.QuantityInvoiced * ProductPrijs.Prijs / $Select(ProductPrijs.PrijsDimensie="M":1000,ProductPrijs.PrijsDimensie="H":100,1:1 ) 
+				set CSBSO41.Value = CSBSO41.Value * (1- Rabat.KortingsPercentageDefault)
+			} else {
+				;Product niet gevonden, dan zetten we er prijs 0 op. (bvb marketing materiaal zit niet onze producten.
+				set CSBSO41.Value = 0				
+				; alternatief is exception throwen, maar helpt niet echt aan de verwerking.
+				/*
+				set Error = "Product in xml bestand gespecifieerd niet gevonden in Admin"
+				set Error = Error _ $$$CRLF _ "ident nummer "_ CSBSO41.IdentNr
+				set Error = Error _ $$$CRLF _ "productnummer "_ CSBSO41.ProductNrCustomer
+				set Error = Error _ $$$CRLF _ "toelevering " _ ToeleveringNr			
+				set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New(Error)
+				do ##class(TECH.ExceptionHandler).Throw(Exception)	
+				*/
+			}
+		} else { 
+			;voor manuele bestellingen is de toelevering nr opgegegeven als een referentie en lijn nr is leeg, als die dus ingevuld is is er iets fout...
+			set Error = "Toelevering " _ ToeleveringNr _" in xml bestand gespecifieerd niet gevonden in Admin"
+			set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New(Error)
+			do ##class(TECH.ExceptionHandler).Throw(Exception)				
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="StuurMailNietGesplitsteToeleveringLijn">
+<FormalSpec>ToeleveringNummer:%String,IdentNummer:%String,ProductNummer:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim Mail As TECH.Mail.Mail = ""
+	Set Mail = ##class(TECH.Context).Instance().GeefMailAPI().MaakNieuwMail()
+	Do Mail.ZetVerzender( $$$SystemMail("Transportbestand Verwerker") )
+	Do Mail.VoegToeOntvanger( "VDR@vanhoecke.be" )
+	Do Mail.ZetOnderwerp( "Niet gesplitste toeleveringlijn op toelevering " _ ToeleveringNummer )
+	Do Mail.ZetInhoud( "Toeleveringlijn van toelevering "_ ToeleveringNummer _" voor identnummer " _IdentNummer_ "("_ ProductNummer _") niet gevonden. Splitsing?")
+	Do ##class(TECH.Context).Instance().GeefMailAPI().VerstuurMail(Mail)
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductNummer">
+<FormalSpec>IdentNummer:%String,KundeNummer:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	do ##class(vhLib.OldSchool).InitVars()
+	quit $$GETVH^BLPROD(IdentNummer,KundeNummer)
+]]></Implementation>
+</Method>
+
+<Method name="GeefVHProductPrijs">
+<FormalSpec>PRNr:%String</FormalSpec>
+<Implementation><![CDATA[
+	do ##class(vhLib.OldSchool).InitVars()
+	quit $Piece($$VHRec^BLCSBC1(PRNr),"\",13)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/Test.cls.xml	(revision 38553)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test : Converteer BLUM DESPATCH DELVRY03 bericht naar CSBSO metbehulp van dummyfactuurdata">
+<Implementation><![CDATA[
+	#dim VerzamelaarFake As APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaar = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaar).%New()
+	#dim Converteerder As APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2 = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2).%New(VerzamelaarFake)
+	#dim DELVRY03Double As APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03 = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03).%New().GeefDELVRY03()
+	
+	#dim CSBSO As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = Converteerder.Converteer(DELVRY03Double)
+	Do $$$AssertIsObject(CSBSO)
+	Do $$$AssertEquals(CSBSO.CSBSOHeader.MIOTCR,"21-06-16")
+	Do $$$AssertEquals(CSBSO.CSBSOHeader.MIIDEF, "BAU6100003624")
+	
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).ShipmentID,"6100003624")
+	Do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).DeliveryAddress,"Van Hoecke -XL")
+	Do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).TransportationMode,"L")
+	
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).Colli1,"E")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).Colli2,"P")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).Colli3,"")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).Colli4,"")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).Colli5,"")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).GrosWeight,"20758.20")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).NrOfColli1,"66")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).NrOfColli2,"1")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).NrOfColli3,"")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).NrOfColli4,"")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).NrOfColli5,"")
+
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).DeliveryCustomerNr,"212250")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).InvoicingCustomerNr,"212250")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).InvoiceNr,"999999")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).InvoiceType,"99")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).InvoiceDate,"160621")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).ValutaDate,"160621")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).Currency,"W30")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).NetValue,993.4)
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).Tax,0)
+	
+	#dim CSBSO41 as  APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041 = CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).CSBSO41Array.GetAt("0438123420583401")	
+	
+	do $$$AssertIsObject(CSBSO41)
+	do $$$AssertEquals(CSBSO41.ABNr,"779465")
+	do $$$AssertEquals(CSBSO41.ABLijnNr,"01000")
+	do $$$AssertEquals(CSBSO41.CountryOfOrigin,"AT")
+	do $$$AssertEquals(CSBSO41.CustomsClassification,"830242")
+	do $$$AssertEquals(CSBSO41.OrderLineCompletion,"C")
+	do $$$AssertEquals(CSBSO41.SetCode,"E")
+	do $$$AssertEquals(CSBSO41.OrderLineCustomer, "205834.01")
+	do $$$AssertEquals(CSBSO41.IdentNr,"04381234")
+	do $$$AssertEquals(CSBSO41.UnitOfMeasure,"ST")
+	do $$$AssertEquals(CSBSO41.QuantityShipped,"1000")
+	do $$$AssertEquals(CSBSO41.QuantityInvoiced,"1000")
+	do $$$AssertEquals(CSBSO41.ProductNrCustomer,"1070692")
+	do $$$AssertEquals(CSBSO41.Weigth,0)
+	Do $$$AssertEquals(CSBSO41.Value,496.7)	
+	; controleer ook in CSBSO44
+	do $$$AssertEquals(CSBSO41.CSBSO44List.GetAt(1).SpecialMarking1,"0034512494")
+	do $$$AssertEquals(CSBSO41.CSBSO44List.GetAt(1).NumberOfParcels1,"00001")
+	do $$$AssertEquals(CSBSO41.CSBSO44List.GetAt(1).PiecesPerParcels1,"0001000")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiPallet.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiPallet.cls.xml	(revision 0)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiPallet.cls.xml	(revision 38553)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer.TestMultiPallet">
+<Super>vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer.Base</Super>
+
+<Method name="aTest">
+<Implementation><![CDATA[
+	#dim Filename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"Bestand.xml")
+	Set BerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvangerV2).%New()
+	
+	Set Converteerder = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2).%New()
+	#dim CSBSO As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = Converteerder.Converteer(BerichtOntvanger.LeesXMLBestand(Filename))
+
+	do ..DataExporteerder.ExporteerObject(CSBSO,"Result.txt")
+	
+	do $$$AssertReferentieBestanden(..GeefBestandLocatie())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/Base.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/Base.cls.xml	(revision 0)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/Base.cls.xml	(revision 38553)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer.Base">
+<Abstract>1</Abstract>
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	do ##super()
+	do ..Setup()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	do ##class(vhUnitTest.DataHelper).VerwijderToelevering(240024)
+	do ##class(vhUnitTest.DataHelper).VerwijderToelevering(232474)
+	do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProducten(1000,1023)
+	do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="Setup">
+<Private>1</Private>
+<Implementation><![CDATA[
+	do ##class(vhTest.Utils.DOM.PM.Product).CreeerProducten(1000,1023)
+	do ##class(vhUnitTest.DataHelper).VerwijderToelevering(240024)
+	do ##class(vhUnitTest.DataHelper).VerwijderToelevering(232474)
+	
+	set ^KTO(5005,240024,1)="\29.04.13\AB 817.873/STOCK\\\6332\\9365\\\\\\\\\\EUR\62969,61200\\\2\\\\"
+	set $piece(^KTO(5005,240024,1),"\",9)="002250"
+	set ^KTO(5005,240024,101)="\784192\240\\\1030.9\47.1550#0\\1307.47\1307.47\\L\8\4000\800\2474.16\KTRPL\\\\H\EUR\\\16/45\\\\\\\\\\\"
+
+	set ^KTO(5005,232474,1)="\28.09.16\AB 809.307/STOCK\\\5005\\\271250\809307\\\\\\28.09.16\\EUR\\\\\\\\"
+	set ^KTO(5005,232474,101)="\980275\672\\\950\47.1550#0\\3373.644000\3373.644000\\L\81\61100\8100\6384.000000\KTRPL\\\\H\EUR\1120\\16/45\\\\\\\\\\\"
+	
+	do ##class(vhUnitTest.DataHelper).MaakToeleveringCompleet(5005,240024)
+	do ##class(vhUnitTest.DataHelper).MaakToeleveringCompleet(5005,232474)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvangerV2/Ontvang/Test.cls.xml
===================================================================
diff -u -r38542 -r38553
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvangerV2/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 38542)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvangerV2/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 38553)
@@ -101,7 +101,6 @@
 	Set Ontvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvangerV2).%New(,,FileUtilsFake,VrachtwagenBestandenRepoFake,XMLCorrelaterMock,VrachtwagenVerwerkerMock)
 	Do Ontvanger.VerwerkVrachtwagens()
 	
-	;Do XMLCorrelaterMock.Verifieer()
 	Do VrachtwagenVerwerkerMock.Verifieer()
 ]]></Implementation>
 </Method>
Index: vhTest/Fake/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2.cls.xml	(revision 38553)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2</Super>
+
+<Method name="Converteer">
+<FormalSpec>DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<ReturnType>APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>