Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductConverter.cls.xml
===================================================================
diff -u -r35912 -r35920
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductConverter.cls.xml	(.../ProductConverter.cls.xml)	(revision 35912)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductConverter.cls.xml	(.../ProductConverter.cls.xml)	(revision 35920)
@@ -118,13 +118,8 @@
 <FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&WebOrderLijn:WS.TBX.EM.OrderLijn]]></FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	If Product.IsBinnenlade {
-		Set WebOrderLijn.ItemBGRP = "Z"
-		If Product.HeeftGreepEnMeenemer {
-			Set WebOrderLijn.ItemBGRP = "M"
-		} ElseIf Product.HeeftGreep {
-			Set WebOrderLijn.ItemBGRP = "G"
-		}
+	If Product.IsBinnenlade {		
+		Set WebOrderLijn.ItemBGRP = $CASE(Product.HeeftGreepEnMeenemer, "HandleAndLatch":"M", "Handle":"G", :"Z")		
 	} Else {
 		Set WebOrderLijn.ItemBGRP = "X"
 	}
Index: APPS/EDI/common/dto/v001/LadeTBX.cls.xml
===================================================================
diff -u -r35911 -r35920
--- APPS/EDI/common/dto/v001/LadeTBX.cls.xml	(.../LadeTBX.cls.xml)	(revision 35911)
+++ APPS/EDI/common/dto/v001/LadeTBX.cls.xml	(.../LadeTBX.cls.xml)	(revision 35920)
@@ -23,10 +23,6 @@
 <Type>TECH.String</Type>
 </Property>
 
-<Property name="HeeftGreep">
-<Type>TECH.String</Type>
-</Property>
-
 <Property name="HeeftGreepEnMeenemer">
 <Type>TECH.String</Type>
 </Property>
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/GreepEnMeenemerValidator/Test.cls.xml
===================================================================
diff -u -r35881 -r35920
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/GreepEnMeenemerValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 35881)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/GreepEnMeenemerValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 35920)
@@ -3,47 +3,23 @@
 <Class name="vhUnitTest.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.GreepEnMeenemerValidator.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: Rughoogte ok en Greep aanwezig">
-<Implementation><![CDATA[
-	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
-	Set Product.RugHoogte = "K"
-	Set Product.HeeftGreep = $$$True
-	
-	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.GreepEnMeenemerValidator).%New(Product)
-	
-	Do $$$AssertTrue(Validator.IsValid())
-]]></Implementation>
-</Method>
-
 <Method name="Test: Rughoogte ok en Meenemer aanwezig">
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
 	Set Product.RugHoogte = "K"
-	Set Product.HeeftGreepEnMeenemer = $$$True
+	Set Product.HeeftGreepEnMeenemer = "HandleAndLatch"
 	
 	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.GreepEnMeenemerValidator).%New(Product)
 	
 	Do $$$AssertTrue(Validator.IsValid())
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Rughoogte fout en Greep aanwezig">
-<Implementation><![CDATA[
-	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
-	Set Product.RugHoogte = "C"
-	Set Product.HeeftGreep = $$$True
-	
-	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.GreepEnMeenemerValidator).%New(Product)
-	
-	Do $$$AssertFalse(Validator.IsValid())
-]]></Implementation>
-</Method>
-
 <Method name="Test: Rughoogte fout en Meenemer aanwezig">
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
 	Set Product.RugHoogte = "C"
-	Set Product.HeeftGreepEnMeenemer = $$$True
+	Set Product.HeeftGreepEnMeenemer = "HandleAndLatch"
 	
 	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.GreepEnMeenemerValidator).%New(Product)
 	
@@ -55,7 +31,7 @@
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
 	Set Product.RugHoogte = "K"
-	Set Product.HeeftGreepEnMeenemer = ""
+	Set Product.HeeftGreepEnMeenemer = "No"
 	
 	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.GreepEnMeenemerValidator).%New(Product)
 	
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/GreepEnMeenemerValidator.cls.xml
===================================================================
diff -u -r35881 -r35920
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/GreepEnMeenemerValidator.cls.xml	(.../GreepEnMeenemerValidator.cls.xml)	(revision 35881)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/GreepEnMeenemerValidator.cls.xml	(.../GreepEnMeenemerValidator.cls.xml)	(revision 35920)
@@ -20,7 +20,7 @@
 
 <Method name="IsValid">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ((##class(TECH.StringUtils).Equals(..Product.RugHoogte, "K","B","M")) && (..Product.HeeftGreepEnMeenemer || ..Product.HeeftGreep)) || (..Product.HeeftGreepEnMeenemer_..Product.HeeftGreep="")
+<Implementation><![CDATA[	Quit ((##class(TECH.StringUtils).Equals(..Product.RugHoogte, "K","B","M")) && (##class(TECH.StringUtils).Equals(..Product.HeeftGreepEnMeenemer,"No","Handle","HandleAndLatch")))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductConverter/ConverteerProduct/Test.cls.xml
===================================================================
diff -u -r35912 -r35920
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductConverter/ConverteerProduct/Test.cls.xml	(.../Test.cls.xml)	(revision 35912)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductConverter/ConverteerProduct/Test.cls.xml	(.../Test.cls.xml)	(revision 35920)
@@ -191,11 +191,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ProductFeatures: InsideBoxSystem: Geen greep, geen meenemer -&gt; &apos;Z&apos;">
+<Method name="Test: ProductFeatures: InsideBoxSystem = No -&gt; &apos;Z&apos;">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.HeeftGreep = $$$False
-	Set TeConverterenProduct.HeeftGreepEnMeenemer = $$$False
+	Set TeConverterenProduct.HeeftGreepEnMeenemer = "No"
 	Set TeConverterenProduct.IsBinnenlade = $$$True
 	Set TeConverterenProduct.RugHoogte = "K"
 	
@@ -206,11 +205,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ProductFeatures: InsideBoxSystem: Geen greep, wel meenemer -&gt; &apos;M&apos;">
+<Method name="Test: ProductFeatures: InsideBoxSystem: greep en meenemer -&gt; &apos;M&apos;">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.HeeftGreep = $$$False
-	Set TeConverterenProduct.HeeftGreepEnMeenemer = $$$True
+	Set TeConverterenProduct.HeeftGreepEnMeenemer = "HandleAndLatch"
 	Set TeConverterenProduct.IsBinnenlade = $$$True
 	
 	#dim ProductConverter = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.ProductConverter).%New()
@@ -220,25 +218,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ProductFeatures: InsideBoxSystem: Wel greep, wel meenemer -&gt; &apos;M&apos;">
-<Implementation><![CDATA[
-	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.HeeftGreep = $$$True
-	Set TeConverterenProduct.HeeftGreepEnMeenemer = $$$True
-	Set TeConverterenProduct.IsBinnenlade = $$$True
-	
-	#dim ProductConverter = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.ProductConverter).%New()
-	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.Convert(TeConverterenProduct)
-	
-	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"M")
-]]></Implementation>
-</Method>
-
 <Method name="Test: ProductFeatures: InsideBoxSystem: Wel greep, geen meenemer -&gt; &apos;G&apos;">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.HeeftGreep = $$$True
-	Set TeConverterenProduct.HeeftGreepEnMeenemer = $$$False
+	Set TeConverterenProduct.HeeftGreepEnMeenemer = "Handle"
 	Set TeConverterenProduct.IsBinnenlade = $$$True
 	
 	#dim ProductConverter = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.ProductConverter).%New()
@@ -251,7 +234,7 @@
 <Method name="Test: ProductFeatures: InsideBoxSystem: Greep ingevuld, maar niet IsBinnenlade -&gt; &apos;X&apos; ">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.HeeftGreep = $$$True
+	Set TeConverterenProduct.HeeftGreepEnMeenemer = "Handle"
 	Set TeConverterenProduct.IsBinnenlade = $$$False
 	
 	#dim ProductConverter = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.ProductConverter).%New()
@@ -404,8 +387,7 @@
 	Set TeConverterenProduct.HeeftMat = $$$False
 	Set TeConverterenProduct.MatMateriaal = ""
 	Set TeConverterenProduct.MatKleur = ""
-	Set TeConverterenProduct.HeeftGreep = $$$True
-	Set TeConverterenProduct.HeeftGreepEnMeenemer = $$$False
+	Set TeConverterenProduct.HeeftGreepEnMeenemer = "No"
 	Set TeConverterenProduct.IsBinnenlade = $$$False
 	Set TeConverterenProduct.LadeKleur = ##class(DOM.PM.enu.TBXZijkantKleur).MG()
 	Set TeConverterenProduct.LadeHoogte = ##class(DOM.PM.enu.TBXZijkantHoogte).K()