Index: APPS/TRANSP/enu/TransportFirma.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/enu/TransportFirma.cls.xml	(revision 0)
+++ APPS/TRANSP/enu/TransportFirma.cls.xml	(revision 33074)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.enu.TransportFirma">
+<ClassType>datatype</ClassType>
+<Super>TECH.Enumeration</Super>
+
+<Parameter name="DISPLAYLIST">
+<Default>;UPS;DHL</Default>
+</Parameter>
+
+<Parameter name="VALUELIST">
+<Default>;UPS;DHL</Default>
+</Parameter>
+
+<Method name="UPS">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.TransportFirma</ReturnType>
+<Implementation><![CDATA[	Quit "UPS"
+]]></Implementation>
+</Method>
+
+<Method name="DHL">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.TransportFirma</ReturnType>
+<Implementation><![CDATA[	Quit "DHL"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/enu/TransportFirma/Verwerker.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/enu/TransportFirma/Verwerker.cls.xml	(revision 0)
+++ APPS/TRANSP/enu/TransportFirma/Verwerker.cls.xml	(revision 33074)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.enu.TransportFirma.Verwerker">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie methoden moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+
+<Method name="Verwerk">
+<Final>1</Final>
+<FormalSpec>TransportFirma:APPS.TRANSP.enu.TransportFirma</FormalSpec>
+<Implementation><![CDATA[
+	If TransportFirma = "DHL" {
+		Do ..VerwerkDHL()
+	} ElseIf TransportFirma = "UPS" {
+		Do ..VerwerkUPS()
+	} Else {
+		Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New(TransportFirma,"APPS.TRANSP.enu.TransportFirma",$classname())
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDHL">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkUPS">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/impl/OfferteService.cls.xml
===================================================================
diff -u -r33004 -r33074
--- APPS/TRANSP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 33004)
+++ APPS/TRANSP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 33074)
@@ -4,10 +4,10 @@
 <Super>TECH.RegisteredObject,APPS.TRANSP.OfferteService</Super>
 
 <Method name="BerekenOfferte">
-<FormalSpec>TransportFirma:%String,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput=""</FormalSpec>
+<FormalSpec>TransportFirma:APPS.TRANSP.enu.TransportFirma,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput=""</FormalSpec>
 <ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 <Implementation><![CDATA[
-	If TransportFirma = "UPS" {
+	If TransportFirma = ##class(APPS.TRANSP.enu.TransportFirma).UPS() {
 		if BerekenInput '= "" {
 			#dim OfferteBerekenaar As APPS.TRANSP.UPS.impl.OfferteBerekenaar = ##class(APPS.TRANSP.UPS.impl.OfferteBerekenaar).%New()
 			Quit OfferteBerekenaar.Bereken(BerekenInput)
Index: APPS/TRANSP/OfferteService.cls.xml
===================================================================
diff -u -r33005 -r33074
--- APPS/TRANSP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 33005)
+++ APPS/TRANSP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 33074)
@@ -6,7 +6,7 @@
 
 <Method name="BerekenOfferte">
 <Abstract>1</Abstract>
-<FormalSpec>TransportFirma:%String,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput=""</FormalSpec>
+<FormalSpec>TransportFirma:APPS.TRANSP.enu.TransportFirma,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput=""</FormalSpec>
 <ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 </Method>
 </Class>
Index: APPS/TRANSP/UPS/impl/OfferteBerekenaar.cls.xml
===================================================================
diff -u -r32884 -r33074
--- APPS/TRANSP/UPS/impl/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 32884)
+++ APPS/TRANSP/UPS/impl/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 33074)
@@ -90,7 +90,7 @@
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.OfferteService.dto.ServiceCode</ReturnType>
 <Implementation><![CDATA[
-	#dim TransportFirma As TECH.String = "UPS"
+	#dim TransportFirma As TECH.String = ##class(APPS.TRANSP.enu.TransportFirma).UPS()
 	#dim ServiceCode As APPS.TRANSP.OfferteService.dto.ServiceCode = ""
 	#dim Parameters As %List = $ListBuild(TransportFirma, RateServiceCode, TimeIntTransitServiceCode)
 	#dim Query As %String = "SELECT InterneCode, Omschrijving FROM APPS_TRANSP_OfferteService_data.ServiceCodeMapping WHERE TransportFirma = ? AND RateCode = ? AND TimeInTransitCode = ? "
Index: APPS/TRANSP/enu/TransportFirma/AutoComplete.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/enu/TransportFirma/AutoComplete.cls.xml	(revision 0)
+++ APPS/TRANSP/enu/TransportFirma/AutoComplete.cls.xml	(revision 33074)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.enu.TransportFirma.AutoComplete">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie Eigenschapn moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<ClassType>serial</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SerialObject</Super>
+
+<Property name="DHL">
+<Type>APPS.TRANSP.enu.TransportFirma</Type>
+<InitialExpression>"DHL"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="UPS">
+<Type>APPS.TRANSP.enu.TransportFirma</Type>
+<InitialExpression>"UPS"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/OfferteService/Test.cls.xml
===================================================================
diff -u -r32999 -r33074
--- vhUnitTest/APPS/TRANSP/OfferteService/Test.cls.xml	(.../Test.cls.xml)	(revision 32999)
+++ vhUnitTest/APPS/TRANSP/OfferteService/Test.cls.xml	(.../Test.cls.xml)	(revision 33074)
@@ -18,7 +18,7 @@
 <Implementation><![CDATA[
 	#dim OfferteService As APPS.TRANSP.impl.OfferteService = ##class(APPS.TRANSP.impl.OfferteService).%New()
 	
-	Do OfferteService.BerekenOfferte("UPS")
+	Do OfferteService.BerekenOfferte(##class(APPS.TRANSP.enu.TransportFirma).UPS())
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Mock/APPS/TRANSP/OfferteService.cls.xml
===================================================================
diff -u -r33004 -r33074
--- vhTest/Mock/APPS/TRANSP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 33004)
+++ vhTest/Mock/APPS/TRANSP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 33074)
@@ -10,7 +10,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="BerekenOfferte">
-<FormalSpec>TransportFirma:%String,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput=""</FormalSpec>
+<FormalSpec>TransportFirma:APPS.TRANSP.enu.TransportFirma,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput=""</FormalSpec>
 <ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("BerekenOfferte",TransportFirma,BerekenInput)
 ]]></Implementation>
Index: vhTest/Dummy/APPS/TRANSP/OfferteService.cls.xml
===================================================================
diff -u -r33042 -r33074
--- vhTest/Dummy/APPS/TRANSP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 33042)
+++ vhTest/Dummy/APPS/TRANSP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 33074)
@@ -4,7 +4,7 @@
 <Super>TECH.RegisteredObject,APPS.TRANSP.OfferteService</Super>
 
 <Method name="BerekenOfferte">
-<FormalSpec>TransportFirma:%String,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
+<FormalSpec>TransportFirma:APPS.TRANSP.enu.TransportFirma,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
 <ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 <Implementation><![CDATA[	quit ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
 ]]></Implementation>
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml
===================================================================
diff -u -r33051 -r33074
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 33051)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 33074)
@@ -33,7 +33,7 @@
 	do OfferteServiceStub.IndienMethodCall("GeefLeverAdres",OfferteId).DanReturn(##class(APPS.TRANSP.dto.LeveringAdres).%New())
 
 	set TransportOfferteServiceMock = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	do TransportOfferteServiceMock.VerwachtMethodCall("BerekenOfferte","UPS",$$$ElkeWaarde)
+	do TransportOfferteServiceMock.VerwachtMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde)
 
 	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceStub,TransportOfferteServiceMock)
 	
@@ -52,7 +52,7 @@
 	do OfferteServiceMock.VerwachtMethodCall("GeefLeverAdres",OfferteId).DanReturn(##class(APPS.TRANSP.dto.LeveringAdres).%New())
 	
 	set TransportOfferteServiceMock = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	do TransportOfferteServiceMock.IndienMethodCall("BerekenOfferte","UPS",$$$ElkeWaarde).DanDoeNiks()
+	do TransportOfferteServiceMock.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanDoeNiks()
 	
 	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceMock, TransportOfferteServiceMock)
 	Do InternationaleZending.GeefMogelijkeZendingen(OfferteId)
@@ -84,7 +84,7 @@
 	set BerekenInputMatcher = ##class(Tools.Mock.ArgumentMatchers.DataTransferObjectMatcher).%New(BerekenInput)
 
 	set TransportOfferteServiceMock = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	do TransportOfferteServiceMock.VerwachtMethodCall("BerekenOfferte","UPS",BerekenInputMatcher)
+	do TransportOfferteServiceMock.VerwachtMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),BerekenInputMatcher)
 
 	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceStub,TransportOfferteServiceMock)
 	
@@ -123,7 +123,7 @@
 	set BerekenInputMatcher = ##class(Tools.Mock.ArgumentMatchers.DataTransferObjectMatcher).%New(BerekenInput)
 
 	set TransportOfferteServiceMock = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	do TransportOfferteServiceMock.VerwachtMethodCall("BerekenOfferte","UPS",BerekenInputMatcher)
+	do TransportOfferteServiceMock.VerwachtMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),BerekenInputMatcher)
 
 	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceStub,TransportOfferteServiceMock)
 	
@@ -145,7 +145,7 @@
 	#dim TransportData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
 
 	set TransportOfferteServiceMock = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	do TransportOfferteServiceMock.IndienMethodCall("BerekenOfferte","UPS", $$$ElkeWaarde).DanReturn(TransportData)
+	do TransportOfferteServiceMock.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(), $$$ElkeWaarde).DanReturn(TransportData)
 
 	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceStub,TransportOfferteServiceMock)
 
Index: vhTest/Fake/APPS/TRANSP/OfferteService.cls.xml
===================================================================
diff -u -r33004 -r33074
--- vhTest/Fake/APPS/TRANSP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 33004)
+++ vhTest/Fake/APPS/TRANSP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 33074)
@@ -4,7 +4,7 @@
 <Super>APPS.TRANSP.impl.OfferteService</Super>
 
 <Method name="BerekenOfferte">
-<FormalSpec>TransportFirma:%String,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput=""</FormalSpec>
+<FormalSpec>TransportFirma:APPS.TRANSP.enu.TransportFirma,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput=""</FormalSpec>
 <ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 <Implementation><![CDATA[	/// Check BerekenInput.
 ]]></Implementation>