Index: DOM/AKP/impl/ToeleveringService.cls.xml
===================================================================
diff -u -r38015 -r38033
--- DOM/AKP/impl/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 38015)
+++ DOM/AKP/impl/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 38033)
@@ -23,16 +23,23 @@
 <Private>1</Private>
 </Property>
 
+<Property name="TransportWaarborgTypeBepaler">
+<Type>DOM.VKP.impl.TransportWaarborgTypeBepaler</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ToeleveringApi:DOM.AKP.ToeleveringAPI,ProductTypeApi:DOM.PM.ProductTypeAPI,OrderApi:DOM.VKP.OrderAPI</FormalSpec>
+<FormalSpec>ToeleveringApi:DOM.AKP.ToeleveringAPI,ProductTypeApi:DOM.PM.ProductTypeAPI,OrderApi:DOM.VKP.OrderAPI,TransportWaarborgTypeBepaler:DOM.VKP.impl.TransportWaarborgTypeBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..ToeleveringApi = $$$Inject(ToeleveringApi,##class(DOM.DomeinContext).Instance().GeefToeleveringAPI())
-	set ..ProductTypeApi = $$$Inject(ProductTypeApi,##class(DOM.DomeinContext).Instance().GeefProductTypeAPI())
-	set ..OrderApi = $$$Inject(OrderApi,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
+	Set ..ToeleveringApi = $$$Inject(ToeleveringApi,##class(DOM.DomeinContext).Instance().GeefToeleveringAPI())
+	Set ..ProductTypeApi = $$$Inject(ProductTypeApi,##class(DOM.DomeinContext).Instance().GeefProductTypeAPI())
+	Set ..OrderApi = $$$Inject(OrderApi,##class(DOM.DomeinContext).Instance().GeefOrderAPI())
+	Set ..TransportWaarborgTypeBepaler = $$$Inject(TransportWaarborgTypeBepaler, ##class(DOM.VKP.impl.TransportWaarborgTypeBepaler).%New())
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -69,7 +76,7 @@
 <Implementation><![CDATA[
 	#dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringApi.GeefToelevering(ToeleveringID)
 	#dim OrderID As %String = Toelevering.GeefOrderID()
-	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID)
+	#dim Order As DOM.VKP.Order = ..OrderApi.GeefOrder(OrderID)
 	#dim KlantID As DOM.VKP.VanHoeckeKlantID = Order.GeefKlantID()
 	#dim KlantNr As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(KlantID)
 	
@@ -92,9 +99,9 @@
 <Implementation><![CDATA[
 	#dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringApi.GeefToelevering(ToeleveringID)
 	#dim OrderID As %String = Toelevering.GeefOrderID()
-	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID)
+	#dim Order As DOM.VKP.Order = ..OrderApi.GeefOrder(OrderID)
 	
-	Quit ##class(DOM.VKP.impl.TransportWaarborgTypeBepaler).%New().Bepaal(Order.GeefVerzendingWijze())
+	Quit ..TransportWaarborgTypeBepaler.Bepaal(Order.GeefVerzendingWijze())
 ]]></Implementation>
 </Method>
 </Class>