Index: EXT/Optima/CalculPrix/impl/RequestVerwerker.cls.xml
===================================================================
diff -u -r32127 -r33049
--- EXT/Optima/CalculPrix/impl/RequestVerwerker.cls.xml	(.../RequestVerwerker.cls.xml)	(revision 32127)
+++ EXT/Optima/CalculPrix/impl/RequestVerwerker.cls.xml	(.../RequestVerwerker.cls.xml)	(revision 33049)
@@ -79,7 +79,7 @@
 <FormalSpec>Lade:EXT.Optima.CalculPrix.dto.Request.TiroirTAORBOX,LadeTAX:APPS.EDI.common.dto.v001.LadeTAX</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Set LadeTAX.Klasse = ""   ; ##class(DOM.PM.enu.TAORKlasse).Lade()
+	Set LadeTAX.Klasse = ""
 	Set LadeTAX.IsBinnenbreedte = $$$True
 	Set LadeTAX.CorpusWandDikte = ""
 	Set LadeTAX.OpvullijstKleur = ##class(DOM.PM.enu.TAOROpvullijstKleur).Lichtgrijs()
@@ -116,21 +116,11 @@
 	Do ConvertDataTAX.Add("LadeBinnenKleur",)
 	Do ConvertDataTAX.Add("FrontEindkapKleur",)
 	Do ConvertDataTAX.Add("HeeftDiepteVerstelling",)
-	Do ConvertDataTAX.Add("KoppelingType",,"Set Output=##class(EXT.Optima.CalculPrix.impl.RequestVerwerker).GeefInterneWaardeKoppelingType(Input)")
-	;Do ConvertDataTAX.AddOnlyForValidation("NietMeeleverenGeleider")
-	;Do ConvertDataTAX.AddOnlyForValidation("NietMeeleverenFrontbevestiging")
+	Do ConvertDataTAX.Add("KoppelingType",,"Set Output=$CASE(Input, ""S"":##class(DOM.PM.enu.TAORKoppelingType).Schroef(), ""D"":##class(DOM.PM.enu.TAORKoppelingType).Drevel(), :Input)")
 	
 	Quit ConvertDataTAX
 ]]></Implementation>
 </Method>
-
-<Method name="GeefInterneWaardeKoppelingType">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>ExterneWaarde:%String</FormalSpec>
-<ReturnType>DOM.PM.enu.TAORKoppelingType</ReturnType>
-<Implementation><![CDATA[	Quit $CASE(ExterneWaarde, "S":##class(DOM.PM.enu.TAORKoppelingType).Schroef(), "D":##class(DOM.PM.enu.TAORKoppelingType).Drevel(), :ExterneWaarde)
-]]></Implementation>
-</Method>
 </Class>