Index: APPS/EDI/common/impl/LegacyConverter/LegacyNaarEdi.cls.xml
===================================================================
diff -u -r39068 -r39126
--- APPS/EDI/common/impl/LegacyConverter/LegacyNaarEdi.cls.xml	(.../LegacyNaarEdi.cls.xml)	(revision 39068)
+++ APPS/EDI/common/impl/LegacyConverter/LegacyNaarEdi.cls.xml	(.../LegacyNaarEdi.cls.xml)	(revision 39126)
@@ -56,10 +56,10 @@
 	Do ..ConvertCorpusWandDikte(Product,TBXProduct)
 	Do ..ConvertLadeType(Product,TBXProduct)
 	Do ..ConvertMat(Product,TBXProduct)
+	Do ..ConvertGreepEnMeenemer(Product,TBXProduct)
 	
 	/*Do ..ConvertDesignEnKleuren(Product,TBXProduct)
 
-	Do ..ConvertGreepEnMeenemer(Product,TBXProduct)
 	Do ..ConvertUitsparingen(Product,TBXProduct)
 	Do ..ConvertVerlaagdeRug(Product,TBXProduct)*/
 	
@@ -203,6 +203,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ConvertGreepEnMeenemer">
+<FormalSpec><![CDATA[Product:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy,&TBXProduct:APPS.EDI.common.dto.v001.LadeTBX]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If ##class(TECH.StringUtils).Equals(Product.ItemBGRP,"Z","R","X") {
+		Set TBXProduct.GreepEnMeenemer = "No"
+	}
+	If Product.ItemBGRP = "G" {
+		Set TBXProduct.GreepEnMeenemer = "Handle"
+	}
+	If Product.ItemBGRP = "M" {
+		Set TBXProduct.GreepEnMeenemer = "HandleAndLatch"
+	}
+]]></Implementation>
+</Method>
+
 <Method name="GeefConvertDataTBX">
 <Private>1</Private>
 <ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
Index: vhUnitTest/APPS/EDI/common/impl/LegacyConverter/ConverteerLegacyNaarEdi/Test.cls.xml
===================================================================
diff -u -r39067 -r39126
--- vhUnitTest/APPS/EDI/common/impl/LegacyConverter/ConverteerLegacyNaarEdi/Test.cls.xml	(.../Test.cls.xml)	(revision 39067)
+++ vhUnitTest/APPS/EDI/common/impl/LegacyConverter/ConverteerLegacyNaarEdi/Test.cls.xml	(.../Test.cls.xml)	(revision 39126)
@@ -162,99 +162,42 @@
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Method "Test: ProductFeatures: InsideBoxSystem = No -> 'Z'"()
-{
-	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.GreepEnMeenemer = "No"
-	Set TeConverterenProduct.IsBinnenlade = $$$True
-	Set TeConverterenProduct.RugHoogte = "K"
+<Method name="Test: ProductFeatures: &apos;Z&apos; -&gt; geen greep/meenemer">
+<Implementation><![CDATA[
+	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
+	Set TeConverterenProduct.ItemBGRP = "Z"
 	
-	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
+	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
-	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
-	
-	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"Z")
-}
+	Do $$$AssertEquals(GeconverteerdProduct.GreepEnMeenemer,"No")
+]]></Implementation>
+</Method>
 
-Method "Test: ProductFeatures: InsideBoxSystem: greep en meenemer, rughoogte M -> 'M'"()
-{
-	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.GreepEnMeenemer = "HandleAndLatch"
-	Set TeConverterenProduct.IsBinnenlade = $$$True
-	Set TeConverterenProduct.RugHoogte = "M"
+<Method name="Test: ProductFeatures: &apos;M&apos; -&gt; HandleAndLatch">
+<Implementation><![CDATA[
+	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
+	Set TeConverterenProduct.ItemBGRP = "M"
 	
-	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
+	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
-	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
-	
-	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"M")
-}
+	Do $$$AssertEquals(GeconverteerdProduct.GreepEnMeenemer,"HandleAndLatch")
+]]></Implementation>
+</Method>
 
-Method "Test: ProductFeatures: InsideBoxSystem: greep en meenemer, rughoogte C -> 'M'"()
-{
-	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.GreepEnMeenemer = "HandleAndLatch"
-	Set TeConverterenProduct.IsBinnenlade = $$$True
+<Method name="Test: ProductFeatures: &apos;G&apos; -&gt; Handle">
+<Implementation><![CDATA[
+	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()
+	Set TeConverterenProduct.ItemBGRP = "G"
 	
-	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
+	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New()
+	#dim GeconverteerdProduct As APPS.EDI.common.dto.v001.LadeTBX = ProductConverter.ConverteerLegacyNaarEdi(TeConverterenProduct)
 	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
-	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
-	
-	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"R")
-}
+	Do $$$AssertEquals(GeconverteerdProduct.GreepEnMeenemer,"Handle")
+]]></Implementation>
+</Method>
 
-Method "Test: ProductFeatures: InsideBoxSystem: Wel greep, geen meenemer, rughoogte M -> 'G'"()
-{
-	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.GreepEnMeenemer = "Handle"
-	Set TeConverterenProduct.IsBinnenlade = $$$True	
-	Set TeConverterenProduct.RugHoogte = "M"
-	
-	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
-	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
-	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
-	
-	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"G")
-}
-
-Method "Test: ProductFeatures: InsideBoxSystem: Wel greep, geen meenemer, rughoogte C -> 'G'"()
-{
-	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.GreepEnMeenemer = "Handle"
-	Set TeConverterenProduct.IsBinnenlade = $$$True
-	
-	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
-	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
-	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
-	
-	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"R")
-}
-
-Method "Test: ProductFeatures: InsideBoxSystem: Greep ingevuld, maar niet IsBinnenlade -> 'X' "()
-{
-	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.GreepEnMeenemer = "Handle"
-	Set TeConverterenProduct.IsBinnenlade = $$$False
-	
-	Set DummyTBXLadeCodeBepaler = ##class(vhTest.Dummy.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New()
-	
-	#dim ProductConverter = ##class(APPS.EDI.common.impl.LegacyConverter).%New(DummyTBXLadeCodeBepaler)
-	#dim WebOrderLijn As WS.TBX.EM.OrderLijn = ProductConverter.ConverteerEdiNaarLegacy(TeConverterenProduct)
-	
-	Do $$$AssertEquals(WebOrderLijn.ItemBGRP,"X")
-}
-*/
-]]></Content>
-</UDLText>
-
 <Method name="Test: ProductFeatures: Zijwandverhoging: FG8 -&gt; Glas">
 <Implementation><![CDATA[
 	#dim TeConverterenProduct As DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerkenLegacy).StandaardLade()