Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Service/Bewaar/Test.cls.xml
===================================================================
diff -u -r37065 -r37139
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Service/Bewaar/Test.cls.xml	(.../Test.cls.xml)	(revision 37065)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Service/Bewaar/Test.cls.xml	(.../Test.cls.xml)	(revision 37139)
@@ -67,16 +67,18 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test : Bewaar COASO en zet Toeleveringslijn met vervallen datum als Verwerkt">
+<Method name="Test : Bewaar COASO en zet Toeleveringslijn met vervallen datum niet als Verwerkt">
 <Implementation><![CDATA[
 	#Dim KopieerderDummy As vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Kopieerder = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Kopieerder).%New()
 	#Dim COASOMetVervallenDatumDouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASOMetVervallenDatum()
 	
+	;Vervallen lijnen mogen niet meer als verwerkt gezet worden, dienen manueel behandeld te worden.
+	
 	Do ..BLOrdRspService.Bewaar(COASOMetVervallenDatumDouble)
 
 	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"")
 	Do ..BLOrdRspService.KopieerNaarBLimp()
-	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"1")
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger/Ontvang/Test.cls.xml
===================================================================
diff -u -r36615 -r37139
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 36615)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 37139)
@@ -3,6 +3,28 @@
 <Class name="vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger.Ontvang.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="ImportXML">
+<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)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	do ##super()
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",..ImportXML)
+]]></Implementation>
+</Method>
+
 <Method name="Test : INVOIC02Verwerker-Verwerk wordt opgeroepen">
 <Implementation><![CDATA[
 	#dim VolledigeBestandNaam1 As %String = ..GeefFactuurBestandLocatie() _"INVOIC_dummy.xml"	
Index: APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml
===================================================================
diff -u -r36829 -r37139
--- APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml	(.../FactuurBerichtOntvanger.cls.xml)	(revision 36829)
+++ APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml	(.../FactuurBerichtOntvanger.cls.xml)	(revision 37139)
@@ -51,6 +51,7 @@
 
 <Method name="Ontvang">
 <Implementation><![CDATA[
+	Quit:(##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportXML")'="1") $$$OK
 	Do ..Logger.Info("Factuurberichten verwerken","Begin inlezen bestanden")
 	#Dim BestandenList = ..GeefTeVerwerkenBestanden()
 	#Dim BestandenListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(BestandenList)
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Service/VerwijderToelevering/Test.cls.xml
===================================================================
diff -u -r37038 -r37139
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Service/VerwijderToelevering/Test.cls.xml	(.../Test.cls.xml)	(revision 37038)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Service/VerwijderToelevering/Test.cls.xml	(.../Test.cls.xml)	(revision 37139)
@@ -7,6 +7,28 @@
 <Type>vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService</Type>
 </Property>
 
+<Property name="ImportXML">
+<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)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	do ##super()
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",..ImportXML)
+]]></Implementation>
+</Method>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>TestName:%String</FormalSpec>
 <Implementation><![CDATA[
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Service/UpdateVerwerkVlag/Test.cls.xml
===================================================================
diff -u -r37038 -r37139
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Service/UpdateVerwerkVlag/Test.cls.xml	(.../Test.cls.xml)	(revision 37038)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Service/UpdateVerwerkVlag/Test.cls.xml	(.../Test.cls.xml)	(revision 37139)
@@ -7,6 +7,28 @@
 <Type>vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService</Type>
 </Property>
 
+<Property name="ImportXML">
+<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)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	do ##super()
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",..ImportXML)
+]]></Implementation>
+</Method>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>TestName:%String</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml
===================================================================
diff -u -r36900 -r37139
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml	(.../DespatchBerichtOntvanger.cls.xml)	(revision 36900)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml	(.../DespatchBerichtOntvanger.cls.xml)	(revision 37139)
@@ -59,7 +59,8 @@
 <Method name="Ontvang">
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
-	Do ..Logger.Info("Transportberichten verwerken","Begin inlezen bestanden")
+	Quit:(##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportXML")'="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: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml
===================================================================
diff -u -r36366 -r37139
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 36366)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 37139)
@@ -3,6 +3,28 @@
 <Class name="vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger.Ontvang.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="ImportXML">
+<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)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	do ##super()
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",..ImportXML)
+]]></Implementation>
+</Method>
+
 <Method name="Test : Converteer wordt opgeroepen">
 <Implementation><![CDATA[
 	#dim VolledigeBestandNaam1 As %String = ..GeefDespatchFileLocatie() _"DESADV_dummy.xml"	
@@ -16,9 +38,11 @@
 	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
 	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanDoeNiks()
+
+	#dim BewaarderFake as vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+
+	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock,BewaarderFake)
 	
-	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock)
-	
 	Do Ontvanger.Ontvang()
 
 	do ConverteerderMock.Verifieer()
@@ -34,9 +58,11 @@
 	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
 	#dim XMLCorrelaterMock As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanDoeNiks()
+
+	#dim BewaarderFake as vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+
+	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterMock,BewaarderFake)
 	
-	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterMock)
-	
 	Do Ontvanger.Ontvang()
 	Do XMLCorrelaterMock.Verifieer()
 ]]></Implementation>
@@ -58,9 +84,11 @@
 	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanException($$$DummyException)
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam2,ClassName,"DELVRY03").DanDoeNiks()
-	
-	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock)
-	
+
+	#dim BewaarderFake as vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+
+	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock,BewaarderFake)
+
 	Do Ontvanger.Ontvang()
 
 	Do $$$AssertFalse(FileUtilsFake.FileExists(VolledigeBestandNaam1))
@@ -85,9 +113,11 @@
 	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
 	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanException($$$DummyException)
+
+	#dim BewaarderFake as vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+
+	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock,BewaarderFake)
 	
-	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock)
-	
 	Do Ontvanger.Ontvang()
 
 	Do $$$AssertFalse(FileUtilsFake.FileExists(VolledigeBestandNaam1))
@@ -110,7 +140,9 @@
 	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanDoeNiks()
 	
-	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock)
+	#dim BewaarderFake as vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+
+	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock,BewaarderFake)
 	
 	Do Ontvanger.Ontvang()
 
@@ -129,12 +161,14 @@
 	#dim ConverteerderMock as vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder).%New()
 	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).%New().GeefCSBSO()
 	do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(CSBSO)
+		 
+	#dim BewaarderFake as vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
 
 	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
 	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.VerwachtMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanDoeNiks()
 	
-	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock)
+	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock,BewaarderFake)
 	
 	Do Ontvanger.Ontvang()
 	Do XMLCorrelaterStub.Verifieer()
Index: BLIMP.mac.rou
===================================================================
diff -u -r37042 -r37139
--- BLIMP.mac.rou	(.../BLIMP.mac.rou)	(revision 37042)
+++ BLIMP.mac.rou	(.../BLIMP.mac.rou)	(revision 37139)
@@ -104,6 +104,9 @@
  . . Set Import=""
  . Else  Do
  . . Set Import=$$^vhTXTPOP("BLIMP","REDO",,$P(R,D,3)_"-"_$P(R,D,4),MsgId,$P(R,D,6))
+ ;skip importing COA and CSB if we're on xml files
+ Set ImportingXMLFiles=##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportXML")
+ Set:ImportingXMLFiles Import=$Select($Piece(R,D,3)="COA":"",$Piece(R,D,3)="CSB":"",1:Import)
  
  If Import Do
  . Set MsgNr=+$O(^BLImp(MsgNr),-1)+1
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Ontvanger/Ontvang/Test.cls.xml
===================================================================
diff -u -r37038 -r37139
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Ontvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 37038)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Ontvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 37139)
@@ -36,8 +36,10 @@
 	#dim XMLCorrelaterMock As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterMock.IndienMethodCall("GeefObjectVanBestand", $$$ElkeWaarde,$$$ElkeWaarde, $$$ElkeWaarde).DanDoeNiks()
 	
-	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock)
+	Set BLOrdRspService = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).%New()
 	
+	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock,,BLOrdRspService)
+	
 	Do $$$AssertEquals(Ontvanger.Ontvang().Count(),1)
 ]]></Implementation>
 </Method>
@@ -52,8 +54,9 @@
 	#dim ClassName As %String = "APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05"
 	#dim XMLCorrelaterMock As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand", VolledigeBestandNaam,ClassName,"ORDERS05").DanDoeNiks()
+	Set BLOrdRspService = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).%New()
 	
-	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock)
+	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock,,BLOrdRspService)
 	
 	Do Ontvanger.Ontvang()
 	Do XMLCorrelaterMock.Verifieer()
@@ -73,9 +76,10 @@
 	#dim XMLCorrelaterMock As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterMock.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"ORDERS05").DanException($$$DummyException)
 	Do XMLCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand", VolledigeBestandNaam2,ClassName,"ORDERS05").DanDoeNiks()
+	Set BLOrdRspService = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).%New()
+
+	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock,,BLOrdRspService)
 	
-	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock)
-	
 	Do Ontvanger.Ontvang()
 	Do XMLCorrelaterMock.Verifieer()
 ]]></Implementation>
@@ -91,8 +95,10 @@
 	#dim ClassName As %String = "APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05"
 	#dim XMLCorrelaterMock As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterMock.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"ORDERS05").DanException($$$DummyException)
+
+	Set BLOrdRspService = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).%New()
 	
-	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock)
+	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock,,BLOrdRspService)
 	
 	Do Ontvanger.Ontvang()
 
@@ -114,8 +120,9 @@
 	#dim ClassName As %String = "APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05"
 	#dim XMLCorrelaterMock As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterMock.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam,ClassName,"ORDERS05").DanDoeNiks()
+	Set BLOrdRspService = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).%New()
 
-	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock,ConverteerderMock)
+	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock,ConverteerderMock,BLOrdRspService)
 	
 	Do Ontvanger.Ontvang()
 	Do ConverteerderMock.Verifieer()
@@ -139,7 +146,7 @@
 
 	#dim BewaarderMock As vhTest.Mock.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Service = ##class(vhTest.Mock.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Service).%New()
 	Do BewaarderMock.VerwachtMethodCall("Bewaar",COASODummy).DanDoeNiks()
-	
+
 	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock,ConverteerderMock,BewaarderMock)
 	
 	Do Ontvanger.Ontvang()
Index: APPS/EDIExport/AankoopOrderResponse/BLUM/impl/BLOrdRspService.cls.xml
===================================================================
diff -u -r37031 -r37139
--- APPS/EDIExport/AankoopOrderResponse/BLUM/impl/BLOrdRspService.cls.xml	(.../BLOrdRspService.cls.xml)	(revision 37031)
+++ APPS/EDIExport/AankoopOrderResponse/BLUM/impl/BLOrdRspService.cls.xml	(.../BLOrdRspService.cls.xml)	(revision 37139)
@@ -73,6 +73,9 @@
 	#dim eersteindexvoortlnr = 0
 	#dim indexoudste as %integer = 0
 	#dim ToeleveringsLijnNummer as %String = ""
+	
+	Quit:(##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportXML")'="1")	
+	
 	set ToeleveringsLijnNummer = (ToeleveringsUniekLijnNummer\100)
 
 	quit:$$$Not($data(@..#Global(ToeleveringsNummer,ToeleveringsLijnNummer)))
@@ -112,13 +115,16 @@
 
 <Method name="VerwijderToelevering">
 <FormalSpec>ToeleveringsNummer:%String</FormalSpec>
-<Implementation><![CDATA[	Kill @..#Global(ToeleveringsNummer)
+<Implementation><![CDATA[
+	Quit:(##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportXML")'="1")
+	Kill @..#Global(ToeleveringsNummer)
 ]]></Implementation>
 </Method>
 
 <Method name="KopieerNaarBLimp">
 <Implementation><![CDATA[
-	Do ..ZetVervallenLijnenAlsVerwerkt()
+	; vervallen lijnen moeten blijven -> zijn niet geleverd en moeten manueel behandeld worden
+	; Do ..ZetVervallenLijnenAlsVerwerkt() 
 	Do ..Kopieerder.Kopieer()
 ]]></Implementation>
 </Method>