Index: DOM/AKP/impl/ToeleveringService.cls.xml
===================================================================
diff -u -r37924 -r37949
--- DOM/AKP/impl/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 37924)
+++ DOM/AKP/impl/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 37949)
@@ -67,29 +67,17 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefColliDragerType">
+<Method name="GeefTransportWaarborgType">
 <FormalSpec>ToeleveringID:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
+<ReturnType>DOM.VKP.enu.TransportWaarborgType</ReturnType>
 <Implementation><![CDATA[
 	#dim Toelevering As DOM.AKP.Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(ToeleveringID)
 	#dim OrderID As %String = Toelevering.GeefOrderID()
 	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID)
 	
-	If ..IsDHLVerzendingWijze(Order) {
-		Quit "WEGWERPPALLET"
-	} Else {
-		Quit ""
-	}
+	Quit ##class(DOM.VKP.impl.TransportWaarborgTypeBepaler).%New().Bepaal(Order.GeefVerzendingWijze())
 ]]></Implementation>
 </Method>
-
-<Method name="IsDHLVerzendingWijze">
-<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ($Extract(Order.GeefVerzendingWijze(),1,1)="E")
-]]></Implementation>
-</Method>
 </Class>