Index: vhTest/Spy/APPS/OV/OrderBevestiging/WachtrijAfhandelaar.cls.xml
===================================================================
diff -u -r31962 -r39972
--- vhTest/Spy/APPS/OV/OrderBevestiging/WachtrijAfhandelaar.cls.xml	(.../WachtrijAfhandelaar.cls.xml)	(revision 31962)
+++ vhTest/Spy/APPS/OV/OrderBevestiging/WachtrijAfhandelaar.cls.xml	(.../WachtrijAfhandelaar.cls.xml)	(revision 39972)
@@ -22,7 +22,7 @@
 	Set ..IsLogEnMailExceptieOpgeroepen = $$$False
 	Set ..OrderLijnen = ##class(%ListOfObjects).%New()
 	
-	Quit $$$OK
+	Quit ##super()
 ]]></Implementation>
 </Method>
 
Index: APPS/OV/OrderBevestiging/impl/WachtrijAfhandelaar/DKG.cls.xml
===================================================================
diff -u -r31711 -r39972
--- APPS/OV/OrderBevestiging/impl/WachtrijAfhandelaar/DKG.cls.xml	(.../DKG.cls.xml)	(revision 31711)
+++ APPS/OV/OrderBevestiging/impl/WachtrijAfhandelaar/DKG.cls.xml	(.../DKG.cls.xml)	(revision 39972)
@@ -12,7 +12,7 @@
 <Implementation><![CDATA[
 	Set ..Verstuurder = $$$Implementation(Verstuurder, ##class(APPS.OV.OrderBevestiging.impl.Verstuurder.DKG).%New())
 	
-	Quit $$$OK
+	Quit ##super()
 ]]></Implementation>
 </Method>
 
Index: APPS/OV/OrderBevestiging/impl/WachtrijAfhandelaar/Base.cls.xml
===================================================================
diff -u -r39911 -r39972
--- APPS/OV/OrderBevestiging/impl/WachtrijAfhandelaar/Base.cls.xml	(.../Base.cls.xml)	(revision 39911)
+++ APPS/OV/OrderBevestiging/impl/WachtrijAfhandelaar/Base.cls.xml	(.../Base.cls.xml)	(revision 39972)
@@ -9,12 +9,27 @@
 <Private>1</Private>
 </Property>
 
+<Property name="FormatAPI">
+<Type>TECH.Format.FormatAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderAPI">
+<Type>DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>Verstuurder:APPS.OV.OrderBevestiging.Verstuurder</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..FormatAPI = ##class(TECH.Context).Instance().GeefFormatAPI()
+	Set ..OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
+	
+	Quit $$$OK
+]]></Implementation>
 </Method>
 
 <Method name="BewaarBevestigingen">
@@ -95,11 +110,10 @@
 <Private>1</Private>
 <ReturnType>DOM.VKP.Order</ReturnType>
 <Implementation><![CDATA[
-	#dim OrderAPI As DOM.VKP.OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
 	#dim Order As DOM.VKP.Order = ""
 	
 	Try {
-		Set Order = OrderAPI.GeefOrder(OrderID)	
+		Set Order = ..OrderAPI.GeefOrder(OrderID)	
 	} Catch {
 		Do ..LogEnMailExceptie()
 	}
@@ -189,7 +203,7 @@
 	Set Lijn.AantalStuks = ProductOrderLijn.GeefAantal()
 	Set Lijn.Leverweek = ..GeefLeverweek(Order.GeefVroegsteLeverdatum())
 	Set Lijn.PakketReferentie = ProductOrderLijn.GeefPakketReferentie()	
-	Set Lijn.VroegsteLeverDatum = ##class(TECH.Context).Instance().GeefFormatAPI().FormatDate(Order.GeefVroegsteLeverdatum(),"yyyymmdd")
+	Set Lijn.VroegsteLeverDatum = ..FormatAPI.FormatDate(Order.GeefVroegsteLeverdatum(),"yyyymmdd")
 	
 	Quit Lijn
 ]]></Implementation>
Index: APPS/OV/OrderBevestiging/impl/WachtrijAfhandelaar/Bruynzeel.cls.xml
===================================================================
diff -u -r31711 -r39972
--- APPS/OV/OrderBevestiging/impl/WachtrijAfhandelaar/Bruynzeel.cls.xml	(.../Bruynzeel.cls.xml)	(revision 31711)
+++ APPS/OV/OrderBevestiging/impl/WachtrijAfhandelaar/Bruynzeel.cls.xml	(.../Bruynzeel.cls.xml)	(revision 39972)
@@ -12,7 +12,7 @@
 <Implementation><![CDATA[
 	Set ..Verstuurder = $$$Implementation(Verstuurder, ##class(APPS.OV.OrderBevestiging.impl.Verstuurder.Bruynzeel).%New())
 	
-	Quit $$$OK
+	Quit ##super()
 ]]></Implementation>
 </Method>