Index: APPS/EDI/common/impl/LegacyConverter/EdiNaarLegacy.cls.xml
===================================================================
diff -u -r39640 -r39682
--- APPS/EDI/common/impl/LegacyConverter/EdiNaarLegacy.cls.xml	(.../EdiNaarLegacy.cls.xml)	(revision 39640)
+++ APPS/EDI/common/impl/LegacyConverter/EdiNaarLegacy.cls.xml	(.../EdiNaarLegacy.cls.xml)	(revision 39682)
@@ -79,9 +79,7 @@
 	If Product.IsBinnenbreedte {
 		Set TBXProduct.ItemWD = "B"
 	} Else 	{
-		If ##class(TECH.StringUtils).Equals(Product.CorpusWandDikte, 16,18,19) {
-			Set TBXProduct.ItemWD = Product.CorpusWandDikte
-		}
+		Set TBXProduct.ItemWD = Product.CorpusWandDikte
 	}
 ]]></Implementation>
 </Method>
@@ -168,6 +166,8 @@
 			Set TBXProduct.ItemASM = "ZW.AF"
 		} ElseIf Product.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberWit() {
 			Set TBXProduct.ItemASM = "WI.AF"
+		} ElseIf Product.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberAntraciet() {
+			Set TBXProduct.ItemASM = "AN.AF"	
 		} Else {
 			Set TBXProduct.ItemASM = "G"
 		}
@@ -192,9 +192,7 @@
 <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><![CDATA[	Quit $Case(LadeKleur, "BZ":"ZA", "SW":"WA", "MG":"GA", "IN":"IA", :"")
 ]]></Implementation>
 </Method>
 
@@ -285,17 +283,16 @@
 <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("BodemKleur","ItemKB")
 	Do ConvertData.Add("CorpusBreedte","ItemCB")
 	Do ConvertData.Add("ZijwandVerhogingType","ItemBX", "Set Output = $Case(Input, ""NoGallery"":""ZR"",  ""SimpleGallery"":""ER"", ""DesignElement"":""INSCHF"")")
 	Do ConvertData.Add("Draagkracht","ItemDK")
 	Do ConvertData.Add("HeeftZijstabilisering","ItemSB")
-	Do ConvertData.Add("VerpakkingType","ItemVPK", "Set Output = $Case(Input, ""Pallet"":""P"", ""Procom"":""O"", ""Probox"":""X"", ""V1"":""S"")")
+	Do ConvertData.Add("VerpakkingType","ItemVPK", "Set Output = $Case(Input, ""Pallet"":""P"", ""VHoss"":""B"",""Procom"":""O"", ""Probox"":""X"", ""V1"":""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)")
+	Do ConvertData.Add("LadeKleur","ItemKL")
+	Do ConvertData.Add("LadeKleur","ItemRK")
 	
-	
 	Quit ConvertData
 ]]></Implementation>
 </Method>
Index: APPS/EDI/common/impl/LegacyConverter/LegacyNaarEdi.cls.xml
===================================================================
diff -u -r39660 -r39682
--- APPS/EDI/common/impl/LegacyConverter/LegacyNaarEdi.cls.xml	(.../LegacyNaarEdi.cls.xml)	(revision 39660)
+++ APPS/EDI/common/impl/LegacyConverter/LegacyNaarEdi.cls.xml	(.../LegacyNaarEdi.cls.xml)	(revision 39682)
@@ -121,27 +121,31 @@
 <FormalSpec><![CDATA[Product:APPS.PM.Maatwerk.dto.TBXKenmerkenLegacy,&TBXProduct:APPS.EDI.common.dto.v001.LadeTBX]]></FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	If Product.ItemKV = "FG8"{
-		Set TBXProduct.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Glas()
-		Set TBXProduct.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).FloatHelder8mm()
-		Set TBXProduct.ZijwandVerhogingType = "DesignElement"
-	} ElseIf Product.ItemKV = "FZ8"{
-		Set TBXProduct.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Glas()
-		Set TBXProduct.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).FloatGezuurd8mm()
-		Set TBXProduct.ZijwandVerhogingType = "DesignElement"
-	} ElseIf Product.ItemKV = "ALU.MG"{
-		Set TBXProduct.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Aluminium()
-		Set TBXProduct.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).MetallicGrijs()
-		Set TBXProduct.ZijwandVerhogingType = "DesignElement"
-	} ElseIf Product.ItemKV = "ALU.BZ"{
-		Set TBXProduct.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Aluminium()
-		Set TBXProduct.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).TerraZwart()
-		Set TBXProduct.ZijwandVerhogingType = "DesignElement"
-	} ElseIf Product.ItemKV = "ALU.SW"{
-		Set TBXProduct.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Aluminium()
-		Set TBXProduct.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).ZijdeWit()
-		Set TBXProduct.ZijwandVerhogingType = "DesignElement"
+	If Product.ItemBX = "INSCHF" {
+		If Product.ItemKV = "FG8"{
+			Set TBXProduct.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Glas()
+			Set TBXProduct.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).FloatHelder8mm()
+			Set TBXProduct.ZijwandVerhogingType = "DesignElement"
+		} ElseIf Product.ItemKV = "FZ8"{
+			Set TBXProduct.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Glas()
+			Set TBXProduct.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).FloatGezuurd8mm()
+			Set TBXProduct.ZijwandVerhogingType = "DesignElement"
+		} ElseIf Product.ItemKV = "ALU.MG"{
+			Set TBXProduct.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Aluminium()
+			Set TBXProduct.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).MetallicGrijs()
+			Set TBXProduct.ZijwandVerhogingType = "DesignElement"
+		} ElseIf Product.ItemKV = "ALU.BZ"{
+			Set TBXProduct.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Aluminium()
+			Set TBXProduct.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).TerraZwart()
+			Set TBXProduct.ZijwandVerhogingType = "DesignElement"
+		} ElseIf Product.ItemKV = "ALU.SW"{
+			Set TBXProduct.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Aluminium()
+			Set TBXProduct.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).ZijdeWit()
+			Set TBXProduct.ZijwandVerhogingType = "DesignElement"
+		}
 	}
+	
+	Set TBXProduct.ZijwandVerhogingType = $Case(Product.ItemBX, "ZR":"NoGallery",  "ER":"SimpleGallery", "INSCHF":"DesignElement", :"NoGallery")
 ]]></Implementation>
 </Method>
 
@@ -152,10 +156,8 @@
 	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
-		}
+		Set TBXProduct.CorpusWandDikte = Product.ItemWD
+		Set TBXProduct.IsBinnenbreedte = $$$False
 	}
 ]]></Implementation>
 </Method>
@@ -188,6 +190,10 @@
 		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberWit() 
 		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).AntislipFiber()
 		Set TBXProduct.HeeftMat = $$$True	
+	} ElseIf Product.ItemASM = "AN.AF" {
+		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).AntiSlipFiberAntraciet() 
+		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).AntislipFiber()
+		Set TBXProduct.HeeftMat = $$$True	
 	} ElseIf Product.ItemASM = "G" {
 		Set TBXProduct.MatKleur = ##class(DOM.PM.enu.MATKleur).Antraciet() 
 		Set TBXProduct.MatMateriaal = ##class(DOM.PM.enu.MATMateriaal).Antislip()
@@ -261,15 +267,14 @@
 <Implementation><![CDATA[
 	Set ConvertData = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
 	Do ConvertData.Add("ItemLD","LadeDiepte")
-	Do ConvertData.Add("ItemKB","BodemKleur","Set Output = $Select(Input = ""BZ"" : ""TS"", 1:Input)")
+	Do ConvertData.Add("ItemKB","BodemKleur")
 	Do ConvertData.Add("ItemCB","CorpusBreedte")
 	Do ConvertData.Add("ItemDK","Draagkracht")
 	Do ConvertData.Add("ItemSB","HeeftZijstabilisering")
 	Do ConvertData.Add("ItemFB","FrontBevestiging")
-	Do ConvertData.Add("ItemBX","ZijwandVerhogingType", "Set Output = $Case(Input, ""ZR"":""NoGallery"",  ""ER"":""SimpleGallery"", ""INSCHF"":""DesignElement"", :""NoGallery"")")
 	Do ConvertData.Add("ItemBM","GeleiderTechnologie", "Set Output = $Select(Input = ""I"" : ""B"", 1:Input)")
-	Do ConvertData.Add("ItemKL","LadeKleur", "Set Output = $Select(Input = ""BZ"" : ""TS"", 1:Input)")
-	Do ConvertData.Add("ItemVPK","VerpakkingType", "Set Output = $Case(Input, ""P"":""Pallet"",  ""X"":""Probox"", ""S"":""V1"", :""V1"")")
+	Do ConvertData.Add("ItemKL","LadeKleur")
+	Do ConvertData.Add("ItemVPK","VerpakkingType", "Set Output = $Case(Input, ""P"":""Pallet"",  ""X"":""Probox"", ""S"":""V1"",""O"":""Procom"",""C"":""Procom"",""A"":""VHoss"",""B"":""VHoss"", :""V1"")")
 	
 	Quit ConvertData
 ]]></Implementation>