Index: vhTest/Fake/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/BLOrdRspService.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/BLOrdRspService.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/EDIExport/AankoopOrderResponse/BLUM/impl/BLOrdRspService.cls.xml	(revision 37032)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService">
+<Super>APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService</Super>
+
+<Parameter name="Global">
+<Type>%String</Type>
+<Default>..MultiDim</Default>
+</Parameter>
+
+<Property name="MultiDim">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
+<Method name="Setup">
+<FormalSpec>MultiDim:%String</FormalSpec>
+<Implementation><![CDATA[
+	Kill ..MultiDim
+	Merge ..MultiDim = MultiDim
+]]></Implementation>
+</Method>
+
+<Method name="ZetTestData">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Data:%String</FormalSpec>
+<Implementation><![CDATA[	set Data(0) = ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/APPS/EDIExport/AankoopOrderResponse/BLUM/BLOrdRspService.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/EDIExport/AankoopOrderResponse/BLUM/BLOrdRspService.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/EDIExport/AankoopOrderResponse/BLUM/BLOrdRspService.cls.xml	(revision 37032)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.EDIExport.AankoopOrderResponse.BLUM.BLOrdRspService">
+<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.EDIExport.AankoopOrderResponse.BLUM.BLOrdRspService,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Bewaar">
+<FormalSpec>COASO:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Bewaar",COASO)
+]]></Implementation>
+</Method>
+
+<Method name="KopieerNaarBLimp">
+<Implementation><![CDATA[	do ..VerwerkMethodCall("KopieerNaarBLimp")
+]]></Implementation>
+</Method>
+
+<Method name="SchrijfHeader">
+<FormalSpec>Record:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("SchrijfHeader",Record)
+]]></Implementation>
+</Method>
+
+<Method name="SchrijfToeleveringHeader">
+<FormalSpec>ToeleveringNr:%String,Record:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("SchrijfToeleveringHeader",ToeleveringNr,Record)
+]]></Implementation>
+</Method>
+
+<Method name="SchrijfToeleveringLijn">
+<FormalSpec>ToeleveringNr:%String,ToeleveringLijnNr:%String,lijnnr:%Integer,Record:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("SchrijfToeleveringLijn",ToeleveringNr,ToeleveringLijnNr,lijnnr,Record)
+]]></Implementation>
+</Method>
+
+<Method name="UpdateVerwerkVlag">
+<FormalSpec>ToeleveringsNummer:%String,ToeleveringsUniekLijnNummer:%String,Aantal:%String,LeverDatum:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("UpdateVerwerkVlag",ToeleveringsNummer,ToeleveringsUniekLijnNummer,Aantal,LeverDatum)
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderToelevering">
+<FormalSpec>ToeleveringsNummer:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderToelevering",ToeleveringsNummer)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EDIExport/AankoopOrderResponse/Migratie/ImporteerLaatsteCOAInBLOrdRsp.cls.xml
===================================================================
diff -u -r37005 -r37032
--- APPS/EDIExport/AankoopOrderResponse/Migratie/ImporteerLaatsteCOAInBLOrdRsp.cls.xml	(.../ImporteerLaatsteCOAInBLOrdRsp.cls.xml)	(revision 37005)
+++ APPS/EDIExport/AankoopOrderResponse/Migratie/ImporteerLaatsteCOAInBLOrdRsp.cls.xml	(.../ImporteerLaatsteCOAInBLOrdRsp.cls.xml)	(revision 37032)
@@ -8,18 +8,18 @@
 </Property>
 
 <Property name="BLOrdRspService">
-<Type>APPS.EDIExport.AankoopOrderResponse.Migratie.BLOrdRspService</Type>
+<Type>APPS.EDIExport.AankoopOrderResponse.BLUM.BLOrdRspService</Type>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>BLImpService:APPS.EDIExport.AankoopOrderResponse.Migratie.BLImpService,BLOrdRspService:APPS.EDIExport.AankoopOrderResponse.Migratie.BLOrdRspService</FormalSpec>
+<FormalSpec>BLImpService:APPS.EDIExport.AankoopOrderResponse.Migratie.BLImpService,BLOrdRspService:APPS.EDIExport.AankoopOrderResponse.BLUM.BLOrdRspService</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..BLImpService = $$$Inject(BLImpService,##class(APPS.EDIExport.AankoopOrderResponse.Migratie.impl.BLImpService).%New())
-	set ..BLOrdRspService = $$$Inject(BLOrdRspService,##class(APPS.EDIExport.AankoopOrderResponse.Migratie.impl.BLOrdRspService).%New())
+	set ..BLOrdRspService = $$$Inject(BLOrdRspService,##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -35,19 +35,19 @@
 	Set berichtindex = ..BLImpService.GeefRecentsteVerwerktCOABerichtIndex()
 	Do ##class(Tools.Wlip).%New(207).String("ID geimporteerd COA bericht "_ berichtindex)
 	if berichtindex {
-		do ..BLOrdRspService.ZetBerichtHeader(..BLImpService.GeefBerichtHeader(berichtindex))
+		do ..BLOrdRspService.SchrijfHeader(..BLImpService.GeefBerichtHeader(berichtindex))
 		set berichtlijnen = ..BLImpService.GeefBerichtLijnen(berichtindex)
 		set berichtlijnIterator = ##class(TECH.ListIterator).%New(berichtlijnen)
 		while berichtlijnIterator.HasNext() {
 			set lijn = berichtlijnIterator.Next()
 			
 			if ..GeefTypeVanLijn(lijn) = "11" {
 				Set ToeleveringVanHeader = ..GeefToeleveringNrVanLijn(lijn)
-				Do ..BLOrdRspService.ZetToeleveringHeader(ToeleveringVanHeader,lijn)
+				Do ..BLOrdRspService.SchrijfToeleveringHeader(ToeleveringVanHeader,lijn)
 				Set lijnnr = 0
 			} elseif ..GeefTypeVanLijn(lijn) = "22" {
 				set lijnnr = lijnnr + 1
-				Do ..BLOrdRspService.ZetToeleveringLijn(ToeleveringVanHeader,..GeefToeleveringLijnNrVanLijn(lijn),lijnnr,lijn)				
+				Do ..BLOrdRspService.SchrijfToeleveringLijn(ToeleveringVanHeader,..GeefToeleveringLijnNrVanLijn(lijn),lijnnr,lijn)				
 			} else {
 				;onbekend lijn type voor dit bericht, negeren
 			}
Index: APPS/EDIExport/AankoopOrderResponse/BLUM/BLOrdRspService.cls.xml
===================================================================
diff -u
--- APPS/EDIExport/AankoopOrderResponse/BLUM/BLOrdRspService.cls.xml	(revision 0)
+++ APPS/EDIExport/AankoopOrderResponse/BLUM/BLOrdRspService.cls.xml	(revision 37032)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDIExport.AankoopOrderResponse.BLUM.BLOrdRspService">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="Bewaar">
+<Abstract>1</Abstract>
+<FormalSpec>COASO:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO</FormalSpec>
+</Method>
+
+<Method name="UpdateVerwerkVlag">
+<Abstract>1</Abstract>
+<FormalSpec>ToeleveringsNummer:%String,ToeleveringsUniekLijnNummer:%String,Aantal:%String,LeverDatum:%String</FormalSpec>
+</Method>
+
+<Method name="VerwijderToelevering">
+<Abstract>1</Abstract>
+<FormalSpec>ToeleveringsNummer:%String</FormalSpec>
+</Method>
+
+<Method name="KopieerNaarBLimp">
+<Abstract>1</Abstract>
+</Method>
+
+<Method name="SchrijfToeleveringLijn">
+<Abstract>1</Abstract>
+<FormalSpec>ToeleveringNr:%String,ToeleveringLijnNr:%String,lijnnr:%Integer,Record:%String</FormalSpec>
+</Method>
+
+<Method name="SchrijfToeleveringHeader">
+<Abstract>1</Abstract>
+<FormalSpec>ToeleveringNr:%String,Record:%String</FormalSpec>
+</Method>
+
+<Method name="SchrijfHeader">
+<Abstract>1</Abstract>
+<FormalSpec>Record:%String</FormalSpec>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder.cls.xml
===================================================================
diff -u -r36674 -r37032
--- vhTest/Mock/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder.cls.xml	(.../Kopieerder.cls.xml)	(revision 36674)
+++ vhTest/Mock/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder.cls.xml	(.../Kopieerder.cls.xml)	(revision 37032)
@@ -6,7 +6,7 @@
 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.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder,Tools.Mock.MockClassBase</Super>
+<Super>APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Kopieerder,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
 <Method name="Kopieer">
Index: vhTest/Fake/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service.cls.xml
===================================================================
diff -u -r37018 -r37032
--- vhTest/Fake/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service.cls.xml	(.../Service.cls.xml)	(revision 37018)
+++ vhTest/Fake/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service.cls.xml	(.../Service.cls.xml)	(revision 37032)
@@ -5,12 +5,11 @@
 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.EDIExport.AankoopOrderResponse.impl.BLUM.Service</Super>
+<Super>APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService</Super>
 
 <Method name="Bewaar">
 <FormalSpec>COASO:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Ontvanger/Ontvang/Test.cls.xml
===================================================================
diff -u -r36809 -r37032
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Ontvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 36809)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Ontvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 37032)
@@ -36,7 +36,7 @@
 	#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.impl.BLUM.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock)
+	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock)
 	
 	Do $$$AssertEquals(Ontvanger.Ontvang().Count(),1)
 ]]></Implementation>
@@ -53,7 +53,7 @@
 	#dim XMLCorrelaterMock As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand", VolledigeBestandNaam,ClassName,"ORDERS05").DanDoeNiks()
 	
-	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock)
+	#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()
@@ -74,7 +74,7 @@
 	Do XMLCorrelaterMock.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"ORDERS05").DanException($$$DummyException)
 	Do XMLCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand", VolledigeBestandNaam2,ClassName,"ORDERS05").DanDoeNiks()
 	
-	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock)
+	#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()
@@ -92,7 +92,7 @@
 	#dim XMLCorrelaterMock As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterMock.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"ORDERS05").DanException($$$DummyException)
 	
-	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock)
+	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock)
 	
 	Do Ontvanger.Ontvang()
 
@@ -115,7 +115,7 @@
 	#dim XMLCorrelaterMock As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterMock.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam,ClassName,"ORDERS05").DanDoeNiks()
 
-	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.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)
 	
 	Do Ontvanger.Ontvang()
 	Do ConverteerderMock.Verifieer()
@@ -140,7 +140,7 @@
 	#dim BewaarderMock As vhTest.Mock.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(vhTest.Mock.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
 	Do BewaarderMock.VerwachtMethodCall("Bewaar",COASODummy).DanDoeNiks()
 	
-	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock,ConverteerderMock,BewaarderMock)
+	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock,ConverteerderMock,BewaarderMock)
 	
 	Do Ontvanger.Ontvang()
 	Do BewaarderMock.Verifieer()
@@ -165,7 +165,7 @@
 	#dim BewaarderMock As vhTest.Mock.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(vhTest.Mock.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
 	Do BewaarderMock.IndienMethodCall("Bewaar",$$$ElkeWaarde).DanDoeNiks()
 	
-	#dim Ontvanger As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger).%New(,FileUtilsFake,XMLCorrelaterMock,ConverteerderMock,BewaarderMock)
+	#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: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/Migratie/ImporteerLaatsteCOAInBLOrdRsp/Test.cls.xml
===================================================================
diff -u -r36949 -r37032
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/Migratie/ImporteerLaatsteCOAInBLOrdRsp/Test.cls.xml	(.../Test.cls.xml)	(revision 36949)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/Migratie/ImporteerLaatsteCOAInBLOrdRsp/Test.cls.xml	(.../Test.cls.xml)	(revision 37032)
@@ -8,7 +8,7 @@
 </Property>
 
 <Property name="BLOrdRspService">
-<Type>vhTest.Mock.APPS.EDIExport.AankoopOrderResponse.Migratie.BLOrdRspService</Type>
+<Type>vhTest.Mock.APPS.EDIExport.AankoopOrderResponse.BLUM.BLOrdRspService</Type>
 </Property>
 
 <Property name="BLImpService">
@@ -19,7 +19,7 @@
 <FormalSpec>TestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(TestName)
-	Set ..BLOrdRspService = ##class(vhTest.Mock.APPS.EDIExport.AankoopOrderResponse.Migratie.BLOrdRspService).%New()	
+	Set ..BLOrdRspService = ##class(vhTest.Mock.APPS.EDIExport.AankoopOrderResponse.BLUM.BLOrdRspService).%New()	
 	Set ..BLImpService = ##class(vhTest.Mock.APPS.EDIExport.AankoopOrderResponse.Migratie.BLImpService).%New()
 
 	set ..Importeerder = ##class(APPS.EDIExport.AankoopOrderResponse.Migratie.ImporteerLaatsteCOAInBLOrdRsp).%New(..BLImpService,..BLOrdRspService)
@@ -38,12 +38,14 @@
 
 <Method name="Test: Importeer vraagt de Header op van het recentste verwerkte COA bericht">
 <Implementation><![CDATA[
+	
 	#dim lijnen as List of %String = ##class(%ListOfDataTypes).%New()
 	Do ..BLImpService.VerwachtMethodCall("GeefRecentsteVerwerktCOABerichtIndex").DanReturn(1)
 	Do ..BLImpService.VerwachtMethodCall("GeefBerichtHeader",1).DanReturn("dit is de header")
 	Do ..BLImpService.IndienMethodCall("GeefBerichtLijnen",1).DanReturn(lijnen)
-	Do ..BLOrdRspService.IndienMethodCall("ZetBerichtHeader","dit is de header").DanDoeNiks()
 	
+	Do ..BLOrdRspService.IndienMethodCall("SchrijfHeader","dit is de header").DanDoeNiks()
+	
 	Do ..Importeerder.Importeer()
 	
 	Do ..BLImpService.Verifieer()
@@ -56,7 +58,7 @@
 	Do ..BLImpService.IndienMethodCall("GeefRecentsteVerwerktCOABerichtIndex").DanReturn(1)
 	Do ..BLImpService.IndienMethodCall("GeefBerichtHeader",1).DanReturn("dit is de header")
 	Do ..BLImpService.IndienMethodCall("GeefBerichtLijnen",1).DanReturn(lijnen)
-	Do ..BLOrdRspService.VerwachtMethodCall("ZetBerichtHeader","dit is de header").DanDoeNiks()
+	Do ..BLOrdRspService.VerwachtMethodCall("SchrijfHeader","dit is de header").DanDoeNiks()
 	
 	Do ..Importeerder.Importeer()
 	
@@ -69,7 +71,7 @@
 	#dim lijnen as List of %String = ##class(%ListOfDataTypes).%New()
 	Do ..BLImpService.VerwachtMethodCall("GeefRecentsteVerwerktCOABerichtIndex").DanReturn(1)
 	Do ..BLImpService.VerwachtMethodCall("GeefBerichtHeader",1).DanReturn("dit is de header")
-	Do ..BLOrdRspService.IndienMethodCall("ZetBerichtHeader","dit is de header").DanDoeNiks()
+	Do ..BLOrdRspService.IndienMethodCall("SchrijfHeader","dit is de header").DanDoeNiks()
 	Do ..BLImpService.VerwachtMethodCall("GeefBerichtLijnen",1).DanReturn(lijnen)
 	
 	Do ..Importeerder.Importeer()
@@ -87,16 +89,16 @@
 	
 	Set ..Importeerder = ##class(APPS.EDIExport.AankoopOrderResponse.Migratie.ImporteerLaatsteCOAInBLOrdRsp).%New(MyBLImpService,..BLOrdRspService)	
 
-	Do ..BLOrdRspService.VerwachtMethodCall("ZetBerichtHeader","BAU804996\5005\COA\SO\C\14-09-16\1200\9\\\1\1")
-	Do ..BLOrdRspService.VerwachtMethodCall("ZetToeleveringHeader","209822","""112712500127125001209822      000804995      W30G L 160914                     """)
-	Do ..BLOrdRspService.VerwachtMethodCall("ZetToeleveringLijn","209822","01",1,"""22209822.01       0378220500001440000290.63216101923V      0000000.00          """)
-	Do ..BLOrdRspService.VerwachtMethodCall("ZetToeleveringLijn","209822","02",2,"""22209822.02       0417985200000920000331.46216100323V      0000000.00          """)
-	Do ..BLOrdRspService.VerwachtMethodCall("ZetToeleveringLijn","209822","02",3,"""22209822.02       0417985200001000000331.46216101023V      0000000.00          """)
-	Do ..BLOrdRspService.VerwachtMethodCall("ZetToeleveringLijn","209822","03",4,"""22209822.03       0424438400000000000331.462      00V      0000000.00          """)
-	Do ..BLOrdRspService.VerwachtMethodCall("ZetToeleveringLijn","209822","04",5,"""22209822.04       0251181000000000000295.842      00V      0000000.00          """)
-	Do ..BLOrdRspService.VerwachtMethodCall("ZetToeleveringLijn","209822","05",6,"""22209822.05       0253367100000000000295.842      00V      0000000.00          """)
-	Do ..BLOrdRspService.VerwachtMethodCall("ZetToeleveringHeader","209823","""112712500127125001209823      000804996      W30G L 160914                     """)
-	Do ..BLOrdRspService.VerwachtMethodCall("ZetToeleveringLijn","209823","01",1,"""22209823.01       0378220500001440000290.63216101923V      0000000.00          """)
+	Do ..BLOrdRspService.VerwachtMethodCall("SchrijfHeader","BAU804996\5005\COA\SO\C\14-09-16\1200\9\\\1\1")
+	Do ..BLOrdRspService.VerwachtMethodCall("SchrijfToeleveringHeader","209822","""112712500127125001209822      000804995      W30G L 160914                     """)
+	Do ..BLOrdRspService.VerwachtMethodCall("SchrijfToeleveringLijn","209822","01",1,"""22209822.01       0378220500001440000290.63216101923V      0000000.00          """)
+	Do ..BLOrdRspService.VerwachtMethodCall("SchrijfToeleveringLijn","209822","02",2,"""22209822.02       0417985200000920000331.46216100323V      0000000.00          """)
+	Do ..BLOrdRspService.VerwachtMethodCall("SchrijfToeleveringLijn","209822","02",3,"""22209822.02       0417985200001000000331.46216101023V      0000000.00          """)
+	Do ..BLOrdRspService.VerwachtMethodCall("SchrijfToeleveringLijn","209822","03",4,"""22209822.03       0424438400000000000331.462      00V      0000000.00          """)
+	Do ..BLOrdRspService.VerwachtMethodCall("SchrijfToeleveringLijn","209822","04",5,"""22209822.04       0251181000000000000295.842      00V      0000000.00          """)
+	Do ..BLOrdRspService.VerwachtMethodCall("SchrijfToeleveringLijn","209822","05",6,"""22209822.05       0253367100000000000295.842      00V      0000000.00          """)
+	Do ..BLOrdRspService.VerwachtMethodCall("SchrijfToeleveringHeader","209823","""112712500127125001209823      000804996      W30G L 160914                     """)
+	Do ..BLOrdRspService.VerwachtMethodCall("SchrijfToeleveringLijn","209823","01",1,"""22209823.01       0378220500001440000290.63216101923V      0000000.00          """)
 
 	Do ..Importeerder.Importeer()
 	
Index: vhTest/Mock/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service.cls.xml
===================================================================
diff -u -r37018 -r37032
--- vhTest/Mock/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service.cls.xml	(.../Service.cls.xml)	(revision 37018)
+++ vhTest/Mock/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service.cls.xml	(.../Service.cls.xml)	(revision 37032)
@@ -6,7 +6,7 @@
 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.EDIExport.AankoopOrderResponse.impl.BLUM.Service,Tools.Mock.MockClassBase</Super>
+<Super>APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
 <Method name="Bewaar">
Index: vhTest/Fake/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder.cls.xml
===================================================================
diff -u -r35399 -r37032
--- vhTest/Fake/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35399)
+++ vhTest/Fake/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 37032)
@@ -5,7 +5,7 @@
 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.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder</Super>
+<Super>APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder</Super>
 
 <Method name="Converteer">
 <FormalSpec>ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Ontvanger/SubClass.cls.xml
===================================================================
diff -u -r36777 -r37032
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Ontvanger/SubClass.cls.xml	(.../SubClass.cls.xml)	(revision 36777)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Ontvanger/SubClass.cls.xml	(.../SubClass.cls.xml)	(revision 37032)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger.SubClass">
-<Super>APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Ontvanger</Super>
+<Super>APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Ontvanger</Super>
 
 <Method name="GeefTeVerwerkenBestanden">
 <ReturnType>%ListOfObjects</ReturnType>
Index: vhTest/Utils/APPS/EDIExport/AankoopOrderResponse/BLUM/dto/COASO.cls.xml
===================================================================
diff -u -r36805 -r37032
--- vhTest/Utils/APPS/EDIExport/AankoopOrderResponse/BLUM/dto/COASO.cls.xml	(.../COASO.cls.xml)	(revision 36805)
+++ vhTest/Utils/APPS/EDIExport/AankoopOrderResponse/BLUM/dto/COASO.cls.xml	(.../COASO.cls.xml)	(revision 37032)
@@ -32,7 +32,7 @@
 	Set ToeleveringDetail.ReasonCode = "V"
 	Set ToeleveringDetail.PriceDimension = "2"
 	Set ToeleveringDetail.NetPrice = "0000216.01"
-	Set ToeleveringDetail.OrderLineIdentificationCustomer = "277799.01  "
+	Set ToeleveringDetail.OrderLineIdentificationCustomer = "277788.02  "
 	Set ToeleveringDetail.IdentNumberSupplierBAU = "09002253"
 	Set ToeleveringDetail.DelDateCode = "2"
 	Do Toelevering.ToeleveringDetail.Insert(ToeleveringDetail)
Index: vhTest/Mock/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder.cls.xml
===================================================================
diff -u -r35399 -r37032
--- vhTest/Mock/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 35399)
+++ vhTest/Mock/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder.cls.xml	(.../Converteerder.cls.xml)	(revision 37032)
@@ -6,7 +6,7 @@
 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.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder,Tools.Mock.MockClassBase</Super>
+<Super>APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
 <Method name="Converteer">
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service/UpdateVerwerkVlag/Test.cls.xml
===================================================================
diff -u -r36900 -r37032
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service/UpdateVerwerkVlag/Test.cls.xml	(.../Test.cls.xml)	(revision 36900)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service/UpdateVerwerkVlag/Test.cls.xml	(.../Test.cls.xml)	(revision 37032)
@@ -3,68 +3,60 @@
 <Class name="vhUnitTest.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service.UpdateVerwerkVlag.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="OnBeforeAllTests">
-<Implementation><![CDATA[
-	Do ##super()
-	Lock +^BLOrdRsp
-]]></Implementation>
-</Method>
+<Property name="BLOrdRspService">
+<Type>vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService</Type>
+</Property>
 
-<Method name="OnAfterAllTests">
+<Method name="OnBeforeOneTest">
+<FormalSpec>TestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	Lock -^BLOrdRsp
-	Do ##super()
+	Do ##super(TestName)
+	Set ..BLOrdRspService = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).%New()
+	#dim BLOrdRspData As TECH.MultiDim
+ 	Do ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).ZetTestData(.BLOrdRspData)
+	Do ..BLOrdRspService.Setup(.BLOrdRspData)
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Toeleveringslijn is niet veranderd na het zetten van de verwerkvlag op 1">
 <Implementation><![CDATA[
 	#Dim COASODouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASOGesplitsteLijn()
-	#Dim Service As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
 	#Dim Piece1VoorDeTest as %String	
-	Do Service.Bewaar(COASODouble)
+	Do ..BLOrdRspService.Bewaar(COASODouble)
 
-	set Piece1VoorDeTest = $Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\","1")
+	set Piece1VoorDeTest = $Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","1")
+	
+	Do ..BLOrdRspService.UpdateVerwerkVlag("277788",100,"0000300","200106")	
 
-	Do Service.UpdateVerwerkVlag(Service.ToeleveringNummer,100 * Service.ToeleveringLijnNummer,"0000300","200106")
-
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\","1"),Piece1VoorDeTest)
-
-	Kill ^BLOrdRsp(Service.ToeleveringNummer)
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","1"),Piece1VoorDeTest)
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Zet de verwerkvlag op 1 van een toeleveringslijn">
 <Implementation><![CDATA[
 	#Dim COASODouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASOGesplitsteLijn()
-	#Dim Service As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
 	
-	Do Service.Bewaar(COASODouble)
+	Do ..BLOrdRspService.Bewaar(COASODouble)
 
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\","2"),"")
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"")
 	
-	Do Service.UpdateVerwerkVlag(Service.ToeleveringNummer,100 * Service.ToeleveringLijnNummer,"0000300","200106")
-
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\","2"),"1")
-
-	Kill ^BLOrdRsp(Service.ToeleveringNummer)
+	Do ..BLOrdRspService.UpdateVerwerkVlag("277788",100,"0000300","200106")
+	
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"1")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Zet de verwerkvlag op 1 van een gesplitste toeleveringslijn">
 <Implementation><![CDATA[
 	#Dim COASODouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASOGesplitsteLijn()
-	#Dim Service As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
 	
-	Do Service.Bewaar(COASODouble)
+	Do ..BLOrdRspService.Bewaar(COASODouble)
 
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,2),"\","2"),"")
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,2),"\","2"),"")
 
-	Do Service.UpdateVerwerkVlag(Service.ToeleveringNummer,100 * Service.ToeleveringLijnNummer,"0000700","200108")
+	Do ..BLOrdRspService.UpdateVerwerkVlag("277788",100,"0000700","200108")
 
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,2),"\","2"),"1")
-
-	Kill ^BLOrdRsp(Service.ToeleveringNummer)
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,2),"\","2"),"1")
 ]]></Implementation>
 </Method>
 
@@ -73,19 +65,16 @@
 	#Dim COASODouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASOGesplitsteLijn()
 	Set COASODouble.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).OrderQuantity = "0000666"
 	Set COASODouble.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(2).OrderQuantity = "0000667"
-	#Dim Service As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
 	
-	Do Service.Bewaar(COASODouble)
+	Do ..BLOrdRspService.Bewaar(COASODouble)
 
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\","2"),"")
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,2),"\","2"),"")
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"")
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,2),"\","2"),"")
 
-	Do Service.UpdateVerwerkVlag(Service.ToeleveringNummer,100 * Service.ToeleveringLijnNummer,"0000500","200108")
+	Do ..BLOrdRspService.UpdateVerwerkVlag("277788",100,"0000500","200108")
 
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\","2"),"1")
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,2),"\","2"),"")
-
-	Kill ^BLOrdRsp(Service.ToeleveringNummer)
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"1")
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,2),"\","2"),"")
 ]]></Implementation>
 </Method>
 
@@ -94,36 +83,29 @@
 	#Dim COASODouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASOGesplitsteLijn()
 	Set COASODouble.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA = "200131"
 	Set COASODouble.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(2).DeliveryDateAxBUA = "200108"
-	#Dim Service As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
 	
-	Do Service.Bewaar(COASODouble)
+	Do ..BLOrdRspService.Bewaar(COASODouble)
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"")
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,2),"\","2"),"")
 
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\","2"),"")
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,2),"\","2"),"")
+	Do ..BLOrdRspService.UpdateVerwerkVlag("277788",100,"0000500","160105")
 
-	Do Service.UpdateVerwerkVlag(Service.ToeleveringNummer,100 * Service.ToeleveringLijnNummer,"0000500","160105")
-
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\","2"),"")
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,2),"\","2"),"1")
-
-	Kill ^BLOrdRsp(Service.ToeleveringNummer)
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"")
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,2),"\","2"),"1")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Zet de verwerkvlag op 1 van de enigste toeleveringslijn met verschillend aantal en datum ">
 <Implementation><![CDATA[
 	#Dim COASODouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASOMetEenToeleveringLijn()
-	#Dim Service As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
 	
-	Do Service.Bewaar(COASODouble)
+	Do ..BLOrdRspService.Bewaar(COASODouble)
 
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\","2"),"")
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"")
 
-	Do Service.UpdateVerwerkVlag(Service.ToeleveringNummer,100 * Service.ToeleveringLijnNummer,"0000200","160110")
+	Do ..BLOrdRspService.UpdateVerwerkVlag("277788",100,"0000200","160110")
 
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\","2"),"1")
-
-	Kill ^BLOrdRsp(Service.ToeleveringNummer)
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"1")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Fake/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder.cls.xml
===================================================================
diff -u -r36900 -r37032
--- vhTest/Fake/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder.cls.xml	(.../Kopieerder.cls.xml)	(revision 36900)
+++ vhTest/Fake/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder.cls.xml	(.../Kopieerder.cls.xml)	(revision 37032)
@@ -5,7 +5,7 @@
 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.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder</Super>
+<Super>APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Kopieerder</Super>
 
 <Method name="Kopieer">
 <Implementation><![CDATA[]]></Implementation>
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder/Kopieer/Test.cls.xml
===================================================================
diff -u -r36805 -r37032
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder/Kopieer/Test.cls.xml	(.../Test.cls.xml)	(revision 36805)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Kopieerder/Kopieer/Test.cls.xml	(.../Test.cls.xml)	(revision 37032)
@@ -41,7 +41,7 @@
 	Set ^BLOrdRsp(222483,"04",5)="""22222483.04       0251181000000000000295.842      00V      0000000.00          """
 	Set ^BLOrdRsp(222483,"05",6)="""22222483.05       0253367100000000000295.842      00V      0000000.00          """
 	
-	#Dim Kopieerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder  = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder).%New()
+	#Dim Kopieerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder  = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Kopieerder).%New()
 	
 	Do Kopieerder.Kopieer()
 	
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service/Bewaar/Test.cls.xml
===================================================================
diff -u -r36900 -r37032
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service/Bewaar/Test.cls.xml	(.../Test.cls.xml)	(revision 36900)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service/Bewaar/Test.cls.xml	(.../Test.cls.xml)	(revision 37032)
@@ -3,92 +3,83 @@
 <Class name="vhUnitTest.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service.Bewaar.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="BLOrdRspService">
+<Type>vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService</Type>
+</Property>
+
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
+	
 	Do ##super()
-	Lock +^BLOrdRsp
+	Set ..BLOrdRspService = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).%New()
+	#dim BLOrdRspData As TECH.MultiDim
+ 	Do ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).ZetTestData(.BLOrdRspData)
+	Do ..BLOrdRspService.Setup(.BLOrdRspData)
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterAllTests">
-<Implementation><![CDATA[
-	Lock -^BLOrdRsp
-	Do ##super()
+<Implementation><![CDATA[	Do ##super()
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Bewaar COASO header in BLOrdRsp">
 <Implementation><![CDATA[
 	#Dim COASODouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASO()
-	#Dim Service As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
+		
+	Do ..BLOrdRspService.Bewaar(COASODouble)
 	
-	Do Service.Bewaar(COASODouble)
-	
-	Do $$$AssertTrue($DATA(^BLOrdRsp(0)))
-	Do $$$AssertEquals(^BLOrdRsp(0),"BAU16558\5005\COA\SO\C\17-06-20\2200\0\BRANDL A.\ROOS\1\1")
-
-	Kill ^BLOrdRsp(0)
+	Do $$$AssertTrue($DATA(..BLOrdRspService.MultiDim(0)))
+	Do $$$AssertEquals(..BLOrdRspService.MultiDim(0),"BAU16558\5005\COA\SO\C\17-06-20\2200\0\BRANDL A.\ROOS\1\1")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Bewaar COASO Toeleveringheader in BLOrdRsp">
 <Implementation><![CDATA[
 	#Dim COASODouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASO()
-	#Dim Service As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
 	
-	Do Service.Bewaar(COASODouble)
+	Do ..BLOrdRspService.Bewaar(COASODouble)
 	
-	Do $$$AssertTrue($DATA(^BLOrdRsp(Service.ToeleveringNummer)))
-	Do $$$AssertEquals(^BLOrdRsp(Service.ToeleveringNummer),"""112122500121225001277788      000745532      W30G L 151221                     """)
-
-	Kill ^BLOrdRsp(Service.ToeleveringNummer)
+	Do $$$AssertTrue($DATA(..BLOrdRspService.MultiDim("277788")))
+	Do $$$AssertEquals(..BLOrdRspService.MultiDim("277788"),"""112122500121225001277788      000745532      W30G L 151221                     """)
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Bewaar COASO Toeleveringdetail in BLOrdRsp">
 <Implementation><![CDATA[
 	#Dim COASODouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASO()
-	#Dim Service As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
 	
-	Do Service.Bewaar(COASODouble)
-	
-	Do $$$AssertTrue($DATA(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1)))
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\",1),"""22277788.01       0900225300005000000016.0122001062 V      0000000.00          """)
+	Do ..BLOrdRspService.Bewaar(COASODouble)
 
-	Kill ^BLOrdRsp(Service.ToeleveringNummer)
+	Do $$$AssertTrue($DATA(..BLOrdRspService.MultiDim("277788",1,1)))
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\",1),"""22277788.01       0900225300005000000016.0122001062 V      0000000.00          """)
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Bewaar COASO met meerdere detaillijnen in BLOrdRsp">
 <Implementation><![CDATA[
 	#Dim COASODouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASO()
-	#Dim Service As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
 	
-	Do Service.Bewaar(COASODouble)
+	Do ..BLOrdRspService.Bewaar(COASODouble)
 	
-	Do $$$AssertTrue($DATA(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1)))
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\",1),"""22277788.01       0900225300005000000016.0122001062 V      0000000.00          """)
+	Do $$$AssertTrue($DATA(..BLOrdRspService.MultiDim("277788",1,1)))
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\",1),"""22277788.01       0900225300005000000016.0122001062 V      0000000.00          """)
 
-	Do $$$AssertTrue($DATA(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,2)))
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,2),"\",1),"""22277799.01       0900225300010000000216.0122001082 V      0000236.01          """)
-
-	Kill ^BLOrdRsp(Service.ToeleveringNummer)
+	Do $$$AssertTrue($DATA(..BLOrdRspService.MultiDim("277788",2,2)))
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",2,2),"\",1),"""22277788.02       0900225300010000000216.0122001082 V      0000236.01          """)
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Bewaar COASO en zet Toeleveringslijn met vervallen datum als Verwerkt">
 <Implementation><![CDATA[
 	#Dim KopieerderDummy As vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Kopieerder).%New()
 	#Dim COASOMetVervallenDatumDouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASOMetVervallenDatum()
-	#Dim Service As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New(,KopieerderDummy)
 	
-	Do Service.Bewaar(COASOMetVervallenDatumDouble)
+	Do ..BLOrdRspService.Bewaar(COASOMetVervallenDatumDouble)
 
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\","2"),"")
-	Do Service.KopieerNaarBLimp()
-	Do $$$AssertEquals($Piece(^BLOrdRsp(Service.ToeleveringNummer,Service.ToeleveringLijnNummer,1),"\","2"),"1")
-
-	Kill ^BLOrdRsp(Service.ToeleveringNummer)
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"")
+	Do ..BLOrdRspService.KopieerNaarBLimp()
+	Do $$$AssertEquals($Piece(..BLOrdRspService.MultiDim("277788",1,1),"\","2"),"1")
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder.cls.xml
===================================================================
diff -u
--- APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder.cls.xml	(revision 0)
+++ APPS/EDIExport/AankoopOrderResponse/BLUM/impl/Converteerder.cls.xml	(revision 37032)
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="Converteer">
+<FormalSpec>ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
+<ReturnType>APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO</ReturnType>
+<Implementation><![CDATA[
+	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).%New()
+
+	#dim Toelevering As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering).%New()
+
+	Do ..VoegToeHeader(COASO, ORDERS05)
+	Do ..VoegToeToeleveringHeader(Toelevering, ORDERS05)
+	Do ..VoegToeCustomerOrderEntryDate(Toelevering, ORDERS05)
+	Do ..VoegToeCustomerNumbers(Toelevering, ORDERS05)	 
+	Do ..VoegToeToeleveringDetails(Toelevering, ORDERS05)	
+	
+	Do COASO.ToeleveringList.Insert(Toelevering)
+	Quit COASO
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeHeader">
+<FormalSpec>COASO:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO,ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set COASO.COASOHeader.MIIDEF = "BAU" _ ORDERS05.IDOC.E1EDK01.BELNR 
+	Set COASO.COASOHeader.LEVNUR = "5005"
+	Set COASO.COASOHeader.MIINTY = "COA"
+	Set COASO.COASOHeader.MIINTS = "SO"
+	Set COASO.COASOHeader.MINETC = "C"
+	Do ..VoegToeMIOTCR(COASO, ORDERS05)
+	Set COASO.COASOHeader.MITICR = "1200"
+	Set COASO.COASOHeader.MICOUN = "0"
+	Set COASO.COASOHeader.MINNCR = ""
+	Set COASO.COASOHeader.MINNRE = ""
+	Set COASO.COASOHeader.MIACRQ = "1"
+	Set COASO.COASOHeader.MESPRO = ""
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeToeleveringHeader">
+<FormalSpec>Toelevering:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering,ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Toelevering.ToeleveringHeader.InternalOrderNumberBLUM = ORDERS05.IDOC.E1EDK01.BELNR
+	Set Toelevering.ToeleveringHeader.CustomerOrderReference = ORDERS05.IDOC.E1EDK02.BELNR
+	Set Toelevering.ToeleveringHeader.ReasonCode = "G "
+	Set Toelevering.ToeleveringHeader.TransportationMode = "L "
+	Set Toelevering.ToeleveringHeader.CurrencyInCOScode = "W30"
+	Set Toelevering.ToeleveringHeader.AverageTransportTime = "000"
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeMIOTCR">
+<FormalSpec>COASO:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO,ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim E1EDK03Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ORDERS05.IDOC.E1EDK03)
+	While E1EDK03Iterator.HasNext()
+	{
+		#dim E1EDK03 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDK03 = E1EDK03Iterator.Next()
+		Set:(E1EDK03.IDDAT="11") COASO.COASOHeader.MIOTCR = $EXTRACT(E1EDK03.DATUM,7,8) _"-" _$EXTRACT(E1EDK03.DATUM,5,6) _"-" _$EXTRACT(E1EDK03.DATUM,3,4)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeCustomerOrderEntryDate">
+<FormalSpec>Toelevering:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering,ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim E1EDK03Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ORDERS05.IDOC.E1EDK03)
+	While E1EDK03Iterator.HasNext()
+	{
+		#dim E1EDK03 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDK03 = E1EDK03Iterator.Next()
+		Set:(E1EDK03.IDDAT="11") Toelevering.ToeleveringHeader.CustomerOrderEntryDate = $EXTRACT(E1EDK03.DATUM,3,*)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeCustomerNumbers">
+<FormalSpec>Toelevering:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering,ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim E1EDKA1Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ORDERS05.IDOC.E1EDKA1)
+	While E1EDKA1Iterator.HasNext()
+	{
+		#dim E1EDKA1 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDKA1 = E1EDKA1Iterator.Next()
+		Set:(E1EDKA1.PARVW="WE") Toelevering.ToeleveringHeader.CustomerNumberForShipment = E1EDKA1.PARTN
+		Set:(E1EDKA1.PARVW="AG") Toelevering.ToeleveringHeader.CustomerNumberForInvoice = E1EDKA1.PARTN
+		
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeToeleveringDetails">
+<FormalSpec>Toelevering:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.Toelevering,ORDERS05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim E1EDP01Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ORDERS05.IDOC.E1EDP01)
+	While E1EDP01Iterator.HasNext()
+	{
+		#Dim E1EDP01 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP01 = E1EDP01Iterator.Next()
+		
+		Do ..VoegToeDefaultE1EDP20(E1EDP01.E1EDP20, E1EDP01.ABGRU)
+
+		#dim E1EDP20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP20)
+		While E1EDP20Iterator.HasNext()
+		{
+			#dim E1EDP20 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP20 = E1EDP20Iterator.Next()
+			#Dim ToeleveringDetail As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail).%New()
+
+			Set ToeleveringDetail.OrderQuantity = E1EDP20.WMENG
+			Set ToeleveringDetail.DeliveryDateAxBUA = $EXTRACT(E1EDP20.EDATU,3,*)
+			Set ToeleveringDetail.OrderLineNumberSupplierBAU = ""
+			Set ToeleveringDetail.PriceDimension = ..BepaalPriceDimension(E1EDP01.E1EDP05)
+			Set ToeleveringDetail.NetPrice = E1EDP01.E1EDP05.PREIS
+			Set ToeleveringDetail.GrossPrice = "0000000.00"
+			Do ..VoegToeDelDateCode(ToeleveringDetail, E1EDP20.WMENG)
+			Do ..VoegToeReasonCode(ToeleveringDetail, E1EDP01.ABGRU)
+			Do ..VoegToeShipmentStatus(ToeleveringDetail, E1EDP01.ABGRU, E1EDP20.WMENG)
+			Do ..VoegToeOrderLineIdentificationCustomer(ToeleveringDetail,E1EDP01)
+			Do ..VoegToeOrderLineIdentNumberSupplierBAU(ToeleveringDetail,E1EDP01)
+			
+			Do Toelevering.ToeleveringDetail.Insert(ToeleveringDetail)
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeDefaultE1EDP20">
+<FormalSpec>E1EDP20List:%ListOfObjects,ABGRU:%String=""</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If (E1EDP20List.Count()=0)
+	{
+		#dim E1EDP20 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP20 = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP20).%New()
+		Set E1EDP20.EDATU = ""
+		Set E1EDP20.WMENG = ""
+		Do E1EDP20List.Insert(E1EDP20)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeOrderLineIdentificationCustomer">
+<FormalSpec>ToeleveringDetail:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail,E1EDP01:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP01</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim E1EDP02Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP02)
+	While E1EDP02Iterator.HasNext()
+	{
+		#dim E1EDP02 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP02 = E1EDP02Iterator.Next()
+		Set:(E1EDP02.QUALF="ZON") ToeleveringDetail.OrderLineIdentificationCustomer = E1EDP02.BELNR  ;_"." _E1EDP02.ZEILE _"  "
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeOrderLineIdentNumberSupplierBAU">
+<FormalSpec>ToeleveringDetail:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail,E1EDP01:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP01</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim E1EDP19Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP19)
+	While E1EDP19Iterator.HasNext()
+	{
+		#dim E1EDP19 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP19 = E1EDP19Iterator.Next()
+		Set:(E1EDP19.QUALF="002") ToeleveringDetail.IdentNumberSupplierBAU = E1EDP19.IDTNR
+	}
+]]></Implementation>
+</Method>
+
+<Method name="BepaalPriceDimension">
+<FormalSpec>E1EDP05:APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP05</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit:('$IsObject(E1EDP05)) "2"
+	Quit:(E1EDP05.UPRBS="1000") "3"
+	Quit:(E1EDP05.UPRBS="1") "0"
+	Quit "2"
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeDelDateCode">
+<FormalSpec>ToeleveringDetail:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail,WMENG:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	if ..IsGeldigAantal(WMENG)
+	{
+		Set ToeleveringDetail.DelDateCode = "2" // Confirmed
+	} else {
+		Set ToeleveringDetail.DelDateCode = "0" // Not Confirmed
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeReasonCode">
+<FormalSpec>ToeleveringDetail:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail,ABGRU:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If ..IsOrderLijnAanvaard(ABGRU)
+	{
+		Set ToeleveringDetail.ReasonCode = "V" // General amendement
+	}
+	else
+	{
+		Set ToeleveringDetail.ReasonCode = "C" // Position Cancelled
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeShipmentStatus">
+<FormalSpec>ToeleveringDetail:APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail,ABGRU:%String,WMENG:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If ..IsOrderLijnAanvaard(ABGRU) && ..IsGeldigAantal(WMENG)
+	{
+		Set ToeleveringDetail.ShipmentStatus = "3" // planned for shipment
+	}
+	else
+	{
+		Set ToeleveringDetail.ShipmentStatus = "0" // Not planned for shipment
+	}
+]]></Implementation>
+</Method>
+
+<Method name="IsOrderLijnAanvaard">
+<FormalSpec>ABGRU:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (ABGRU="") || (ABGRU="90")
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigAantal">
+<FormalSpec>WMENG:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (WMENG>0)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service/VerwijderToelevering/Test.cls.xml
===================================================================
diff -u -r36809 -r37032
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service/VerwijderToelevering/Test.cls.xml	(.../Test.cls.xml)	(revision 36809)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Service/VerwijderToelevering/Test.cls.xml	(.../Test.cls.xml)	(revision 37032)
@@ -3,32 +3,30 @@
 <Class name="vhUnitTest.APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service.VerwijderToelevering.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="OnBeforeAllTests">
-<Implementation><![CDATA[
-	Do ##super()
-	Lock +^BLOrdRsp
-]]></Implementation>
-</Method>
+<Property name="BLOrdRspService">
+<Type>vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService</Type>
+</Property>
 
-<Method name="OnAfterAllTests">
+<Method name="OnBeforeOneTest">
+<FormalSpec>TestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	Lock -^BLOrdRsp
-	Do ##super()
+	Do ##super(TestName)
+	Set ..BLOrdRspService = ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).%New()
+	#dim BLOrdRspData As TECH.MultiDim
+ 	Do ##class(vhTest.Fake.APPS.EDIExport.AankoopOrderResponse.BLUM.impl.BLOrdRspService).ZetTestData(.BLOrdRspData)
+	Do ..BLOrdRspService.Setup(.BLOrdRspData)
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Verwijder toelevering ">
 <Implementation><![CDATA[
 	#Dim COASODouble As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO).GeefCOASOGesplitsteLijn()
-	#Dim Service As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Service).%New()
 	
-	Do Service.Bewaar(COASODouble)
+	Do ..BLOrdRspService.Bewaar(COASODouble)
 
-	Do Service.VerwijderToelevering(Service.ToeleveringNummer)
+	Do ..BLOrdRspService.VerwijderToelevering("277788")
 
-	Do $$$AssertFalse($Data(^BLOrdRsp(Service.ToeleveringNummer)))
-
-	Kill ^BLOrdRsp(Service.ToeleveringNummer)
+	Do $$$AssertFalse($Data(..BLOrdRspService.MultiDim("277788")))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r35619 -r37032
--- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 35619)
+++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 37032)
@@ -5,7 +5,7 @@
 
 <Method name="Test : Converteer BLUM aankooporderresponse ORDERS05 naar COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	#dim COASO As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.COASO = Converteerder.Converteer(ORDERS05Double)
 	
@@ -59,7 +59,7 @@
 
 <Method name="Test : BLUM ORDERS05 Prijsdimensie 1000 wordt code 3 voor COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).E1EDP05.UPRBS="1000"
 	
@@ -71,7 +71,7 @@
 
 <Method name="Test : BLUM ORDERS05 Prijsdimensie 1 wordt code 0 voor COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).E1EDP05.UPRBS="1"
 	
@@ -83,7 +83,7 @@
 
 <Method name="Test : BLUM ORDERS05 Prijsdimensie 100 wordt code 2 voor COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).E1EDP05.UPRBS="100"
 	
@@ -95,7 +95,7 @@
 
 <Method name="Test : BLUM ABGRU status leeg wordt shipmentstatus 3 voor COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).ABGRU =""
 	
@@ -107,7 +107,7 @@
 
 <Method name="Test : BLUM ABGRU status 90 wordt shipmentstatus 3 voor COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).ABGRU ="90"
 	
@@ -119,7 +119,7 @@
 
 <Method name="Test : BLUM ABGRU status 10 wordt shipmentstatus 0 voor COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).ABGRU ="10"
 	
@@ -131,7 +131,7 @@
 
 <Method name="Test : BLUM ABGRU status leeg wordt reasoncode V voor COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).ABGRU =""
 	
@@ -143,7 +143,7 @@
 
 <Method name="Test : BLUM ABGRU status 90 wordt reasoncode V voor COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).ABGRU ="90"
 	
@@ -155,7 +155,7 @@
 
 <Method name="Test : BLUM ABGRU status 10 wordt reasoncode C voor COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).ABGRU ="10"
 	
@@ -167,7 +167,7 @@
 
 <Method name="Test : BLUM ABGRU status leeg wordt DeliveryDateCode 2 voor COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).ABGRU =""
 	
@@ -179,7 +179,7 @@
 
 <Method name="Test : BLUM ABGRU status 90 wordt DeliveryDateCode 2 voor COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).ABGRU ="90"
 	
@@ -191,7 +191,7 @@
 
 <Method name="Test : BLUM ABGRU status 10 wordt DeliveryDateCode 2 voor COASO">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).ABGRU ="10"
 	
@@ -203,7 +203,7 @@
 
 <Method name="Test : BLUM order niet aanvaard geeft een lijn zonder aantallen en status No shipment en Position cancelled">
 <Implementation><![CDATA[
-	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.impl.BLUM.Converteerder).%New()
+	#dim Converteerder As APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.impl.Converteerder).%New()
 	#dim ORDERS05Double As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05 = ##class(vhTest.Utils.APPS.EDIExport.AankoopOrderResponse.BLUM.XML.ORDERS05).%New().GeefORDERS05()
 	Do ORDERS05Double.IDOC.E1EDP01.GetAt(1).E1EDP20.Clear()
 	Set ORDERS05Double.IDOC.E1EDP01.GetAt(1).ABGRU ="10"