Index: DOM/common/enu/Personality.cls.xml =================================================================== diff -u -r72648 -r72726 --- DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 72648) +++ DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 72726) @@ -6,11 +6,11 @@ TECH.Enumeration -,VanHoecke,VanHoeckeVoorHalux,SFS,Dupont,Kisch,Destil,HaefeleBE,VanRaemdonck,Noteborn,Daro,Hein,HaefeleNL,Seefelder,BeslagDesign,Demo,Zweygart,Galimberti,Pavanello,Ferexpert,Beslagteknikk,BiemarBois,CampeTonny,Rini,Furnifit,YachtSupplier,DSGroup,DeBisschop,DeceuninckDeforce,Pierard,JBarth,HaefeleDE,Kleiner,Layer,HahleOy,HaefeleSE,HaefeleFI,HaefeleIT,HaefeleAT,OPO,HaefeleFR,HaefeleDK,HaefeleCH,HaefeleNO,Martens,Dozon,BlumPL,BlumPLMerkur,BlumPLCMeube,BlumPLDemo,BlumPLSAS,BlumPLSchach,BlumPLMebloa,BlumPLMeble,BlumPLPakdrew,BlumPLMeblolux,BlumPLAbler,BlumPLWiP,Meurer,BlumPLDrewTrans,HaefeleES,BlumPLWior,BlumPLDrewno,BlumPLBiuroStyl,BlumPLHorst +,VanHoecke,VanHoeckeVoorHalux,SFS,Dupont,Kisch,Destil,HaefeleBE,VanRaemdonck,Noteborn,Daro,Hein,HaefeleNL,Seefelder,BeslagDesign,Demo,Zweygart,Galimberti,Pavanello,Ferexpert,Beslagteknikk,BiemarBois,CampeTonny,Rini,Furnifit,YachtSupplier,DSGroup,DeBisschop,DeceuninckDeforce,Pierard,JBarth,HaefeleDE,Kleiner,Layer,HahleOy,HaefeleSE,HaefeleFI,HaefeleIT,HaefeleAT,OPO,HaefeleFR,HaefeleDK,HaefeleCH,HaefeleNO,Martens,Dozon,BlumPL,BlumPLMerkur,BlumPLCMeube,BlumPLDemo,BlumPLSAS,BlumPLSchach,BlumPLMebloa,BlumPLMeble,BlumPLPakdrew,BlumPLMeblolux,BlumPLAbler,BlumPLWiP,Meurer,BlumPLDrewTrans,HaefeleES,BlumPLWior,BlumPLDrewno,BlumPLBiuroStyl,BlumPLHorst,BlumPLIntar -,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66 +,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67 @@ -480,6 +480,13 @@ ]]> + +1 +DOM.common.enu.Personality + + + 1 ValueToBeIgnored...:TECH.String Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml =================================================================== diff -u -r72648 -r72726 --- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 72648) +++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 72726) @@ -76,7 +76,8 @@ ..Personality.BlumPLDrewno, ..Personality.BlumPLBiuroStyl, ..Personality.HaefeleES, - ..Personality.BlumPLHorst) { + ..Personality.BlumPLHorst, + ..Personality.BlumPLIntar) { Do $$$AssertTrue(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout") } ElseIf ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.VanHoecke,..Personality.VanHoeckeVoorHalux,..Personality.SFS,..Personality.OPO,..Personality.Kisch,..Personality.Destil,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Noteborn,..Personality.Daro,..Personality.BeslagDesign,..Personality.Demo,..Personality.Galimberti,..Personality.Pavanello,..Personality.Ferexpert,..Personality.Beslagteknikk,..Personality.YachtSupplier,..Personality.DeceuninckDeforce,..Personality.Pierard,..Personality.HahleOy,..Personality.BiemarBois,..Personality.CampeTonny, ..Personality.Dupont) { Do $$$AssertFalse(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout") @@ -150,7 +151,8 @@ ..Personality.BlumPLDrewno, ..Personality.BlumPLBiuroStyl, ..Personality.HaefeleES, - ..Personality.BlumPLHorst) { + ..Personality.BlumPLHorst, + ..Personality.BlumPLIntar) { Do $$$AssertTrue(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout") } ElseIf ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.VanHoecke,..Personality.VanHoeckeVoorHalux,..Personality.SFS,..Personality.OPO,..Personality.Kisch,..Personality.Destil,..Personality.Noteborn,..Personality.Daro,..Personality.BeslagDesign,..Personality.Demo,..Personality.Galimberti,..Personality.Beslagteknikk,..Personality.YachtSupplier,..Personality.DeceuninckDeforce,..Personality.Pierard,..Personality.HahleOy,..Personality.BiemarBois,..Personality.CampeTonny) { Do $$$AssertFalse(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout") Index: vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml =================================================================== diff -u -r72648 -r72726 --- vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml (.../Test.cls.xml) (revision 72648) +++ vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml (.../Test.cls.xml) (revision 72726) @@ -86,6 +86,7 @@ Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLDrewno()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLDrewTrans()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLHorst()) + Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLIntar()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLMeble()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLMebloa()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLMeblolux()) Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml =================================================================== diff -u -r72648 -r72726 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72648) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72726) @@ -95,6 +95,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLDrewno()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLDrewTrans()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLHorst()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLIntar()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLMeble()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLMebloa()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLMeblolux()) Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml =================================================================== diff -u -r72648 -r72726 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 72648) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 72726) @@ -96,6 +96,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLDrewno()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLDrewTrans()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLHorst()) + Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLIntar()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLMeble()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLMebloa()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLMeblolux()) Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt =================================================================== diff -u -r72648 -r72726 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt (.../WS.EC.SessionService.txt) (revision 72648) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt (.../WS.EC.SessionService.txt) (revision 72726) @@ -164,6 +164,7 @@ + Index: DOM/common/enu/Personality/AutoComplete.cls.xml =================================================================== diff -u -r72648 -r72726 --- DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 72648) +++ DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 72726) @@ -86,6 +86,13 @@ 1 + +%String +"67" +1 +1 + + %String "56" Index: DOM/common/impl/PersonalityService.cls.xml =================================================================== diff -u -r72648 -r72726 --- DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 72648) +++ DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 72726) @@ -136,6 +136,7 @@ Quit:(PersonalityID = Personality.BlumPLDrewno) $$$True Quit:(PersonalityID = Personality.BlumPLDrewTrans) $$$True Quit:(PersonalityID = Personality.BlumPLHorst) $$$True + Quit:(PersonalityID = Personality.BlumPLIntar) $$$True Quit:(PersonalityID = Personality.BlumPLMeble) $$$True Quit:(PersonalityID = Personality.BlumPLMebloa) $$$True Quit:(PersonalityID = Personality.BlumPLMeblolux) $$$True Index: DOM/common/BlumPLIntarPersonality.cls.xml =================================================================== diff -u --- DOM/common/BlumPLIntarPersonality.cls.xml (revision 0) +++ DOM/common/BlumPLIntarPersonality.cls.xml (revision 72726) @@ -0,0 +1,55 @@ + + + +DOM.common.impl.HandelPersonality + + +1 +DOM.common.impl.Personality + + + + +DOM.enu.Taal + + + + +Visitor:DOM.common.PersonalityVisitor + + + + +DOM.common.LeverancierPersonalityData + + + + +%Boolean + + + + +%String + + + + +%String + + + + +%Library.CacheStorage + + + + + Index: DOM/common/enu/Personality/Verwerker.cls.xml =================================================================== diff -u -r72648 -r72726 --- DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 72648) +++ DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 72726) @@ -34,6 +34,8 @@ Do ..VerwerkBlumPLDrewno() } ElseIf Personality = "66" { Do ..VerwerkBlumPLHorst() + } ElseIf Personality = "67" { + Do ..VerwerkBlumPLIntar() } ElseIf Personality = "56" { Do ..VerwerkBlumPLMeble() } ElseIf Personality = "55" { @@ -213,6 +215,12 @@ + +1 +1 + + + 1 1 Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml =================================================================== diff -u -r72648 -r72726 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72648) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72726) @@ -93,6 +93,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLDrewno()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLDrewTrans()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLHorst()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLIntar()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLMeble()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLMebloa()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLMeblolux()) Index: vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml =================================================================== diff -u -r72648 -r72726 --- vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml (.../Test.cls.xml) (revision 72648) +++ vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml (.../Test.cls.xml) (revision 72726) @@ -39,6 +39,7 @@ continue:(Personality.GeefID() = ..Enum.Personality.BlumPLDrewno) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLDrewTrans) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLHorst) + continue:(Personality.GeefID() = ..Enum.Personality.BlumPLIntar) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMeble) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMebloa) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMeblolux) Index: vhDeploy/Deploy20240312xLogosNieuweDistributeursBlumPolen.cls.xml =================================================================== diff -u --- vhDeploy/Deploy20240312xLogosNieuweDistributeursBlumPolen.cls.xml (revision 0) +++ vhDeploy/Deploy20240312xLogosNieuweDistributeursBlumPolen.cls.xml (revision 72726) @@ -0,0 +1,22 @@ + + + +vhDeploy.Deploy + + +%String +Nieuwe mapping voor logos van Meurer en BlumPLDrewTrans, voor alle etiketten en leverbon. + + + +1 + + + + + + Index: vhDeploy/Deploy20240312xAanmakenNieuweDistributeursBlumPolen.cls.xml =================================================================== diff -u --- vhDeploy/Deploy20240312xAanmakenNieuweDistributeursBlumPolen.cls.xml (revision 0) +++ vhDeploy/Deploy20240312xAanmakenNieuweDistributeursBlumPolen.cls.xml (revision 72726) @@ -0,0 +1,26 @@ + + + +vhDeploy.Deploy + + +%String +Aanmaken van personality Blum Polen Intar + + + +1 + + + + +1 +PersonalityId:%Integer,PersonalityClassname:%String + + + + + +