Index: vhUnitTest/APPS/VKP/Offerte/dto/VerpakkingList/ZoekVerpakkingen/TestTax.cls.xml
===================================================================
diff -u -r37552 -r37557
--- vhUnitTest/APPS/VKP/Offerte/dto/VerpakkingList/ZoekVerpakkingen/TestTax.cls.xml	(.../TestTax.cls.xml)	(revision 37552)
+++ vhUnitTest/APPS/VKP/Offerte/dto/VerpakkingList/ZoekVerpakkingen/TestTax.cls.xml	(.../TestTax.cls.xml)	(revision 37557)
@@ -4,56 +4,17 @@
 <Super>vhUnitTest.TestCase</Super>
 
 <Method name="Test: geeft lijst met probox verpakking met taorbox lades weer">
-<Implementation><![CDATA[
-	#dim VerpakkingTypeProbox As APPS.VKP.Offerte.enu.VerpakkingType = ##class(APPS.VKP.Offerte.enu.VerpakkingType).Probox()
-	#dim LadeTypeTaorbox As APPS.VKP.Offerte.enu.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).Taorbox()
-	#dim VerpakkingList As APPS.VKP.Offerte.dto.VerpakkingList = ##class(vhTest.Utils.APPS.VKP.Offerte.dto.VerpakkingList).GeefVerpakkingsList()
-	#dim VerpakkingListResultaat As TECH.ListOfObjects = VerpakkingList.ZoekVerpakkingen(VerpakkingTypeProbox, LadeTypeTaorbox)
-	if $$$AssertEquals(VerpakkingListResultaat.Count(), 1) {
-		#dim VerpakkingListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(VerpakkingListResultaat)
-		if 
-		While VerpakkingListIterator.HasNext() {
-			#dim Verpakking As APPS.VKP.Offerte.dto.Verpakking = VerpakkingListIterator.Next()
-			Do $$$AssertEquals(Verpakking.LadeType, LadeTypeTaorbox)
-			Do $$$AssertEquals(Verpakking.VerpakkingType, VerpakkingTypeProbox)
-		}
-	}
+<Implementation><![CDATA[	Do ..AssertVerpakking(##class(APPS.VKP.Offerte.enu.VerpakkingType).Probox())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: geeft lijst met V1 verpakking met taorbox lades weer">
-<Implementation><![CDATA[
-	#dim VerpakkingTypeV1 As APPS.VKP.Offerte.enu.VerpakkingType = ##class(APPS.VKP.Offerte.enu.VerpakkingType).V1()
-	#dim LadeTypeTaorbox As APPS.VKP.Offerte.enu.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).Taorbox()
-	#dim VerpakkingList As APPS.VKP.Offerte.dto.VerpakkingList = ##class(vhTest.Utils.APPS.VKP.Offerte.dto.VerpakkingList).GeefVerpakkingsList()
-	#dim VerpakkingListResultaat As TECH.ListOfObjects = VerpakkingList.ZoekVerpakkingen(VerpakkingTypeV1, LadeTypeTaorbox)
-	if $$$AssertEquals(VerpakkingListResultaat.Count(),1) {
-		#dim VerpakkingListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(VerpakkingListResultaat)
-		if 
-		While VerpakkingListIterator.HasNext() {
-			#dim Verpakking As APPS.VKP.Offerte.dto.Verpakking = VerpakkingListIterator.Next()
-			Do $$$AssertEquals(Verpakking.LadeType, LadeTypeTaorbox)
-			Do $$$AssertEquals(Verpakking.VerpakkingType, VerpakkingTypeV1)
-		}
-	}
+<Implementation><![CDATA[	Do ..AssertVerpakking(##class(APPS.VKP.Offerte.enu.VerpakkingType).V1())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: geeft lijst met FlatpackV1 verpakking met taorbox lades weer">
-<Implementation><![CDATA[
-	#dim VerpakkingTypeFlatpackV1 As APPS.VKP.Offerte.enu.VerpakkingType = ##class(APPS.VKP.Offerte.enu.VerpakkingType).FlatpackV1()
-	#dim LadeTypeTaorbox As APPS.VKP.Offerte.enu.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).Taorbox()
-	#dim VerpakkingList As APPS.VKP.Offerte.dto.VerpakkingList = ##class(vhTest.Utils.APPS.VKP.Offerte.dto.VerpakkingList).GeefVerpakkingsList()
-	#dim VerpakkingListResultaat As TECH.ListOfObjects = VerpakkingList.ZoekVerpakkingen(VerpakkingTypeFlatpackV1, LadeTypeTaorbox)
-	if $$$AssertEquals(VerpakkingListResultaat.Count(),1) {
-		#dim VerpakkingListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(VerpakkingListResultaat)
-		if 
-		While VerpakkingListIterator.HasNext() {
-			#dim Verpakking As APPS.VKP.Offerte.dto.Verpakking = VerpakkingListIterator.Next()
-			Do $$$AssertEquals(Verpakking.LadeType, LadeTypeTaorbox)
-			Do $$$AssertEquals(Verpakking.VerpakkingType, VerpakkingTypeFlatpackV1)
-		}
-	}
+<Implementation><![CDATA[	Do ..AssertVerpakking(##class(APPS.VKP.Offerte.enu.VerpakkingType).FlatpackV1())
 ]]></Implementation>
 </Method>
 
@@ -65,6 +26,21 @@
 	Do $$$AssertEquals(VerpakkingListResultaat.Count(),0)
 ]]></Implementation>
 </Method>
+
+<Method name="AssertVerpakking">
+<FormalSpec>VerpakkingType:APPS.VKP.Offerte.enu.VerpakkingType</FormalSpec>
+<Implementation><![CDATA[
+	#dim LadeTypeTaorbox As APPS.VKP.Offerte.enu.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).Taorbox()
+	#dim VerpakkingList As APPS.VKP.Offerte.dto.VerpakkingList = ##class(vhTest.Utils.APPS.VKP.Offerte.dto.VerpakkingList).GeefVerpakkingsList()
+	#dim VerpakkingListResultaat As TECH.ListOfObjects = VerpakkingList.ZoekVerpakkingen(VerpakkingType, LadeTypeTaorbox)
+	if $$$AssertEquals(VerpakkingListResultaat.Count(), 1) {
+		#dim VerpakkingListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(VerpakkingListResultaat)
+		#dim Verpakking As APPS.VKP.Offerte.dto.Verpakking = VerpakkingListIterator.Next()
+		Do $$$AssertEquals(Verpakking.LadeType, LadeTypeTaorbox)
+		Do $$$AssertEquals(Verpakking.VerpakkingType, VerpakkingType)
+	}
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/VKP/impl/OfferteService/VerpakkingConvertor.cls.xml
===================================================================
diff -u -r37534 -r37557
--- APPS/VKP/impl/OfferteService/VerpakkingConvertor.cls.xml	(.../VerpakkingConvertor.cls.xml)	(revision 37534)
+++ APPS/VKP/impl/OfferteService/VerpakkingConvertor.cls.xml	(.../VerpakkingConvertor.cls.xml)	(revision 37557)
@@ -35,13 +35,13 @@
 	#dim IsVariantTAX As %Boolean = (IngegevenKenmerken.GeefVariant() = ##class(DOM.PM.enu.Variant).Taorbox())	
 	#dim IsVariantLBX As %Boolean = (IngegevenKenmerken.GeefVariant() = ##class(DOM.PM.enu.Variant).LegraboxPure())	
 	
-	if IsFamilieLade {
+	If IsFamilieLade {
 	 	If IsVariantTAX {
 			#dim TAXKenmerken As DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken = IngegevenKenmerken
 			If ##class(APPS.VKP.Offerte.enu.VerpakkingType).IsValid(TAXKenmerken.VerpakkingType) {
 				Quit TAXKenmerken.VerpakkingType
 			}
-		} elseif IsVariantLBX {
+		} ElseIf IsVariantLBX {
 			#dim LBXKenmerken As DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken = IngegevenKenmerken
 			If ##class(APPS.VKP.Offerte.enu.VerpakkingType).IsValid(LBXKenmerken.VerpakkingType) {
 				Quit LBXKenmerken.VerpakkingType
@@ -59,7 +59,7 @@
 <Implementation><![CDATA[
 	#dim IsFamilieLade As %Boolean = (IngegevenKenmerken.GeefFamilie() = ##class(DOM.PM.enu.Familie).Lade())
 
-	if IsFamilieLade {
+	If IsFamilieLade {
 		If ##class(APPS.VKP.Offerte.enu.LadeType).IsValid(IngegevenKenmerken.GeefVariant()) {
 			Quit IngegevenKenmerken.GeefVariant()
 		}
@@ -73,8 +73,7 @@
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.OfferteService.dto.Afmeting</ReturnType>
 <Implementation><![CDATA[
-	
-	if $IsObject(VerpakteAfmeting)
+	If $IsObject(VerpakteAfmeting)
 	{
 		Quit ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(VerpakteAfmeting.GeefHoogte(),VerpakteAfmeting.GeefBreedte(),VerpakteAfmeting.GeefDiepte())
 	} Else {
Index: vhUnitTest/APPS/VKP/Offerte/dto/VerpakkingList/ZoekVerpakkingen/TestLbx.cls.xml
===================================================================
diff -u -r37552 -r37557
--- vhUnitTest/APPS/VKP/Offerte/dto/VerpakkingList/ZoekVerpakkingen/TestLbx.cls.xml	(.../TestLbx.cls.xml)	(revision 37552)
+++ vhUnitTest/APPS/VKP/Offerte/dto/VerpakkingList/ZoekVerpakkingen/TestLbx.cls.xml	(.../TestLbx.cls.xml)	(revision 37557)
@@ -4,38 +4,12 @@
 <Super>vhUnitTest.TestCase</Super>
 
 <Method name="Test: geeft lijst met probox verpakking met legrabox lades weer">
-<Implementation><![CDATA[
-	#dim VerpakkingTypeProbox As APPS.VKP.Offerte.enu.VerpakkingType = ##class(APPS.VKP.Offerte.enu.VerpakkingType).Probox()
-	#dim LadeTypeLegraboxPure As APPS.VKP.Offerte.enu.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).LegraboxPure()
-	#dim VerpakkingList As APPS.VKP.Offerte.dto.VerpakkingList = ##class(vhTest.Utils.APPS.VKP.Offerte.dto.VerpakkingList).GeefVerpakkingsList()
-	#dim VerpakkingListResultaat As TECH.ListOfObjects = VerpakkingList.ZoekVerpakkingen(VerpakkingTypeProbox, LadeTypeLegraboxPure)
-	if $$$AssertEquals(VerpakkingListResultaat.Count(), 1) {
-		#dim VerpakkingListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(VerpakkingListResultaat)
-		if 
-		While VerpakkingListIterator.HasNext() {
-			#dim Verpakking As APPS.VKP.Offerte.dto.Verpakking = VerpakkingListIterator.Next()
-			Do $$$AssertEquals(Verpakking.LadeType, LadeTypeLegraboxPure)
-			Do $$$AssertEquals(Verpakking.VerpakkingType, VerpakkingTypeProbox)
-		}
-	}
+<Implementation><![CDATA[	Do ..AssertVerpakking(##class(APPS.VKP.Offerte.enu.VerpakkingType).Probox())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: geeft lijst met V1 verpakking met legrabox lades weer">
-<Implementation><![CDATA[
-	#dim VerpakkingTypeV1 As APPS.VKP.Offerte.enu.VerpakkingType = ##class(APPS.VKP.Offerte.enu.VerpakkingType).V1()
-	#dim LadeTypeLegraboxPure As APPS.VKP.Offerte.enu.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).LegraboxPure()
-	#dim VerpakkingList As APPS.VKP.Offerte.dto.VerpakkingList = ##class(vhTest.Utils.APPS.VKP.Offerte.dto.VerpakkingList).GeefVerpakkingsList()
-	#dim VerpakkingListResultaat As TECH.ListOfObjects = VerpakkingList.ZoekVerpakkingen(VerpakkingTypeV1, LadeTypeLegraboxPure)
-	if $$$AssertEquals(VerpakkingListResultaat.Count(),1) {
-		#dim VerpakkingListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(VerpakkingListResultaat)
-		if 
-		While VerpakkingListIterator.HasNext() {
-			#dim Verpakking As APPS.VKP.Offerte.dto.Verpakking = VerpakkingListIterator.Next()
-			Do $$$AssertEquals(Verpakking.LadeType, LadeTypeLegraboxPure)
-			Do $$$AssertEquals(Verpakking.VerpakkingType, VerpakkingTypeV1)
-		}
-	}
+<Implementation><![CDATA[	Do ..AssertVerpakking(##class(APPS.VKP.Offerte.enu.VerpakkingType).V1())
 ]]></Implementation>
 </Method>
 
@@ -47,6 +21,21 @@
 	Do $$$AssertEquals(VerpakkingListResultaat.Count(),0)
 ]]></Implementation>
 </Method>
+
+<Method name="AssertVerpakking">
+<FormalSpec>VerpakkingType:APPS.VKP.Offerte.enu.VerpakkingType</FormalSpec>
+<Implementation><![CDATA[
+	#dim LadeTypeLegrabox As APPS.VKP.Offerte.enu.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).LegraboxPure()
+	#dim VerpakkingList As APPS.VKP.Offerte.dto.VerpakkingList = ##class(vhTest.Utils.APPS.VKP.Offerte.dto.VerpakkingList).GeefVerpakkingsList()
+	#dim VerpakkingListResultaat As TECH.ListOfObjects = VerpakkingList.ZoekVerpakkingen(VerpakkingType, LadeTypeLegrabox)
+	if $$$AssertEquals(VerpakkingListResultaat.Count(), 1) {
+		#dim VerpakkingListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(VerpakkingListResultaat)
+		#dim Verpakking As APPS.VKP.Offerte.dto.Verpakking = VerpakkingListIterator.Next()
+		Do $$$AssertEquals(Verpakking.LadeType, LadeTypeLegrabox)
+		Do $$$AssertEquals(Verpakking.VerpakkingType, VerpakkingType)
+	}
+]]></Implementation>
+</Method>
 </Class>