Index: APPS/EDI/common/impl/LegacyConverter.cls.xml
===================================================================
diff -u -r38987 -r38992
--- APPS/EDI/common/impl/LegacyConverter.cls.xml	(.../LegacyConverter.cls.xml)	(revision 38987)
+++ APPS/EDI/common/impl/LegacyConverter.cls.xml	(.../LegacyConverter.cls.xml)	(revision 38992)
@@ -3,11 +3,6 @@
 <Class name="APPS.EDI.common.impl.LegacyConverter">
 <Super>TECH.Object.ObjectConverter</Super>
 
-<Property name="ObjectConverter">
-<Type>TECH.ObjectUtils.impl.ObjectConverter</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="TBXLadeCodeBepaler">
 <Type>APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler</Type>
 <Private>1</Private>
@@ -21,7 +16,6 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..TBXLadeCodeBepaler  = $$$Inject(TBXLadeCodeBepaler,##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.TBXLadeCodeBepaler).%New())
-	Set ..ObjectConverter = ##class(TECH.ObjectUtils.impl.ObjectConverter).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -30,236 +24,11 @@
 <FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
 <ReturnType>APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy</ReturnType>
 <Implementation><![CDATA[
-	set TBXProduct = ##class(APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy).%New()
+	Set EdiNaarLegacyConverter = ##class(APPS.EDI.common.impl.LegacyConverter.EdiNaarLegacy).%New(..TBXLadeCodeBepaler)
 	
-	Do ..ObjectConverter.Convert(Product,TBXProduct,..GeefConvertDataTBX())
-	
-	Do ..ConvertDesignEnKleuren(Product,TBXProduct)
-
-	Do ..ConvertCorpusWandDikte(Product,TBXProduct)
-	Do ..ConvertOpvullijst(Product,TBXProduct)
-	Do ..ConvertFrontOndersteuningAantal(Product,TBXProduct)
-	Do ..ConvertGreepEnMeenemer(Product,TBXProduct)
-	Do ..ConvertInschuifElement(Product,TBXProduct)
-	Do ..ConvertMat(Product,TBXProduct)
-	Do ..ConvertLadeCodeKenmerken(Product,TBXProduct)
-	Do ..ConvertDwarsverdelingen(Product,TBXProduct)
-	Do ..ConvertFrontBevestiging(Product,TBXProduct)
-	Do ..ConvertUitsparingen(Product,TBXProduct)
-	Do ..ConvertVerlaagdeRug(Product,TBXProduct)
-	
-	Quit TBXProduct
+	Quit EdiNaarLegacyConverter.Converteer(Product)
 ]]></Implementation>
 </Method>
-
-<Method name="ConvertDesignEnKleuren">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set TBXProduct.ItemDC = ##class(DOM.PM.enu.TBXDesigncode).Antaro()
-	Set TBXProduct.ItemDS = ..BepaalDesignID(TBXProduct.ItemKL, ##class(DOM.PM.enu.TBXDesigncode).Antaro())
-]]></Implementation>
-</Method>
-
-<Method name="BepaalDesignID">
-<FormalSpec>LadeKleurID:%String,DesignCodeID:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim LadeKleur As Prod.GAMeta.BT.TBLadeKleur = ##class(Prod.GAMeta.BT.TBLadeKleur).OpenViaItemCode(LadeKleurID,DesignCodeID,1)
-	Quit LadeKleur.BepaalDesignID(DesignCodeID)
-]]></Implementation>
-</Method>
-
-<Method name="ConvertCorpusWandDikte">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If Product.IsBinnenbreedte {
-		Set TBXProduct.ItemWD = "B"
-	} Else 	{
-		If ##class(TECH.StringUtils).Equals(Product.CorpusWandDikte, 16,18,19) {
-			Set TBXProduct.ItemWD = Product.CorpusWandDikte
-		}
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ConvertOpvullijst">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If Product.HeeftOpvullijstLinks && $$$Not(Product.HeeftOpvullijstRechts) {
-		Set TBXProduct.ItemOPVL = "L"
-	}
-	If $$$Not(Product.HeeftOpvullijstLinks) && Product.HeeftOpvullijstRechts {
-		Set TBXProduct.ItemOPVL = "R"
-	}
-	If Product.HeeftOpvullijstLinks && Product.HeeftOpvullijstRechts {
-		Set TBXProduct.ItemOPVL = "L+R"
-	}
-	Set TBXProduct.ItemKLROPVL = Product.OpvullijstKleur
-]]></Implementation>
-</Method>
-
-<Method name="ConvertFrontOndersteuningAantal">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If ##class(TECH.StringUtils).Equals(Product.FrontOndersteuningAantal, 1,2,3) {
-		Set TBXProduct.ItemFS = Product.FrontOndersteuningAantal
-	} ElseIf (Product.FrontOndersteuningAantal="") {
-		Set TBXProduct.ItemFS = "A"
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ConvertGreepEnMeenemer">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If Product.IsBinnenlade {		
-		If ##class(TECH.StringUtils).Equals(Product.RugHoogte,"C","D") && ##class(TECH.StringUtils).Equals(Product.ZijkantHoogte,"M","K"){
-			Set TBXProduct.ItemBGRP = "R"
-		} Else {
-			Set TBXProduct.ItemBGRP = $CASE(Product.GreepEnMeenemer, "HandleAndLatch":"M", "Handle":"G", :"Z")
-		}
-	} Else {
-		Set TBXProduct.ItemBGRP = "X"
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ConvertInschuifElement">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If ((Product.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Glas()) && (Product.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).FloatHelder8mm()) && (Product.ZijwandVerhogingType = "DesignElement")) {
-		Set TBXProduct.ItemKV = "FG8"
-	}
-	ElseIf ((Product.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Glas()) && (Product.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).FloatGezuurd8mm()) && (Product.ZijwandVerhogingType = "DesignElement")) {
-		Set TBXProduct.ItemKV = "FZ8"
-	}
-	ElseIf ((Product.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Aluminium()) && (Product.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).MetallicGrijs()) && (Product.ZijwandVerhogingType = "DesignElement")) {
-		Set TBXProduct.ItemKV = "ALU.MG"
-	}
-	ElseIf ((Product.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Aluminium()) && (Product.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).TerraZwart()) && (Product.ZijwandVerhogingType = "DesignElement")) {
-		Set TBXProduct.ItemKV = "ALU.BZ"
-	}
-	ElseIf ((Product.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Aluminium()) && (Product.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).ZijdeWit()) && (Product.ZijwandVerhogingType = "DesignElement")) {
-		Set TBXProduct.ItemKV = "ALU.SW"
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ConvertMat">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If Product.HeeftMat {
-		If Product.MatKleur = ##class(DOM.PM.enu.MATKleur).ZwartAntislip() {		
-			Set TBXProduct.ItemASM = "Z"
-		} ElseIf Product.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberZwart() {
-			Set TBXProduct.ItemASM = "ZW.AF"
-		} ElseIf Product.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberWit() {
-			Set TBXProduct.ItemASM = "WI.AF"
-		} Else {
-			Set TBXProduct.ItemASM = "G"
-		}
-	} Else {
-		Set TBXProduct.ItemASM = ""
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ConvertLadeCodeKenmerken">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim Uittrekbaarheid As %String = ##class(DOM.PM.enu.TBXUittrekbaarheid).Volledig()
-	#dim LadeDesign As %String = ..GeefLadeDesign(Product.LadeKleur)
-	
-	Set TBXProduct.ItemLT = ..TBXLadeCodeBepaler.BepaalLadeCode(Product.Klasse, Product.ZijkantHoogte, Product.RugHoogte, Product.IsBinnenlade, Uittrekbaarheid, LadeDesign)
-]]></Implementation>
-</Method>
-
-<Method name="GeefLadeDesign">
-<FormalSpec>LadeKleur:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim DesignCode As %String = ##class(DOM.PM.enu.TBXDesigncode).Antaro()
-	Quit $Case(LadeKleur, "TS":"ZA", "SW":"WA", "MG":"GA", "IN":"IA", :"")
-]]></Implementation>
-</Method>
-
-<Method name="ConvertDwarsverdelingen">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If Product.HeeftDwarsverdeling {
-		Set TBXProduct.ItemDWV = Product.AantalDwarsverdelingen
-	} Else {
-		Set TBXProduct.ItemDWV = ""
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ConvertFrontBevestiging">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If Product.IsBinnenlade {
-		Set TBXProduct.ItemFB = "Z"
-	} Else {
-		Set TBXProduct.ItemFB = Product.FrontBevestiging
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ConvertUitsparingen">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If Product.UitsparingDataAantalUitsparingen = 1 {
-		Set TBXProduct.ItemSPZK = $Select(Product.UitsparingDataBreedteZ1="150":"S",Product.UitsparingDataBreedteZ1="250":"B",1:"M.")_";"_Product.UitsparingDataBreedteX_";"_Product.UitsparingDataBreedteY_";"_Product.UitsparingDataBreedteZ1
-	}
-	If Product.UitsparingDataAantalUitsparingen = 2 {
-		Set TBXProduct.ItemSPZK = $Select(Product.UitsparingDataBreedteZ1="150":"S",Product.UitsparingDataBreedteZ1="250":"B",1:"M")_$Select(Product.UitsparingDataBreedteZ2="150":"S",Product.UitsparingDataBreedteZ2="250":"B",1:"M")_";"_Product.UitsparingDataBreedteX_";"_Product.UitsparingDataBreedteY_";"_Product.UitsparingDataBreedteM_";"_Product.UitsparingDataBreedteZ1_";"_Product.UitsparingDataBreedteZ2
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ConvertVerlaagdeRug">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.LadeTBX,&TBXProduct:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If Product.RugHoogte '= Product.LadeHoogte {
-		Set TBXProduct.ItemRSTL = Product.RugHoogte
-	}
-]]></Implementation>
-</Method>
-
-<Method name="GeefConvertDataTBX">
-<Private>1</Private>
-<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
-<Implementation><![CDATA[
-	Set ConvertData = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
-	Do ConvertData.Add("LadeDiepte","ItemLD")
-	Do ConvertData.Add("BodemKleur","ItemKB", "Set Output = $Select(Input = ""TS"" : ""BZ"", 1:Input)")
-	Do ConvertData.Add("CorpusBreedte","ItemCB")
-	Do ConvertData.Add("ZijwandVerhogingType","ItemBX", "Set Output = $Case(Input, ""NoGallery"":""ZR"",  ""SimpleGallery"":""ER"", ""DesignElement"":""INSCHF"", :Input)")
-	Do ConvertData.Add("Draagkracht","ItemDK")
-	Do ConvertData.Add("HeeftZijstabilisering","ItemSB")
-	Do ConvertData.Add("VerpakkingType","ItemVPK", "Set Output = $Case(Input, ""Pallet"":""P"",  ""Probox"":""X"", ""V1"":""S"", :""S"")")
-	Do ConvertData.Add("GeleiderTechnologie","ItemBM", "Set Output = $Select(Input = ""B"" : ""I"", 1:Input)")
-	Do ConvertData.Add("LadeKleur","ItemKL", "Set Output = $Select(Input = ""TS"" : ""BZ"", 1:Input)")
-	Do ConvertData.Add("LadeKleur","ItemRK", "Set Output = $Select(Input = ""TS"" : ""BZ"", 1:Input)")
-	
-	
-	Quit ConvertData
-]]></Implementation>
-</Method>
 </Class>