Index: vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/MaakOfferte/Test.cls.xml
===================================================================
diff -u -r38921 -r39157
--- vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/MaakOfferte/Test.cls.xml	(.../Test.cls.xml)	(revision 38921)
+++ vhUnitTest/APPS/EC/Verkoop/impl/Externe/VerkoopService/MaakOfferte/Test.cls.xml	(.../Test.cls.xml)	(revision 39157)
@@ -34,14 +34,17 @@
 	#dim OfferteServiceMock As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
 	Do OfferteServiceMock.VerwachtMethodCall("MaakNieuwOfferte", KlantIDDummy, PersonalityIDDummy).DanReturn(OfferteFake)
 	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferteBewaarder").DanReturn(OfferteBewaarderMock)
-	Do OfferteServiceMock.VerwachtMethodCall("RaiseOfferteGemaaktEvent",$$$ElkeWaarde).DanDoeNiks()
 	Do OfferteServiceMock.VerwachtMethodCall("ControleerOfferteViaExterneId", ExterneIdUnderTest).DanDoeNiks()
 
-	#dim VerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New(OfferteServiceMock, WinkelkarServiceMock)
+	#dim OfferteEventRaiserMock As vhTest.Mock.APPS.VKP.event.OfferteEventRaiser = ##class(vhTest.Mock.APPS.VKP.event.OfferteEventRaiser).%New()
+	Do OfferteEventRaiserMock.VerwachtMethodCall("RaiseOfferteGemaaktEvent","DummyID").DanDoeNiks()
+	
+	#dim VerkoopService As APPS.EC.Verkoop.impl.Externe.VerkoopService = ##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New(OfferteServiceMock, WinkelkarServiceMock,,,OfferteEventRaiserMock)
 	Do VerkoopService.MaakOfferte(KlantIDDummy, PersonalityIDDummy, ExterneIdUnderTest)
 	
 	Do OfferteServiceMock.Verifieer()
 	Do WinkelkarServiceMock.Verifieer()
+	Do OfferteEventRaiserMock.Verifieer()
 	Do $$$AssertEquals(OfferteFake.ExterneId, "ExterneIdUnderTest")
 ]]></Implementation>
 </Method>
Index: APPS/VKP/impl/OfferteService.cls.xml
===================================================================
diff -u -r38997 -r39157
--- APPS/VKP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 38997)
+++ APPS/VKP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 39157)
@@ -18,11 +18,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="OfferteGemaaktEventRaiser">
-<Type>APPS.VKP.event.OfferteEventRaiser</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
 <FormalSpec>OfferteRepository:APPS.VKP.Offerte.OfferteRepository,WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",LijnRepository:DOM.EC.Winkelkar.impl.LijnRepository,TaalBepaler:APPS.EC.Winkelkar.impl.TaalBepaler="",VerpakkingConvertor:APPS.VKP.impl.OfferteService.VerpakkingConvertor=""</FormalSpec>
 <Private>1</Private>
@@ -35,7 +30,6 @@
 	Set ..LijnRepository = $$$Inject(LijnRepository,##class(DOM.EC.Winkelkar.impl.LijnRepository).%New())
 	Set ..VerpakkingConvertor = $$$Inject(VerpakkingConvertor,##class(APPS.VKP.impl.OfferteService.VerpakkingConvertor).%New())
 	Set ..TaalBepaler = TaalBepaler
-	Set ..OfferteGemaaktEventRaiser = ##class(APPS.VKP.event.OfferteEventRaiser).%New()
 
 	Quit $$$OK
 ]]></Implementation>
@@ -303,12 +297,6 @@
 <Implementation><![CDATA[	Quit ..VerpakkingConvertor.Converteer(..GeefMaatwerkLijnenIterator(..OfferteRepository.GeefViaID(OfferteID)))
 ]]></Implementation>
 </Method>
-
-<Method name="RaiseOfferteGemaaktEvent">
-<FormalSpec>OfferteID:%String</FormalSpec>
-<Implementation><![CDATA[	Do ..OfferteGemaaktEventRaiser.RaiseOfferteGemaaktEvent(OfferteID)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/VKP/event/OfferteEventRaiser.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/VKP/event/OfferteEventRaiser.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/VKP/event/OfferteEventRaiser.cls.xml	(revision 39157)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.VKP.event.OfferteEventRaiser">
+<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.VKP.event.OfferteEventRaiser,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="RaiseOfferteGemaaktEvent">
+<FormalSpec>OfferteID:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("RaiseOfferteGemaaktEvent",OfferteID)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/VKP/event/OfferteEventRaiser.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/VKP/event/OfferteEventRaiser.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/VKP/event/OfferteEventRaiser.cls.xml	(revision 39157)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.VKP.event.OfferteEventRaiser">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.VKP.event.OfferteEventRaiser</Super>
+
+<Method name="RaiseOfferteGemaaktEvent">
+<FormalSpec>OfferteID:%String</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/Verkoop/impl/Externe/VerkoopService.cls.xml
===================================================================
diff -u -r39036 -r39157
--- APPS/EC/Verkoop/impl/Externe/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 39036)
+++ APPS/EC/Verkoop/impl/Externe/VerkoopService.cls.xml	(.../VerkoopService.cls.xml)	(revision 39157)
@@ -15,19 +15,25 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OfferteEventRaiser">
+<Type>APPS.VKP.event.OfferteEventRaiser</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>OfferteService:APPS.VKP.OfferteService="",WinkelkarService:APPS.EC.Winkelkar.WinkelkarService=""</FormalSpec>
+<FormalSpec>OfferteService:APPS.VKP.OfferteService="",WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository="",OfferteRepository:APPS.VKP.Offerte.impl.OfferteRepository="",OfferteEventRaiser:APPS.VKP.event.OfferteEventRaiser</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Do ##super(OfferteService, WinkelkarService)
+	Do ##super(OfferteService, WinkelkarService, WinkelkarRepository, OfferteRepository)
 	Set ..Applicatie = ..GeefApplicatie()
 	Set ..WinkelkarService = $$$Inject(WinkelkarService, ##class(APPS.EC.Winkelkar.impl.ExterneWinkelkarService).%New())
 	Set ..OfferteHerberekenaar = ##class(APPS.EC.Verkoop.impl.OfferteHerberekenaar).%New(,,,..WinkelkarService)
 	Set ..GeldigheidVermeldingBepaler = ##class(APPS.EC.Verkoop.impl.GeldigheidVermeldingBepaler).%New()
-	
+	Set ..OfferteEventRaiser = $$$Inject(OfferteEventRaiser,##class(APPS.VKP.event.OfferteEventRaiser).%New())
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -70,7 +76,7 @@
 	#dim OfferteBewaarder As APPS.VKP.OfferteBewaarder = ..OfferteService.GeefOfferteBewaarder()
 	Do OfferteBewaarder.Bewaar(Offerte)
 	
-	Do ..OfferteService.RaiseOfferteGemaaktEvent(Offerte.GeefID())
+	Do ..OfferteEventRaiser.RaiseOfferteGemaaktEvent(Offerte.GeefID())
 	
 	Set OfferteIDenWinkelkarID = ##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New()
 	Set OfferteIDenWinkelkarID.OfferteID = Offerte.GeefID()
Index: APPS/VKP/event/OfferteEventRaiser.cls.xml
===================================================================
diff -u -r38920 -r39157
--- APPS/VKP/event/OfferteEventRaiser.cls.xml	(.../OfferteEventRaiser.cls.xml)	(revision 38920)
+++ APPS/VKP/event/OfferteEventRaiser.cls.xml	(.../OfferteEventRaiser.cls.xml)	(revision 39157)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.VKP.event.OfferteEventRaiser">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
 <Property name="EventRaiser">
 <Type>TECH.PubSub.EventRaiser</Type>