Index: vhTestFiles/UnitTests/APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer/TestMultiPallet/Test/Result.txt
===================================================================
diff -u -r38606 -r39516
--- vhTestFiles/UnitTests/APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer/TestMultiPallet/Test/Result.txt	(.../Result.txt)	(revision 38606)
+++ vhTestFiles/UnitTests/APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer/TestMultiPallet/Test/Result.txt	(.../Result.txt)	(revision 39516)
@@ -18,7 +18,7 @@
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].CountryOfOrigin = AT
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].CustomsClassification = 830242
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].IdentNr = 01965130
-CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].KundeStamNummer = 271250
+CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].KundeStamNummer = 212250
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].OrderLineCompletion = C
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].OrderLineCustomer = 232474.81
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].ProductNrCustomer = 980275
@@ -48,7 +48,7 @@
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].CountryOfOrigin = AT
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].CustomsClassification = 830242
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].IdentNr = 04158368
-CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].KundeStamNummer = 271250
+CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].KundeStamNummer = 212250
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].OrderLineCompletion = C
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].OrderLineCustomer = 240024.08
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].ProductNrCustomer = 784192
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiPallet.cls.xml
===================================================================
diff -u -r38606 -r39516
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiPallet.cls.xml	(.../TestMultiPallet.cls.xml)	(revision 38606)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiPallet.cls.xml	(.../TestMultiPallet.cls.xml)	(revision 39516)
@@ -7,8 +7,8 @@
 <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()
+	Set Verzamelaar = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaarV2).%New()
+	Set Converteerder = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2).%New(Verzamelaar)
 	#dim CSBSO As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = Converteerder.Converteer(BerichtOntvanger.LeesXMLBestand(Filename))
 
 	do ..DataExporteerder.ExporteerObject(CSBSO,"Result.txt")
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiDESADV.cls.xml
===================================================================
diff -u -r38646 -r39516
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiDESADV.cls.xml	(.../TestMultiDESADV.cls.xml)	(revision 38646)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiDESADV.cls.xml	(.../TestMultiDESADV.cls.xml)	(revision 39516)
@@ -7,8 +7,8 @@
 <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()
+	Set Verzamelaar = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaarV2).%New()
+	Set Converteerder = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2).%New(Verzamelaar)
 	#dim CSBSO As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = Converteerder.Converteer(BerichtOntvanger.LeesXMLBestand(Filename))
 
 	do ..DataExporteerder.ExporteerObject(CSBSO,"Result.txt")
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder/Converteer/TestMultiPallet.cls.xml
===================================================================
diff -u -r37660 -r39516
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder/Converteer/TestMultiPallet.cls.xml	(.../TestMultiPallet.cls.xml)	(revision 37660)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder/Converteer/TestMultiPallet.cls.xml	(.../TestMultiPallet.cls.xml)	(revision 39516)
@@ -7,8 +7,9 @@
 <Implementation><![CDATA[
 	#dim Filename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"Bestand.xml")
 	set BerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New()
+	Set VerzamelaarFake = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaar).%New()
 	
-	Set Converteerder = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder).%New()
+	Set Converteerder = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder).%New(VerzamelaarFake)
 	#dim CSBSO As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = Converteerder.Converteer(BerichtOntvanger.LeesXMLBestand(Filename))
 
 	do ..DataExporteerder.ExporteerObject(CSBSO,"Result.txt")
Index: vhTest/Fake/APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaar.cls.xml
===================================================================
diff -u -r38087 -r39516
--- vhTest/Fake/APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaar.cls.xml	(.../ToeleveringInfoVerzamelaar.cls.xml)	(revision 38087)
+++ vhTest/Fake/APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaar.cls.xml	(.../ToeleveringInfoVerzamelaar.cls.xml)	(revision 39516)
@@ -11,29 +11,34 @@
 <FormalSpec>CSBSO31:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031,CSBSO41:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041,ToeleveringNr:%String,ToeleveringLijnNr:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	set CSBSO41.ProductNrCustomer = 1070692
-	set CSBSO41.Value = 496.7
-	Quit ""
-]]></Implementation>
-</Method>
+	if ((ToeleveringNr = "240024") & (ToeleveringLijnNr = "08")) {
+		set CSBSO41.ProductNrCustomer = 784192
+		set CSBSO41.Value = 5.4478 * CSBSO41.QuantityInvoiced
 
-<Method name="GeefProductNummer">
-<FormalSpec>IdentNummer:%String,KundeNummer:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ""
+	} elseif ((ToeleveringNr = "232474") & (ToeleveringLijnNr = "81")){
+		set CSBSO41.ProductNrCustomer = 980275
+		set CSBSO41.Value = 5.0203 * CSBSO41.QuantityInvoiced
+	} elseif ((ToeleveringNr = "205834") & (ToeleveringLijnNr = "01")){
+		set CSBSO41.ProductNrCustomer = 1070692
+		set CSBSO41.Value = 0.4967 * CSBSO41.QuantityInvoiced
+	} else {
+		w !,"Default"
+		set CSBSO41.ProductNrCustomer = 1070692
+		set CSBSO41.Value = 496.7 * CSBSO41.QuantityInvoiced
+	}
+	
+	Set CSBSO41.KundeStamNummer=$Select(CSBSO41.ProductNrCustomer = 784192: "002250",1:"271250")
 ]]></Implementation>
 </Method>
 
 <Method name="GeefVHProductPrijs">
 <FormalSpec>PRNr:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="StuurMailNietGesplitsteToeleveringLijn">
 <FormalSpec>ToeleveringNummer:%String,IdentNummer:%String,ProductNummer:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: vhTestFiles/UnitTests/APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer/TestMultiPallet5Plus/Test/Result.txt
===================================================================
diff -u -r38606 -r39516
--- vhTestFiles/UnitTests/APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer/TestMultiPallet5Plus/Test/Result.txt	(.../Result.txt)	(revision 38606)
+++ vhTestFiles/UnitTests/APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2.Converteer/TestMultiPallet5Plus/Test/Result.txt	(.../Result.txt)	(revision 39516)
@@ -33,7 +33,7 @@
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].CountryOfOrigin = AT
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].CustomsClassification = 830242
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].IdentNr = 01965130
-CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].KundeStamNummer = 271250
+CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].KundeStamNummer = 212250
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].OrderLineCompletion = C
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].OrderLineCustomer = 232474.81
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0196513023247481].ProductNrCustomer = 980275
@@ -63,7 +63,7 @@
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].CountryOfOrigin = AT
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].CustomsClassification = 830242
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].IdentNr = 04158368
-CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].KundeStamNummer = 271250
+CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].KundeStamNummer = 212250
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].OrderLineCompletion = C
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].OrderLineCustomer = 240024.08
 CSBSO11List[1].CSBSO21List[1].CSBSO31List[1].CSBSO41Array[0415836824002408].ProductNrCustomer = 784192
Index: vhTest/Fake/APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaarV2.cls.xml
===================================================================
diff -u -r38608 -r39516
--- vhTest/Fake/APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaarV2.cls.xml	(.../ToeleveringInfoVerzamelaarV2.cls.xml)	(revision 38608)
+++ vhTest/Fake/APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaarV2.cls.xml	(.../ToeleveringInfoVerzamelaarV2.cls.xml)	(revision 39516)
@@ -9,19 +9,41 @@
 
 <Method name="GeefVHProductPrijs">
 <FormalSpec>PRNr:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="GeefVHProductPrijsxxx">
+<FormalSpec>PRNr:%String</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="StuurMailNietGesplitsteToeleveringLijn">
 <FormalSpec>ToeleveringNummer:%String,IdentNummer:%String,ProductNummer:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></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 ((ToeleveringNr = "240024") & (ToeleveringLijnNr = "08")) {
+		set CSBSO41.ProductNrCustomer = 784192
+		set CSBSO41.Value = 5.4478 * CSBSO41.QuantityInvoiced
+		
+	} elseif ((ToeleveringNr = "232474") & (ToeleveringLijnNr = "81")){
+		set CSBSO41.ProductNrCustomer = 980275
+		set CSBSO41.Value = 5.0203 * CSBSO41.QuantityInvoiced
+		
+	} elseif ((ToeleveringNr = "205834") & (ToeleveringLijnNr = "01")){
+		set CSBSO41.ProductNrCustomer = 1070692
+		set CSBSO41.Value = 0.4967 * CSBSO41.QuantityInvoiced
+		
+	} else {
+		set CSBSO41.ProductNrCustomer = 1070692
+		set CSBSO41.Value = 496.7 * CSBSO41.QuantityInvoiced
+	}
+	
+	;Set CSBSO41.KundeStamNummer=$Select(CSBSO41.ProductNrCustomer = 784192: "002250",1:"271250")
+	Set CSBSO41.KundeStamNummer=212250
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiPallet5Plus.cls.xml
===================================================================
diff -u -r38606 -r39516
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiPallet5Plus.cls.xml	(.../TestMultiPallet5Plus.cls.xml)	(revision 38606)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerderV2/Converteer/TestMultiPallet5Plus.cls.xml	(.../TestMultiPallet5Plus.cls.xml)	(revision 39516)
@@ -7,8 +7,8 @@
 <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()
+	Set Verzamelaar = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaarV2).%New()
+	Set Converteerder = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerderV2).%New(Verzamelaar)
 	#dim CSBSO As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = Converteerder.Converteer(BerichtOntvanger.LeesXMLBestand(Filename))
 
 	do ..DataExporteerder.ExporteerObject(CSBSO,"Result.txt")
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder/Converteer/TestMultiPallet5Plus.cls.xml
===================================================================
diff -u -r37660 -r39516
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder/Converteer/TestMultiPallet5Plus.cls.xml	(.../TestMultiPallet5Plus.cls.xml)	(revision 37660)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder/Converteer/TestMultiPallet5Plus.cls.xml	(.../TestMultiPallet5Plus.cls.xml)	(revision 39516)
@@ -5,15 +5,19 @@
 
 <Method name="Test">
 <Implementation><![CDATA[
+	w !, "begin test"
 	#dim Filename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"Bestand.xml")
 	set BerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New()
+	Set VerzamelaarFake = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaar).%New()
+	;Set VerzamelaarFake = ##class(APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaar).%New()
 	
-	Set Converteerder = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder).%New()
+	Set Converteerder = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder).%New(VerzamelaarFake)
 	#dim CSBSO As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = Converteerder.Converteer(BerichtOntvanger.LeesXMLBestand(Filename))
 
 	do ..DataExporteerder.ExporteerObject(CSBSO,"Result.txt")
 	
 	do $$$AssertReferentieBestanden(..GeefBestandLocatie())
+	w !, "einde test"
 ]]></Implementation>
 </Method>
 </Class>