Index: APPS/VKP/OrderIngaveService.cls.xml
===================================================================
diff -u -r37921 -r37924
--- APPS/VKP/OrderIngaveService.cls.xml	(.../OrderIngaveService.cls.xml)	(revision 37921)
+++ APPS/VKP/OrderIngaveService.cls.xml	(.../OrderIngaveService.cls.xml)	(revision 37924)
@@ -138,7 +138,7 @@
 		
 		If ..GebruiktExternTransport(Offerte) {
 			Do Order.ZetLeveringVoorwaarde(##class(DOM.CRM.enu.LeveringVoorwaarde).KostInManueleLijn())
-			Do Order.ZetVerzendingWijze(..VerzendwijzeItemNaarVerzendWijze(Offerte.VerzendingItem))
+			Do Order.ZetVerzendingWijze(..VerzendingItemNaarVerzendingWijze(Offerte.VerzendingItem))
 			Do ..VoegToeVerzendingAlsManueleLijn(Order, Offerte)
 			Do ..VoegToePalletten(Order, Offerte)
 		}
@@ -168,7 +168,6 @@
 <Implementation><![CDATA[
 	If Offerte.VerzendingItem.AantalPalletten > 0 {
 		Do Order.MaakNieuweTekstLijn("Aantal palletten is " _Offerte.VerzendingItem.AantalPalletten)
-		Do Order.ZetColliDragerType(##class(DOM.VKP.enu.ColliDragerType).WegwerpPallet())
 	}
 ]]></Implementation>
 </Method>
@@ -205,7 +204,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="VerzendwijzeItemNaarVerzendWijze">
+<Method name="VerzendingItemNaarVerzendingWijze">
 <FormalSpec>VerzendingItem:APPS.VKP.impl.Offerte.VerzendingItem</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
Index: vhTest/Mock/DOM/VKP/Order.cls.xml
===================================================================
diff -u -r37900 -r37924
--- vhTest/Mock/DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 37900)
+++ vhTest/Mock/DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 37924)
@@ -59,12 +59,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefColliDragerType">
-<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefColliDragerType")
-]]></Implementation>
-</Method>
-
 <Method name="GeefCommercieleKortingManueleOrderLijn">
 <ReturnType>DOM.VKP.CommercieleKortingManueleOrderlijn</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefCommercieleKortingManueleOrderLijn")
@@ -334,12 +328,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetColliDragerType">
-<FormalSpec>ColliDragerType:DOM.VKP.enu.ColliDragerType</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetColliDragerType",ColliDragerType)
-]]></Implementation>
-</Method>
-
 <Method name="ZetCommissieReferentie">
 <FormalSpec>value:%String</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetCommissieReferentie",value)
Index: APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler.cls.xml
===================================================================
diff -u -r37908 -r37924
--- APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler.cls.xml	(.../TussenEtiketVoorToeleveringBepaler.cls.xml)	(revision 37908)
+++ APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler.cls.xml	(.../TussenEtiketVoorToeleveringBepaler.cls.xml)	(revision 37924)
@@ -56,7 +56,7 @@
 <FormalSpec>ToeleveringID:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).ToUpper(..ToeleveringService.GeefColliDragerType(ToeleveringID))
+<Implementation><![CDATA[	Quit ..ToeleveringService.GeefColliDragerType(ToeleveringID)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket/TestColliDragerType.cls.xml
===================================================================
diff -u -r37908 -r37924
--- vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket/TestColliDragerType.cls.xml	(.../TestColliDragerType.cls.xml)	(revision 37908)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler/MaakTussenEtiket/TestColliDragerType.cls.xml	(.../TestColliDragerType.cls.xml)	(revision 37924)
@@ -54,7 +54,7 @@
 
 <Method name="Test: WEGWERPPALLET wordt op tussenetiket geplaatst indien ColliDragerType wegwerpallet is">
 <Implementation><![CDATA[
-	Do ..ToeleveringServiceMock.VerwachtMethodCall("GeefColliDragerType", ..ToeleveringID).DanReturn(##class(DOM.VKP.enu.ColliDragerType).WegwerpPallet())
+	Do ..ToeleveringServiceMock.VerwachtMethodCall("GeefColliDragerType", ..ToeleveringID).DanReturn("WEGWERPPALLET")
 
 	Set TussenEtiketVoorToeleveringBepaler = ##class(APPS.Halux.PPS.Document.impl.common.TussenEtiketVoorToeleveringBepaler).%New(..BatchServiceDummy, ..ToeleveringServiceMock, ..KennisAnkerRepositoryStub)
 	#dim TussenEtiket As BL.Etiket.LadeKlantEtiket = TussenEtiketVoorToeleveringBepaler.MaakTussenEtiket(..ToeleveringID)
Index: vhTest/Mock/DOM/AKP/ToeleveringService.cls.xml
===================================================================
diff -u -r37908 -r37924
--- vhTest/Mock/DOM/AKP/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 37908)
+++ vhTest/Mock/DOM/AKP/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 37924)
@@ -10,7 +10,7 @@
 
 <Method name="GeefColliDragerType">
 <FormalSpec>ToeleveringID:%String</FormalSpec>
-<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefColliDragerType",ToeleveringID)
 ]]></Implementation>
 </Method>
Index: DOM/AKP/ToeleveringService.cls.xml
===================================================================
diff -u -r37908 -r37924
--- DOM/AKP/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 37908)
+++ DOM/AKP/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 37924)
@@ -26,7 +26,7 @@
 <Method name="GeefColliDragerType">
 <Abstract>1</Abstract>
 <FormalSpec>ToeleveringID:%String</FormalSpec>
-<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
+<ReturnType>%String</ReturnType>
 </Method>
 </Class>
 
Index: vhTest/Fake/DOM/AKP/Toelevering.cls.xml
===================================================================
diff -u -r33396 -r37924
--- vhTest/Fake/DOM/AKP/Toelevering.cls.xml	(.../Toelevering.cls.xml)	(revision 33396)
+++ vhTest/Fake/DOM/AKP/Toelevering.cls.xml	(.../Toelevering.cls.xml)	(revision 37924)
@@ -13,21 +13,27 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OrderID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Lijnen">
 <Type>vhTest.Fake.DOM.AKP.ProductToeleveringLijn</Type>
 <Collection>list</Collection>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ToeleveringID:%String,LeverancierID:%String</FormalSpec>
+<FormalSpec>ToeleveringID:%String,LeverancierID:%String,OrderID:%String=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..LeverancierNr = LeverancierID
 	Set ..ToeleveringID = ToeleveringID
+	Set ..OrderID = OrderID
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -59,6 +65,12 @@
 <Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..Lijnen)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefOrderID">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..OrderID
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: DOM/AKP/impl/ToeleveringService.cls.xml
===================================================================
diff -u -r37908 -r37924
--- DOM/AKP/impl/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 37908)
+++ DOM/AKP/impl/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 37924)
@@ -69,15 +69,27 @@
 
 <Method name="GeefColliDragerType">
 <FormalSpec>ToeleveringID:%String</FormalSpec>
-<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
+<ReturnType>%String</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)
 	
-	Quit Order.GeefColliDragerType()
+	If ..IsDHLVerzendingWijze(Order) {
+		Quit "WEGWERPPALLET"
+	} Else {
+		Quit ""
+	}
 ]]></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>
 
 
Index: vhUnitTest/DOM/AKP/impl/ToeleveringService/GeefColliDragerType/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/AKP/impl/ToeleveringService/GeefColliDragerType/Test.cls.xml	(revision 0)
+++ vhUnitTest/DOM/AKP/impl/ToeleveringService/GeefColliDragerType/Test.cls.xml	(revision 37924)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.AKP.impl.ToeleveringService.GeefColliDragerType.Test">
+<Super>vhUnitTest.TestCase,DOM.AKP.impl.ToeleveringService</Super>
+
+<Property name="ToeleveringStub">
+<Type>vhTest.Fake.DOM.AKP.Toelevering</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ToeleveringAPI">
+<Type>vhTest.Mock.DOM.AKP.ToeleveringAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderAPI">
+<Type>vhTest.Mock.DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderStub">
+<Type>vhTest.Mock.DOM.VKP.Order</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ToeleveringService">
+<Type>DOM.AKP.impl.ToeleveringService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductIDIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ToeleveringID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..ToeleveringID = 222222
+	Set ..OrderID = 333333
+	
+	Set ..ToeleveringStub = ##class(vhTest.Fake.DOM.AKP.Toelevering).%New(..ToeleveringID, $$$DummyInteger, ..OrderID)
+	Set ..ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
+	Do ..ToeleveringAPI.IndienMethodCall("GeefToelevering",..ToeleveringID).DanReturn(..ToeleveringStub)
+
+	Set ..OrderStub = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	Set ..OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).MockInstance()
+	Do ..OrderAPI.IndienMethodCall("GeefOrder", ..OrderID).DanReturn(..OrderStub)
+	
+	Set ..ToeleveringService = ##class(DOM.AKP.impl.ToeleveringService).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Verzendwijze DHL geeft WEGWERPPALLET als ColliDrager">
+<Implementation><![CDATA[
+	Do ..OrderStub.IndienMethodCall("GeefVerzendingWijze").DanReturn("E01")
+	do $$$AssertEquals(..ToeleveringService.GeefColliDragerType(..ToeleveringID), "WEGWERPPALLET")
+]]></Implementation>
+</Method>
+
+<Method name="Test: geeft standaard geen ColliDrager">
+<Implementation><![CDATA[
+	Do ..OrderStub.IndienMethodCall("GeefVerzendingWijze").DanReturn($$$DummyString)
+	do $$$AssertEquals(..ToeleveringService.GeefColliDragerType(..ToeleveringID), "")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/Order.cls.xml
===================================================================
diff -u -r37900 -r37924
--- DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 37900)
+++ DOM/VKP/Order.cls.xml	(.../Order.cls.xml)	(revision 37924)
@@ -85,16 +85,6 @@
 <ReturnType>%String</ReturnType>
 </Method>
 
-<Method name="ZetColliDragerType">
-<Abstract>1</Abstract>
-<FormalSpec>ColliDragerType:DOM.VKP.enu.ColliDragerType</FormalSpec>
-</Method>
-
-<Method name="GeefColliDragerType">
-<Abstract>1</Abstract>
-<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
-</Method>
-
 <Method name="MaakNieuweProductLijn">
 <Abstract>1</Abstract>
 <FormalSpec>ProductID:%String</FormalSpec>
FishEye: Tag 37924 refers to a dead (removed) revision in file `vhUnitTest/APPS/VKP/OrderIngaveService/MaakOrderVanOfferte/TestZetColliDragerType.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 37924 refers to a dead (removed) revision in file `DOM/VKP/enu/ColliDragerType.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: DOM/VKP/impl/DataM/DataMOrder.cls.xml
===================================================================
diff -u -r37900 -r37924
--- DOM/VKP/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 37900)
+++ DOM/VKP/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 37924)
@@ -52,12 +52,6 @@
 <Transient>1</Transient>
 </Property>
 
-<Property name="ColliDragerType">
-<Type>DOM.VKP.enu.ColliDragerType</Type>
-<Private>1</Private>
-<Transient>1</Transient>
-</Property>
-
 <Property name="VolgendLijnNr">
 <Type>%Integer</Type>
 <Private>1</Private>
@@ -325,18 +319,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetColliDragerType">
-<FormalSpec>ColliDragerType:DOM.VKP.enu.ColliDragerType</FormalSpec>
-<Implementation><![CDATA[	Set ..ColliDragerType = ColliDragerType
-]]></Implementation>
-</Method>
-
-<Method name="GeefColliDragerType">
-<ReturnType>DOM.VKP.enu.ColliDragerType</ReturnType>
-<Implementation><![CDATA[	Quit ..ColliDragerType
-]]></Implementation>
-</Method>
-
 <Method name="MaakNieuweProductLijn">
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>DOM.VKP.ProductOrderlijn</ReturnType>