Index: vhUnitTest/APPS/EC/Winkelkar/WinkelkarControleur/Base.cls.xml
===================================================================
diff -u -r57974 -r57980
--- vhUnitTest/APPS/EC/Winkelkar/WinkelkarControleur/Base.cls.xml	(.../Base.cls.xml)	(revision 57974)
+++ vhUnitTest/APPS/EC/Winkelkar/WinkelkarControleur/Base.cls.xml	(.../Base.cls.xml)	(revision 57980)
@@ -63,7 +63,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim Winkelkar As DOM.EC.Winkelkar.InterneWinkelkar = ..GeefWinkelkarMetEenVerpakkingType(##class(DOM.PM.enu.LBXVerpakkingType).V1())
-	Do ..VoegToeLadenInWinkelkar(Winkelkar,##class(DOM.PM.enu.LBXVerpakkingType).Probox(),10)	
+	Do ..VoegToeLadenInWinkelkar(Winkelkar, ##class(DOM.PM.enu.LadeVariant).TAOR(), ##class(DOM.PM.enu.LBXVerpakkingType).Probox(), 10)	
 	Do ..WinkelkarControleur.ControleerWinkelkar(Winkelkar)
 ]]></Implementation>
 </Method>
@@ -105,11 +105,43 @@
 	Set Winkelkar = ##class(DOM.EC.Winkelkar.InterneWinkelkar).%New("UnitTest")	
 	Do Winkelkar.ZetKlantID("K||7587")
 	Do Winkelkar.ZetPersonalityID(##class(DOM.common.enu.Personality).VanHoecke())
-	Do ..VoegToeLadenInWinkelkar(Winkelkar,VerpakkingType,Aantal)
+	Do ..VoegToeLadenInWinkelkar(Winkelkar, ##class(DOM.PM.enu.LadeVariant).TAOR(), VerpakkingType, Aantal)
 	Quit Winkelkar
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKenmerken">
+<FormalSpec>LadeVariant:DOM.PM.enu.LadeVariant,VerpakkingType:DOM.PM.enu.LBXVerpakkingType</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken</ReturnType>
+<Implementation><![CDATA[
+	#dim Kenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken
+	
+	If (LadeVariant = ##class(DOM.PM.enu.LadeVariant).TAOR()) {
+		Set Kenmerken = ..GeefTAORKenmerken(VerpakkingType)
+	} ElseIf (LadeVariant = ##class(DOM.PM.enu.LadeVariant).LBXPure()) {
+		Set Kenmerken = ..GeefLBXKenmerken(VerpakkingType)
+	} Else {
+		Set Kenmerken = ..GeefTBXKenmerken(VerpakkingType)
+	}
+	
+	Quit Kenmerken
+]]></Implementation>
+</Method>
+
+<Method name="GeefTBXKenmerken">
+<FormalSpec>VerpakkingType:DOM.PM.enu.TBXVerpakkingType</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken</ReturnType>
+<Implementation><![CDATA[
+	#dim TBXKenmerken As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken).LegeKenmerken()
+	
+	Set TBXKenmerken.VerpakkingType = VerpakkingType
+	
+	Quit TBXKenmerken
+]]></Implementation>
+</Method>
+
 <Method name="GeefLBXKenmerken">
 <FormalSpec>VerpakkingType:DOM.PM.enu.LBXVerpakkingType</FormalSpec>
 <Private>1</Private>
@@ -138,16 +170,14 @@
 
 <Method name="VoegToeLadenInWinkelkar">
 <Abstract>1</Abstract>
-<FormalSpec>Winkelkar:DOM.EC.Winkelkar.InterneWinkelkar,VerpakkingType:DOM.PM.enu.LBXVerpakkingType,Aantal:%Integer</FormalSpec>
+<FormalSpec>Winkelkar:DOM.EC.Winkelkar.InterneWinkelkar,LadeVariant:DOM.PM.enu.LadeVariant,VerpakkingType:DOM.PM.enu.LBXVerpakkingType,Aantal:%Integer</FormalSpec>
 <Private>1</Private>
 </Method>
 
 <Method name="AssertInvalidUserInputException">
 <FormalSpec>Exception:TECH.String,Omschrijving:TECH.String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[
-	
-	Do $$$AssertException(Exception, "TECH.Exceptions.InvalidUserInputException", Omschrijving)
+<Implementation><![CDATA[	Do $$$AssertException(Exception, "TECH.Exceptions.InvalidUserInputException", Omschrijving)
 ]]></Implementation>
 </Method>
 </Class>