Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.PPS.TBXZaagServer.txt =================================================================== diff -u -r62344 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.PPS.TBXZaagServer.txt (.../WS.Halux.PPS.TBXZaagServer.txt) (revision 62344) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.PPS.TBXZaagServer.txt (.../WS.Halux.PPS.TBXZaagServer.txt) (revision 64190) @@ -27,6 +27,7 @@ + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneConfiguratorService.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneConfiguratorService.txt (.../WS.EC.InterneConfiguratorService.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneConfiguratorService.txt (.../WS.EC.InterneConfiguratorService.txt) (revision 64190) @@ -404,8 +404,11 @@ + + + Index: APPS/Halux/common/enu/Locatie.cls.xml =================================================================== diff -u -r61734 -r64190 --- APPS/Halux/common/enu/Locatie.cls.xml (.../Locatie.cls.xml) (revision 61734) +++ APPS/Halux/common/enu/Locatie.cls.xml (.../Locatie.cls.xml) (revision 64190) @@ -6,11 +6,11 @@ TECH.Enumeration -,Z1,Z2,Z3,Z4,P1,P2,LP1,LP2,LP3,KMHA,KMOL,BU +,Z1,Z2,Z3,Z4,P1,P2,LP1,LP2,LP3,MP4,KMHA,KMOL,BU -,Zaag1,Zaag2,Zaag3,Zaag4,Pers1,Pers2,LegraPers1,LegraPers2,LegraPers3,KartonHalux,KartonOrgalux,Bureau +,Zaag1,Zaag2,Zaag3,Zaag4,Pers1,Pers2,LegraPers1,LegraPers2,LegraPers3,MerivoPers4,KartonHalux,KartonOrgalux,Bureau @@ -69,6 +69,14 @@ ]]> + +1 +expression +APPS.Halux.common.enu.Locatie + + + 1 expression Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.WinkelkarService.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.WinkelkarService.txt (.../WS.EC.Winkelkar.WinkelkarService.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.WinkelkarService.txt (.../WS.EC.Winkelkar.WinkelkarService.txt) (revision 64190) @@ -459,8 +459,11 @@ + + + Index: DOM/PM/enu/MVXZijkantHoogte.cls.xml =================================================================== diff -u -r63752 -r64190 --- DOM/PM/enu/MVXZijkantHoogte.cls.xml (.../MVXZijkantHoogte.cls.xml) (revision 63752) +++ DOM/PM/enu/MVXZijkantHoogte.cls.xml (.../MVXZijkantHoogte.cls.xml) (revision 64190) @@ -8,26 +8,47 @@ TECH.Enumeration -;M;E +;N;M;K;E;F -;M;E +;N;M;K;E;F + +1 +DOM.PM.enu.MVXZijkantHoogte + + + 1 DOM.PM.enu.MVXZijkantHoogte + +1 +DOM.PM.enu.MVXZijkantHoogte + + + 1 DOM.PM.enu.MVXZijkantHoogte + + +1 +DOM.PM.enu.MVXZijkantHoogte + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ExterneVerkoopService.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ExterneVerkoopService.txt (.../WS.EC.ExterneVerkoopService.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ExterneVerkoopService.txt (.../WS.EC.ExterneVerkoopService.txt) (revision 64190) @@ -690,8 +690,11 @@ + + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.VKP.Maatwerk.ConfiguratorService.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.VKP.Maatwerk.ConfiguratorService.txt (.../WS.VKP.Maatwerk.ConfiguratorService.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.VKP.Maatwerk.ConfiguratorService.txt (.../WS.VKP.Maatwerk.ConfiguratorService.txt) (revision 64190) @@ -407,8 +407,11 @@ + + + Index: APPS/Halux/common/enu/Werkpost.cls.xml =================================================================== diff -u -r61758 -r64190 --- APPS/Halux/common/enu/Werkpost.cls.xml (.../Werkpost.cls.xml) (revision 61758) +++ APPS/Halux/common/enu/Werkpost.cls.xml (.../Werkpost.cls.xml) (revision 64190) @@ -6,11 +6,11 @@ TECH.Enumeration -,Z1,Z2,Z3,Z4,P1,P2,LP1,LP2,LP3,KMHA,KMOL +,Z1,Z2,Z3,Z4,P1,P2,LP1,LP2,LP3,MP4,KMHA,KMOL -,Zaag1,Zaag2,Zaag3,Zaag4,Pers1,Pers2,LegraPers1,LegraPers2,LegraPers3,KartonHalux,KartonOrgalux +,Zaag1,Zaag2,Zaag3,Zaag4,Pers1,Pers2,LegraPers1,LegraPers2,LegraPers3,MerivoPers4,KartonHalux,KartonOrgalux @@ -69,6 +69,14 @@ ]]> + +1 +expression +APPS.Halux.common.enu.Werkpost + + + 1 expression Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessieLozeExterneVerkoopService.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessieLozeExterneVerkoopService.txt (.../WS.EC.SessieLozeExterneVerkoopService.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessieLozeExterneVerkoopService.txt (.../WS.EC.SessieLozeExterneVerkoopService.txt) (revision 64190) @@ -586,8 +586,11 @@ + + + Index: DOM/PM/MVXProduct/impl/MVXLadeImpl.cls.xml =================================================================== diff -u -r62738 -r64190 --- DOM/PM/MVXProduct/impl/MVXLadeImpl.cls.xml (.../MVXLadeImpl.cls.xml) (revision 62738) +++ DOM/PM/MVXProduct/impl/MVXLadeImpl.cls.xml (.../MVXLadeImpl.cls.xml) (revision 64190) @@ -62,8 +62,8 @@ -DOM.PM.enu.MVXLadeHoogte -DOM.PM.enu.MVXZijkantHoogte + Index: DOM/PM/MVXProduct/MVXLade.cls.xml =================================================================== diff -u -r62396 -r64190 --- DOM/PM/MVXProduct/MVXLade.cls.xml (.../MVXLade.cls.xml) (revision 62396) +++ DOM/PM/MVXProduct/MVXLade.cls.xml (.../MVXLade.cls.xml) (revision 64190) @@ -38,7 +38,7 @@ 1 -DOM.PM.enu.MVXLadeHoogte +DOM.PM.enu.MVXZijkantHoogte Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.ExterneWinkelkarService.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.ExterneWinkelkarService.txt (.../WS.EC.Winkelkar.ExterneWinkelkarService.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.ExterneWinkelkarService.txt (.../WS.EC.Winkelkar.ExterneWinkelkarService.txt) (revision 64190) @@ -459,8 +459,11 @@ + + + Index: APPS/Halux/common/enu/Werkpost/AutoComplete.cls.xml =================================================================== diff -u -r61758 -r64190 --- APPS/Halux/common/enu/Werkpost/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 61758) +++ APPS/Halux/common/enu/Werkpost/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 64190) @@ -44,6 +44,13 @@ 1 + +%String +"MP4" +1 +1 + + %String "P1" Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.InterneWinkelkarService.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.InterneWinkelkarService.txt (.../WS.EC.Winkelkar.InterneWinkelkarService.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.InterneWinkelkarService.txt (.../WS.EC.Winkelkar.InterneWinkelkarService.txt) (revision 64190) @@ -459,8 +459,11 @@ + + + Index: DOM/PM/enu/MVXZijkantHoogte/Verwerker.cls.xml =================================================================== diff -u -r63752 -r64190 --- DOM/PM/enu/MVXZijkantHoogte/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 63752) +++ DOM/PM/enu/MVXZijkantHoogte/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 64190) @@ -14,8 +14,14 @@ + +1 +1 + + + + +1 +1 + + + 1 1 + + +1 +1 + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ConfiguratorKenmerkenGetter.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ConfiguratorKenmerkenGetter.txt (.../WS.EC.ConfiguratorKenmerkenGetter.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ConfiguratorKenmerkenGetter.txt (.../WS.EC.ConfiguratorKenmerkenGetter.txt) (revision 64190) @@ -408,8 +408,11 @@ + + + Index: APPS/Halux/common/enu/Werkpost/Verwerker.cls.xml =================================================================== diff -u -r61758 -r64190 --- APPS/Halux/common/enu/Werkpost/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 61758) +++ APPS/Halux/common/enu/Werkpost/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 64190) @@ -22,6 +22,8 @@ Do ..VerwerkLegraPers2() } ElseIf Werkpost = "LP3" { Do ..VerwerkLegraPers3() + } ElseIf Werkpost = "MP4" { + Do ..VerwerkMerivoPers4() } ElseIf Werkpost = "P1" { Do ..VerwerkPers1() } ElseIf Werkpost = "P2" { @@ -71,6 +73,12 @@ + +1 +1 + + + 1 1 Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneVerkoopService.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneVerkoopService.txt (.../WS.EC.InterneVerkoopService.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.InterneVerkoopService.txt (.../WS.EC.InterneVerkoopService.txt) (revision 64190) @@ -600,8 +600,11 @@ + + + Index: APPS/Halux/common/enu/Locatie/AutoComplete.cls.xml =================================================================== diff -u -r61734 -r64190 --- APPS/Halux/common/enu/Locatie/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 61734) +++ APPS/Halux/common/enu/Locatie/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 64190) @@ -51,6 +51,13 @@ 1 + +%String +"MP4" +1 +1 + + %String "P1" Index: APPS/Halux/common/enu/Locatie/Verwerker.cls.xml =================================================================== diff -u -r61734 -r64190 --- APPS/Halux/common/enu/Locatie/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 61734) +++ APPS/Halux/common/enu/Locatie/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 64190) @@ -24,6 +24,8 @@ Do ..VerwerkLegraPers2() } ElseIf Locatie = "LP3" { Do ..VerwerkLegraPers3() + } ElseIf Locatie = "MP4" { + Do ..VerwerkMerivoPers4() } ElseIf Locatie = "P1" { Do ..VerwerkPers1() } ElseIf Locatie = "P2" { @@ -79,6 +81,12 @@ + +1 +1 + + + 1 1 Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Vhisie4.Winkelkar.WinkelkarService.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Vhisie4.Winkelkar.WinkelkarService.txt (.../WS.Vhisie4.Winkelkar.WinkelkarService.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Vhisie4.Winkelkar.WinkelkarService.txt (.../WS.Vhisie4.Winkelkar.WinkelkarService.txt) (revision 64190) @@ -782,8 +782,11 @@ + + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.VKP.VerkoopService.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.VKP.VerkoopService.txt (.../WS.APPS.VKP.VerkoopService.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.VKP.VerkoopService.txt (.../WS.APPS.VKP.VerkoopService.txt) (revision 64190) @@ -405,8 +405,11 @@ + + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.PM.Maatwerk.MaatwerkService.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.PM.Maatwerk.MaatwerkService.txt (.../WS.PM.Maatwerk.MaatwerkService.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.PM.Maatwerk.MaatwerkService.txt (.../WS.PM.Maatwerk.MaatwerkService.txt) (revision 64190) @@ -711,8 +711,11 @@ + + + Index: DOM/PM/enu/MVXZijkantHoogte/AutoComplete.cls.xml =================================================================== diff -u -r63752 -r64190 --- DOM/PM/enu/MVXZijkantHoogte/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 63752) +++ DOM/PM/enu/MVXZijkantHoogte/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 64190) @@ -16,12 +16,33 @@ 1 + +%String +"F" +1 +1 + + + +%String +"K" +1 +1 + + %String "M" 1 1 + + +%String +"N" +1 +1 + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.WebshopConfiguratorService.txt =================================================================== diff -u -r64169 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.WebshopConfiguratorService.txt (.../WS.EC.WebshopConfiguratorService.txt) (revision 64169) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.WebshopConfiguratorService.txt (.../WS.EC.WebshopConfiguratorService.txt) (revision 64190) @@ -404,8 +404,11 @@ + + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.PPS.TBXPersServer.txt =================================================================== diff -u -r61764 -r64190 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.PPS.TBXPersServer.txt (.../WS.Halux.PPS.TBXPersServer.txt) (revision 61764) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.PPS.TBXPersServer.txt (.../WS.Halux.PPS.TBXPersServer.txt) (revision 64190) @@ -28,6 +28,7 @@ +