Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneConfiguratorService.txt =================================================================== diff -u -r39913 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneConfiguratorService.txt (.../WS.EC.InterneConfiguratorService.txt) (revision 39913) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneConfiguratorService.txt (.../WS.EC.InterneConfiguratorService.txt) (revision 41143) @@ -773,6 +773,7 @@ + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.WinkelkarService.txt =================================================================== diff -u -r39913 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.WinkelkarService.txt (.../WS.EC.Winkelkar.WinkelkarService.txt) (revision 39913) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.WinkelkarService.txt (.../WS.EC.Winkelkar.WinkelkarService.txt) (revision 41143) @@ -826,6 +826,7 @@ + Index: APPS/EC/impl/ConfiguratorService/InterneKenmerkDomeinPostProcessor.cls.xml =================================================================== diff -u -r40686 -r41143 --- APPS/EC/impl/ConfiguratorService/InterneKenmerkDomeinPostProcessor.cls.xml (.../InterneKenmerkDomeinPostProcessor.cls.xml) (revision 40686) +++ APPS/EC/impl/ConfiguratorService/InterneKenmerkDomeinPostProcessor.cls.xml (.../InterneKenmerkDomeinPostProcessor.cls.xml) (revision 41143) @@ -27,6 +27,10 @@ If (..IsActiefValidator.If.Setting("IsActiefLbxPolarZilver").Of.Rol(..AuthorizatieRol.ICTmedewerker, ..AuthorizatieRol.Productbeheerder).IsInvalid()) { Do ..KenmerkMogelijkheden.VerwijderMogelijkeWaarde(..LBXEnum.KenmerkNaam.LadeKleur, ..LBXEnum.LadeKleur.PolarZilver) } + + If (..IsActiefValidator.If.Setting("IsActiefLbxBodemLichtGrijs").Of.Rol(..AuthorizatieRol.ICTmedewerker, ..AuthorizatieRol.Productbeheerder).IsInvalid()) { + Do ..KenmerkMogelijkheden.VerwijderMogelijkeWaarde(..LBXEnum.KenmerkNaam.BodemKleur, ..LBXEnum.BodemKleur.LichtGrijs) + } ]]> Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ConfiguratorKenmerkenGetter.txt =================================================================== diff -u -r39913 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ConfiguratorKenmerkenGetter.txt (.../WS.EC.ConfiguratorKenmerkenGetter.txt) (revision 39913) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ConfiguratorKenmerkenGetter.txt (.../WS.EC.ConfiguratorKenmerkenGetter.txt) (revision 41143) @@ -777,6 +777,7 @@ + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.ExterneWinkelkarService.txt =================================================================== diff -u -r39913 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.ExterneWinkelkarService.txt (.../WS.EC.Winkelkar.ExterneWinkelkarService.txt) (revision 39913) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.ExterneWinkelkarService.txt (.../WS.EC.Winkelkar.ExterneWinkelkarService.txt) (revision 41143) @@ -826,6 +826,7 @@ + Index: DOM/PM/enu/LBXBodemKleur/AutoComplete.cls.xml =================================================================== diff -u -r32362 -r41143 --- DOM/PM/enu/LBXBodemKleur/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 32362) +++ DOM/PM/enu/LBXBodemKleur/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 41143) @@ -10,21 +10,28 @@ %SerialObject -DOM.PM.enu.LBXBodemKleur +%String "BZ" 1 1 -DOM.PM.enu.LBXBodemKleur +%String "DG" 1 1 + +%String +"LG" +1 +1 + + -DOM.PM.enu.LBXBodemKleur +%String "WI" 1 1 Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Vhisie4.Winkelkar.WinkelkarService.txt =================================================================== diff -u -r40785 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Vhisie4.Winkelkar.WinkelkarService.txt (.../WS.Vhisie4.Winkelkar.WinkelkarService.txt) (revision 40785) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Vhisie4.Winkelkar.WinkelkarService.txt (.../WS.Vhisie4.Winkelkar.WinkelkarService.txt) (revision 41143) @@ -991,6 +991,7 @@ + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.InterneWinkelkarService.txt =================================================================== diff -u -r39913 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.InterneWinkelkarService.txt (.../WS.EC.Winkelkar.InterneWinkelkarService.txt) (revision 39913) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.InterneWinkelkarService.txt (.../WS.EC.Winkelkar.InterneWinkelkarService.txt) (revision 41143) @@ -826,6 +826,7 @@ + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.PM.Maatwerk.MaatwerkService.txt =================================================================== diff -u -r39913 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.PM.Maatwerk.MaatwerkService.txt (.../WS.PM.Maatwerk.MaatwerkService.txt) (revision 39913) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.PM.Maatwerk.MaatwerkService.txt (.../WS.PM.Maatwerk.MaatwerkService.txt) (revision 41143) @@ -1077,6 +1077,7 @@ + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.VKP.VerkoopService.txt =================================================================== diff -u -r39913 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.VKP.VerkoopService.txt (.../WS.APPS.VKP.VerkoopService.txt) (revision 39913) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.VKP.VerkoopService.txt (.../WS.APPS.VKP.VerkoopService.txt) (revision 41143) @@ -774,6 +774,7 @@ + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneVerkoopService.txt =================================================================== diff -u -r39913 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneVerkoopService.txt (.../WS.EC.InterneVerkoopService.txt) (revision 39913) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneVerkoopService.txt (.../WS.EC.InterneVerkoopService.txt) (revision 41143) @@ -963,6 +963,7 @@ + Index: DOM/PM/enu/LBXBodemKleur/Verwerker.cls.xml =================================================================== diff -u -r32362 -r41143 --- DOM/PM/enu/LBXBodemKleur/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 32362) +++ DOM/PM/enu/LBXBodemKleur/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 41143) @@ -16,6 +16,8 @@ Do ..VerwerkBruinzwart() } ElseIf LBXBodemKleur = "DG" { Do ..VerwerkDonkergrijs() + } ElseIf LBXBodemKleur = "LG" { + Do ..VerwerkLichtGrijs() } ElseIf LBXBodemKleur = "WI" { Do ..VerwerkWit() } Else { @@ -37,6 +39,12 @@ + +1 +1 + + + 1 1 Index: APPS/EC/impl/ConfiguratorService/WebshopKenmerkDomeinPostProcessor.cls.xml =================================================================== diff -u -r40685 -r41143 --- APPS/EC/impl/ConfiguratorService/WebshopKenmerkDomeinPostProcessor.cls.xml (.../WebshopKenmerkDomeinPostProcessor.cls.xml) (revision 40685) +++ APPS/EC/impl/ConfiguratorService/WebshopKenmerkDomeinPostProcessor.cls.xml (.../WebshopKenmerkDomeinPostProcessor.cls.xml) (revision 41143) @@ -88,6 +88,10 @@ If (..IsActiefValidator.If.Setting("IsActiefLbxPolarZilver").IsInvalid()) { Do ..KenmerkMogelijkheden.VerwijderMogelijkeWaarde(..LBXEnum.KenmerkNaam.LadeKleur, ..LBXEnum.LadeKleur.PolarZilver) } + + If (..IsActiefValidator.If.Setting("IsActiefLbxBodemLichtGrijs").IsInvalid()) { + Do ..KenmerkMogelijkheden.VerwijderMogelijkeWaarde(..LBXEnum.KenmerkNaam.BodemKleur, ..LBXEnum.BodemKleur.LichtGrijs) + } ]]> Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessieLozeExterneVerkoopService.txt =================================================================== diff -u -r39913 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessieLozeExterneVerkoopService.txt (.../WS.EC.SessieLozeExterneVerkoopService.txt) (revision 39913) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessieLozeExterneVerkoopService.txt (.../WS.EC.SessieLozeExterneVerkoopService.txt) (revision 41143) @@ -949,6 +949,7 @@ + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.VKP.Maatwerk.ConfiguratorService.txt =================================================================== diff -u -r39913 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.VKP.Maatwerk.ConfiguratorService.txt (.../WS.VKP.Maatwerk.ConfiguratorService.txt) (revision 39913) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.VKP.Maatwerk.ConfiguratorService.txt (.../WS.VKP.Maatwerk.ConfiguratorService.txt) (revision 41143) @@ -776,6 +776,7 @@ + Index: DOM/PM/enu/LBXBodemKleur.cls.xml =================================================================== diff -u -r29059 -r41143 --- DOM/PM/enu/LBXBodemKleur.cls.xml (.../LBXBodemKleur.cls.xml) (revision 29059) +++ DOM/PM/enu/LBXBodemKleur.cls.xml (.../LBXBodemKleur.cls.xml) (revision 41143) @@ -8,11 +8,11 @@ TECH.Enumeration -;DG;WI;BZ +;DG;WI;BZ;LG -;Donkergrijs;Wit;Bruinzwart +;Donkergrijs;Wit;Bruinzwart;LichtGrijs @@ -35,6 +35,13 @@ + + +1 +DOM.PM.enu.LBXBodemKleur + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.WebshopConfiguratorService.txt =================================================================== diff -u -r39913 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.WebshopConfiguratorService.txt (.../WS.EC.WebshopConfiguratorService.txt) (revision 39913) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.WebshopConfiguratorService.txt (.../WS.EC.WebshopConfiguratorService.txt) (revision 41143) @@ -773,6 +773,7 @@ + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ExterneVerkoopService.txt =================================================================== diff -u -r39913 -r41143 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ExterneVerkoopService.txt (.../WS.EC.ExterneVerkoopService.txt) (revision 39913) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ExterneVerkoopService.txt (.../WS.EC.ExterneVerkoopService.txt) (revision 41143) @@ -1053,6 +1053,7 @@ + Index: vhUnitTest/DOM/PM/KorttekstUtils/BepaalKorttekstLBX/TestBinnenKleurCode.cls.xml =================================================================== diff -u -r31570 -r41143 --- vhUnitTest/DOM/PM/KorttekstUtils/BepaalKorttekstLBX/TestBinnenKleurCode.cls.xml (.../TestBinnenKleurCode.cls.xml) (revision 31570) +++ vhUnitTest/DOM/PM/KorttekstUtils/BepaalKorttekstLBX/TestBinnenKleurCode.cls.xml (.../TestBinnenKleurCode.cls.xml) (revision 41143) @@ -11,6 +11,7 @@ Do ..VerwachteWaarden.SetAt("DG", ##class(DOM.PM.enu.LBXBodemKleur).Donkergrijs()) Do ..VerwachteWaarden.SetAt("WI", ##class(DOM.PM.enu.LBXBodemKleur).Wit()) Do ..VerwachteWaarden.SetAt("BZ", ##class(DOM.PM.enu.LBXBodemKleur).Bruinzwart()) + Do ..VerwachteWaarden.SetAt("LG", ##class(DOM.PM.enu.LBXBodemKleur).LichtGrijs()) Do ..AssertWaarden(IngegevenKenmerkenDto, ##class(DOM.PM.enu.LBXBodemKleur).ValueListIterator(), "BodemKleur", 24,25) ]]>