Index: vhTest/Mock/APPS/AKP/AankoopControle/BLUM/IVOICE02Verwerker.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/AKP/AankoopControle/BLUM/IVOICE02Verwerker.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/AKP/AankoopControle/BLUM/IVOICE02Verwerker.cls.xml	(revision 38653)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.AKP.AankoopControle.BLUM.IVOICE02Verwerker">
+<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.IVOICE02Verwerker,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Verwerk">
+<FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Verwerk",INVOIC02)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml
===================================================================
diff -u -r37273 -r38653
--- APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml	(.../FactuurBerichtOntvanger.cls.xml)	(revision 37273)
+++ APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml	(.../FactuurBerichtOntvanger.cls.xml)	(revision 38653)
@@ -9,7 +9,7 @@
 </Parameter>
 
 <Property name="INVOIC02Verwerker">
-<Type>APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker</Type>
+<Type>APPS.AKP.AankoopControle.BLUM.INVOIC02Verwerker</Type>
 <Private>1</Private>
 </Property>
 
@@ -33,7 +33,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>FileAPI:TECH.File.FileAPI="",FileUtils:TECH.File.FileUtils,XmlCorrelater:TECH.XMLCorrelater,INVOIC02Verwerker:APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker,ZendingService:APPS.AKP.Zending.ZendingService</FormalSpec>
+<FormalSpec>FileAPI:TECH.File.FileAPI="",FileUtils:TECH.File.FileUtils,XmlCorrelater:TECH.XMLCorrelater,INVOIC02Verwerker:APPS.AKP.AankoopControle.BLUM.INVOIC02Verwerker,ZendingService:APPS.AKP.Zending.ZendingService</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -44,7 +44,12 @@
 	set ..FileAPI = $$$Inject(FileAPI,##class(TECH.Context).Instance().GeefFileAPI())
 	Set ..FileUtils = $$$Inject(FileUtils,##class(TECH.File.impl.FileUtils).%New())
 	set ..XmlCorrelater = $$$Inject(XmlCorrelater,##class(TECH.XMLCorrelater).%New())
-	set ..INVOIC02Verwerker = $$$Inject(INVOIC02Verwerker,##class(APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New())
+	if ##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportSAPBasedXML")="1" {
+		set ..INVOIC02Verwerker = $$$Inject(INVOIC02Verwerker,##class(APPS.AKP.AankoopControle.BLUM.impl.INVOIC02VerwerkerV2).%New())
+	} else {
+		set ..INVOIC02Verwerker = $$$Inject(INVOIC02Verwerker,##class(APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New())
+	}
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -68,7 +73,6 @@
 <FormalSpec>BestandVolledigeNaam:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	
 	try{
 		Do ..Logger.Info("Factuurberichten verwerken",BestandVolledigeNaam)
 		#Dim INVOIC02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02 = ..LeesXMLBestand(BestandVolledigeNaam)
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml
===================================================================
diff -u -r37139 -r38653
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 37139)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 38653)
@@ -8,12 +8,20 @@
 <Private>1</Private>
 </Property>
 
+<Property name="SAPBasedXML">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	do ##super()
 	Set ..ImportXML = ##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportXML")
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",1)
+	
+	Set ..SAPBasedXML = ##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportSAPBasedXML")
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportSAPBasedXML",0)
 ]]></Implementation>
 </Method>
 
@@ -22,6 +30,7 @@
 <Implementation><![CDATA[
 	do ##super()
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",..ImportXML)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportSAPBasedXML",..SAPBasedXML)
 ]]></Implementation>
 </Method>
 
Index: APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker.cls.xml
===================================================================
diff -u -r38210 -r38653
--- APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker.cls.xml	(.../INVOIC02Verwerker.cls.xml)	(revision 38210)
+++ APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker.cls.xml	(.../INVOIC02Verwerker.cls.xml)	(revision 38653)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker">
-<Super>TECH.Mockable</Super>
+<Super>APPS.AKP.AankoopControle.BLUM.INVOIC02Verwerker,TECH.Mockable</Super>
 
 <Parameter name="BlumLevNr">
 <Type>%String</Type>
Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvangerV2.cls.xml
===================================================================
diff -u -r38604 -r38653
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvangerV2.cls.xml	(.../DespatchBerichtOntvangerV2.cls.xml)	(revision 38604)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvangerV2.cls.xml	(.../DespatchBerichtOntvangerV2.cls.xml)	(revision 38653)
@@ -73,6 +73,7 @@
 </Method>
 
 <Method name="VerwerkVrachtwagens">
+<ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
 	#Dim count as %Integer = 0
 	#Dim VrachtwagenBestandIterator as TECH.Iterator
@@ -95,7 +96,7 @@
 			Quit
 		}
 	}	
-	Do ..Logger.Info("Transportberichten verwerken V2","Einde verwerken vrachtwagens")
+	Do ..Logger.Info("Transportberichten verwerken V2","Einde verwerken " _ count _ " vrachtwagens")
 	
 	quit $$$Not(count = 0)
 ]]></Implementation>
Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml
===================================================================
diff -u -r37598 -r38653
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml	(.../DespatchBerichtOntvanger.cls.xml)	(revision 37598)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml	(.../DespatchBerichtOntvanger.cls.xml)	(revision 38653)
@@ -60,6 +60,8 @@
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
 	Quit:(##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportXML")'="1") ##class(%ListOfObjects).%New()	
+	; quit indien DespatchBerichtOntvangerV2 ingeschakeld
+	Quit:(##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportSAPBasedXML")="1") ##class(%ListOfObjects).%New()
 	Do ..Logger.Info("XML Transportberichten verwerken","Begin inlezen bestanden")		
 	#Dim BestandenList = ..GeefTeVerwerkenBestanden()
 	#Dim BestandenListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(BestandenList)
Index: APPS/AKP/AankoopControle/BLUM/INVOIC02Verwerker.cls.xml
===================================================================
diff -u
--- APPS/AKP/AankoopControle/BLUM/INVOIC02Verwerker.cls.xml	(revision 0)
+++ APPS/AKP/AankoopControle/BLUM/INVOIC02Verwerker.cls.xml	(revision 38653)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.AKP.AankoopControle.BLUM.INVOIC02Verwerker">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="Verwerk">
+<Abstract>1</Abstract>
+<FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/AKP/AankoopControle/BLUM/impl/INVOIC02VerwerkerV2.cls.xml
===================================================================
diff -u -r38647 -r38653
--- APPS/AKP/AankoopControle/BLUM/impl/INVOIC02VerwerkerV2.cls.xml	(.../INVOIC02VerwerkerV2.cls.xml)	(revision 38647)
+++ APPS/AKP/AankoopControle/BLUM/impl/INVOIC02VerwerkerV2.cls.xml	(.../INVOIC02VerwerkerV2.cls.xml)	(revision 38653)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.AKP.AankoopControle.BLUM.impl.INVOIC02VerwerkerV2">
-<Super>TECH.Mockable</Super>
+<Super>APPS.AKP.AankoopControle.BLUM.INVOIC02Verwerker,TECH.Mockable</Super>
 
 <Parameter name="BlumLevNr">
 <Type>%String</Type>