Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneVerkoopService.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneVerkoopService.txt (.../WS.EC.InterneVerkoopService.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneVerkoopService.txt (.../WS.EC.InterneVerkoopService.txt) (revision 63984) @@ -498,6 +498,8 @@ + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.VKP.Maatwerk.ConfiguratorService.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.VKP.Maatwerk.ConfiguratorService.txt (.../WS.VKP.Maatwerk.ConfiguratorService.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.VKP.Maatwerk.ConfiguratorService.txt (.../WS.VKP.Maatwerk.ConfiguratorService.txt) (revision 63984) @@ -305,6 +305,8 @@ + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.PM.Maatwerk.MaatwerkService.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.PM.Maatwerk.MaatwerkService.txt (.../WS.PM.Maatwerk.MaatwerkService.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.PM.Maatwerk.MaatwerkService.txt (.../WS.PM.Maatwerk.MaatwerkService.txt) (revision 63984) @@ -609,6 +609,8 @@ + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessieLozeExterneVerkoopService.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessieLozeExterneVerkoopService.txt (.../WS.EC.SessieLozeExterneVerkoopService.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessieLozeExterneVerkoopService.txt (.../WS.EC.SessieLozeExterneVerkoopService.txt) (revision 63984) @@ -484,6 +484,8 @@ + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ConfiguratorKenmerkenGetter.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ConfiguratorKenmerkenGetter.txt (.../WS.EC.ConfiguratorKenmerkenGetter.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ConfiguratorKenmerkenGetter.txt (.../WS.EC.ConfiguratorKenmerkenGetter.txt) (revision 63984) @@ -306,6 +306,8 @@ + + Index: DOM/PM/enu/MVXLadeKleur/Verwerker.cls.xml =================================================================== diff -u -r63859 -r63984 --- DOM/PM/enu/MVXLadeKleur/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 63859) +++ DOM/PM/enu/MVXLadeKleur/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 63984) @@ -12,8 +12,12 @@ 1 MVXLadeKleur:DOM.PM.enu.MVXLadeKleur + +1 +1 + + + 1 1 + +1 +1 + + + 1 1 Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.VKP.VerkoopService.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.VKP.VerkoopService.txt (.../WS.APPS.VKP.VerkoopService.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.VKP.VerkoopService.txt (.../WS.APPS.VKP.VerkoopService.txt) (revision 63984) @@ -303,6 +303,8 @@ + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneConfiguratorService.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneConfiguratorService.txt (.../WS.EC.InterneConfiguratorService.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneConfiguratorService.txt (.../WS.EC.InterneConfiguratorService.txt) (revision 63984) @@ -302,6 +302,8 @@ + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.ExterneWinkelkarService.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.ExterneWinkelkarService.txt (.../WS.EC.Winkelkar.ExterneWinkelkarService.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.ExterneWinkelkarService.txt (.../WS.EC.Winkelkar.ExterneWinkelkarService.txt) (revision 63984) @@ -357,6 +357,8 @@ + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ExterneVerkoopService.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ExterneVerkoopService.txt (.../WS.EC.ExterneVerkoopService.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ExterneVerkoopService.txt (.../WS.EC.ExterneVerkoopService.txt) (revision 63984) @@ -588,6 +588,8 @@ + + Index: APPS/PM/Maatwerk/MaatwerkModel/Modellen/MerivoboxModel.cls.xml =================================================================== diff -u -r63832 -r63984 --- APPS/PM/Maatwerk/MaatwerkModel/Modellen/MerivoboxModel.cls.xml (.../MerivoboxModel.cls.xml) (revision 63832) +++ APPS/PM/Maatwerk/MaatwerkModel/Modellen/MerivoboxModel.cls.xml (.../MerivoboxModel.cls.xml) (revision 63984) @@ -43,14 +43,14 @@ Do ..VoegToeGetalKenmerk("InterneBreedte", "Interne breedte") Do ..VoegToeEnumeratieKenmerk("LadeDiepte", "Ladediepte", "270/300/350/400/450/500/550/600/650",,##class(APPS.PM.enu.DataType).Getal()) Do ..VoegToeEnumeratieKenmerk("LadeHoogte", "Ladehoogte", "N/M/K/E/F") - Do ..VoegToeEnumeratieKenmerk("LadeKleur", "Ladekleur", "OG-M/IG-M/SW-M", "Oriongrijs/Indiumgrijs/Zijdewit") + Do ..VoegToeEnumeratieKenmerk("LadeKleur", "Ladekleur", "OG-M/IG-M/SW-M/TGR/IN-G", "Oriongrijs/Indiumgrijs/Zijdewit/Donkergrijs/Inox") Do ..VoegToeEnumeratieKenmerk("MeenemerSet", "MeenemerSet", "Z/V", "Zonder/VolledigeSet") Do ..VoegToeEnumeratieKenmerk("OpvullijstKleur", "Kleur opvullijst", "LG/OG/WI/S", "Lichtgrijs/Oriongrijs/Wit/Zwart") Do ..VoegToeEnumeratieKenmerk("RugHoogte", "Rughoogte", "N/M/K/E/F") Do ..VoegToeEnumeratieKenmerk("RugWandMateriaal", "Materiaal rugwand", "Hout/Staal") Do ..VoegToeEnumeratieKenmerk("Toepassing", "Toepassing", "L/SY/SP", "Lade/Sifon/Spoelbak") Do ..VoegToeSamengesteldKenmerk("UitsparingData", "Uitsparingdata", "DOM.PM.Maatwerk.Calc.Common.impl.LadeUitsparingData", 1) - Do ..VoegToeEnumeratieKenmerk("UitsparingData.UitsparingCode", "UitsparingCode", "SP_Recht_M_D350_B470/SP_Recht_M_D350_B570/SP_Recht_M_D350_B770/SP_Recht_M_D450_B470/SP_Recht_M_D450_B570/SP_Recht_M_D450_B770/SY_Recht_E_D240_B350", "MvxD350B470/MvxD350B570/MvxD350B770/MvxD450B470/MvxD450B570/MvxD450B770/MvxD240B350",,,"DOM.PM.enu.UitsparingCode") + Do ..VoegToeEnumeratieKenmerk("UitsparingData.UitsparingCode", "UitsparingCode", "SP_Recht_M_D300_B470/SP_Recht_M_D300_B570/SP_Recht_M_D300_B770/SP_Recht_M_D350_B470/SP_Recht_M_D350_B570/SP_Recht_M_D350_B770/SP_Recht_M_D400_B470/SP_Recht_M_D400_B570/SP_Recht_M_D400_B770/SP_Recht_M_D450_B470/SP_Recht_M_D450_B570/SP_Recht_M_D450_B770/SY_Recht_E_D240_B350", "MvxD300B470/MvxD300B570/MvxD300B770/MvxD350B470/MvxD350B570/MvxD350B770/MvxD400B470/MvxD400B570/MvxD400B770/MvxD450B470/MvxD450B570/MvxD450B770/MvxD240B350",,,"DOM.PM.enu.UitsparingCode") Do ..VoegToeEnumeratieKenmerk("VerpakkingType", "Verpakking", "V1/Probox/VHoss/Pallet") Do ..VoegToeEnumeratieKenmerk("VoorwandType", "Type voorwand", "GlasHoog/GlasLaag/Metaal/Reling") Do ..VoegToeEnumeratieKenmerk("ZijkantHoogte", "zijkanthoogte", "M/E") Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Vhisie4.Winkelkar.WinkelkarService.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Vhisie4.Winkelkar.WinkelkarService.txt (.../WS.Vhisie4.Winkelkar.WinkelkarService.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Vhisie4.Winkelkar.WinkelkarService.txt (.../WS.Vhisie4.Winkelkar.WinkelkarService.txt) (revision 63984) @@ -680,6 +680,8 @@ + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.InterneWinkelkarService.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.InterneWinkelkarService.txt (.../WS.EC.Winkelkar.InterneWinkelkarService.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.InterneWinkelkarService.txt (.../WS.EC.Winkelkar.InterneWinkelkarService.txt) (revision 63984) @@ -357,6 +357,8 @@ + + Index: DOM/PM/enu/MVXLadeKleur/AutoComplete.cls.xml =================================================================== diff -u -r63859 -r63984 --- DOM/PM/enu/MVXLadeKleur/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 63859) +++ DOM/PM/enu/MVXLadeKleur/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 63984) @@ -9,13 +9,27 @@ 1 %SerialObject + +%String +"TGR" +1 +1 + + %String "IG-M" 1 1 + +%String +"IN-G" +1 +1 + + %String "OG-M" Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.WebshopConfiguratorService.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.WebshopConfiguratorService.txt (.../WS.EC.WebshopConfiguratorService.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.WebshopConfiguratorService.txt (.../WS.EC.WebshopConfiguratorService.txt) (revision 63984) @@ -302,6 +302,8 @@ + + Index: DOM/PM/enu/MVXLadeKleur.cls.xml =================================================================== diff -u -r63733 -r63984 --- DOM/PM/enu/MVXLadeKleur.cls.xml (.../MVXLadeKleur.cls.xml) (revision 63733) +++ DOM/PM/enu/MVXLadeKleur.cls.xml (.../MVXLadeKleur.cls.xml) (revision 63984) @@ -8,11 +8,11 @@ TECH.Enumeration -;OG-M;IG-M;SW-M +;OG-M;IG-M;SW-M;TGR;IN-G -;Oriongrijs;Indiumgrijs;Zijdewit +;Oriongrijs;Indiumgrijs;Zijdewit;TGR;Inox @@ -35,6 +35,20 @@ + + +1 +DOM.PM.enu.MVXLadeKleur + + + + +1 +DOM.PM.enu.MVXLadeKleur + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.WinkelkarService.txt =================================================================== diff -u -r63914 -r63984 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.WinkelkarService.txt (.../WS.EC.Winkelkar.WinkelkarService.txt) (revision 63914) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.WinkelkarService.txt (.../WS.EC.Winkelkar.WinkelkarService.txt) (revision 63984) @@ -357,6 +357,8 @@ + +