Index: vhUnitTest/APPS/EDI/common/impl/LegacyConverter/ConverteerLegacyNaarEdi/Test.cls.xml
===================================================================
diff -u -r39018 -r39026
--- vhUnitTest/APPS/EDI/common/impl/LegacyConverter/ConverteerLegacyNaarEdi/Test.cls.xml	(.../Test.cls.xml)	(revision 39018)
+++ vhUnitTest/APPS/EDI/common/impl/LegacyConverter/ConverteerLegacyNaarEdi/Test.cls.xml	(.../Test.cls.xml)	(revision 39026)
@@ -68,38 +68,30 @@
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Method "Test: ProductFeatures: CorpusWandDikte -> ItemWD als IsInteriorCabinetWidth = false"()
-{
-	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.CorpusWandDikte = "18"
-	Set TeConverterenProduct.IsBinnenbreedte = $$$False
+<Method name="Test: ProductFeatures: ItemWD -&gt; CorpusWandDikte en IsInteriorCabinetWidth = false">
+<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.ItemWD = "18"
 	
-	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.ItemWD,"18")
-}
+	Do $$$AssertEquals(GeconverteerdProduct.CorpusWandDikte,"18")
+	Do $$$AssertFalse(GeconverteerdProduct.IsBinnenbreedte)
+]]></Implementation>
+</Method>
 
-Method "Test: ProductFeatures: CorpusWandDikte: 'B' -> ItemWD als IsInteriorCabinetWidth = true"()
-{
-	#dim TeConverterenProduct = ..GeefTeConverterenProduct()
-	Set TeConverterenProduct.IsBinnenbreedte = $$$True
+<Method name="Test: ProductFeatures: CorpusWandDikte = &apos;B&apos; als IsInteriorCabinetWidth = true">
+<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.ItemWD = "B"
 	
-	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.ItemWD,"B")
-}
-*/
-]]></Content>
-</UDLText>
+	Do $$$AssertTrue(GeconverteerdProduct.IsBinnenbreedte)
+]]></Implementation>
+</Method>
 
 <Method name="Test: ProductFeatures: Opvullijsten: &apos;L&apos; -&gt; HeeftOpvullijstLinks">
 <Implementation><![CDATA[
Index: APPS/EDI/common/impl/LegacyConverter/LegacyNaarEdi.cls.xml
===================================================================
diff -u -r39018 -r39026
--- APPS/EDI/common/impl/LegacyConverter/LegacyNaarEdi.cls.xml	(.../LegacyNaarEdi.cls.xml)	(revision 39018)
+++ APPS/EDI/common/impl/LegacyConverter/LegacyNaarEdi.cls.xml	(.../LegacyNaarEdi.cls.xml)	(revision 39026)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="LadeType">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>TBXLadeCodeBepaler:APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler</FormalSpec>
 <Private>1</Private>
@@ -26,20 +31,21 @@
 <Implementation><![CDATA[
 	Set TBXProduct = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
 	
+	//Do ..PeuterLadeCodeOpen(Product.ItemLT)
+	
 	Do ..ObjectConverter.Convert(Product,TBXProduct,..GeefConvertDataTBX())
 	
 	Do ..ConvertDwarsverdelingen(Product,TBXProduct)
 	Do ..ConvertOpvullijst(Product,TBXProduct)
 	Do ..ConvertFrontOndersteuningAantal(Product,TBXProduct)
 	Do ..ConvertInschuifElement(Product,TBXProduct)
+	Do ..ConvertCorpusWandDikte(Product,TBXProduct)
 	
 	/*Do ..ConvertDesignEnKleuren(Product,TBXProduct)
 
-	Do ..ConvertCorpusWandDikte(Product,TBXProduct)
 	Do ..ConvertGreepEnMeenemer(Product,TBXProduct)
 	Do ..ConvertMat(Product,TBXProduct)
 	Do ..ConvertLadeCodeKenmerken(Product,TBXProduct)
-	Do ..ConvertDwarsverdelingen(Product,TBXProduct)
 	Do ..ConvertUitsparingen(Product,TBXProduct)
 	Do ..ConvertVerlaagdeRug(Product,TBXProduct)*/
 	
@@ -124,6 +130,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ConvertCorpusWandDikte">
+<FormalSpec><![CDATA[Product:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy,&TBXProduct:APPS.EDI.common.dto.v001.LadeTBX]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If Product.ItemWD = "B" {
+		Set TBXProduct.IsBinnenbreedte = $$$True
+	} Else {
+		If ##class(TECH.StringUtils).Equals(Product.ItemWD, 16,18,19) {
+			Set TBXProduct.CorpusWandDikte = Product.ItemWD
+			Set TBXProduct.IsBinnenbreedte = $$$False
+		}
+	}
+]]></Implementation>
+</Method>
+
 <Method name="GeefConvertDataTBX">
 <Private>1</Private>
 <ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>