Index: DOM/common/enu/Personality/Verwerker.cls.xml =================================================================== diff -u -r72621 -r72648 --- DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 72621) +++ DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 72648) @@ -32,6 +32,8 @@ Do ..VerwerkBlumPLDrewTrans() } ElseIf Personality = "64" { Do ..VerwerkBlumPLDrewno() + } ElseIf Personality = "66" { + Do ..VerwerkBlumPLHorst() } ElseIf Personality = "56" { Do ..VerwerkBlumPLMeble() } ElseIf Personality = "55" { @@ -205,6 +207,12 @@ + +1 +1 + + + 1 1 Index: vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml =================================================================== diff -u -r72598 -r72648 --- vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml (.../Test.cls.xml) (revision 72598) +++ vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml (.../Test.cls.xml) (revision 72648) @@ -38,6 +38,7 @@ continue:(Personality.GeefID() = ..Enum.Personality.BlumPLDemo) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLDrewno) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLDrewTrans) + continue:(Personality.GeefID() = ..Enum.Personality.BlumPLHorst) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMeble) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMebloa) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMeblolux) Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumPLHorst.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumPLHorst.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumPLHorst.txt (revision 72648) @@ -0,0 +1,6 @@ + + + 170.77 + 168.36 + 168.36 + \ No newline at end of file Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml =================================================================== diff -u -r72621 -r72648 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72621) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72648) @@ -92,6 +92,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLDemo()) 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).BlumPLMeble()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLMebloa()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLMeblolux()) Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml =================================================================== diff -u -r72621 -r72648 --- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 72621) +++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 72648) @@ -75,7 +75,8 @@ ..Personality.BlumPLWior, ..Personality.BlumPLDrewno, ..Personality.BlumPLBiuroStyl, - ..Personality.HaefeleES) { + ..Personality.HaefeleES, + ..Personality.BlumPLHorst) { 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") @@ -148,7 +149,8 @@ ..Personality.BlumPLWior, ..Personality.BlumPLDrewno, ..Personality.BlumPLBiuroStyl, - ..Personality.HaefeleES) { + ..Personality.HaefeleES, + ..Personality.BlumPLHorst) { 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: DOM/common/enu/Personality.cls.xml =================================================================== diff -u -r72621 -r72648 --- DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 72621) +++ DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 72648) @@ -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 +,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 -,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 +,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 @@ -473,6 +473,13 @@ ]]> + +1 +DOM.common.enu.Personality + + + 1 ValueToBeIgnored...:TECH.String Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml =================================================================== diff -u -r72621 -r72648 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72621) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72648) @@ -94,6 +94,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLDemo()) 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).BlumPLMeble()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLMebloa()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLMeblolux()) Index: DOM/common/impl/PersonalityService.cls.xml =================================================================== diff -u -r72621 -r72648 --- DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 72621) +++ DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 72648) @@ -135,6 +135,7 @@ Quit:(PersonalityID = Personality.BlumPLDemo) $$$True Quit:(PersonalityID = Personality.BlumPLDrewno) $$$True Quit:(PersonalityID = Personality.BlumPLDrewTrans) $$$True + Quit:(PersonalityID = Personality.BlumPLHorst) $$$True Quit:(PersonalityID = Personality.BlumPLMeble) $$$True Quit:(PersonalityID = Personality.BlumPLMebloa) $$$True Quit:(PersonalityID = Personality.BlumPLMeblolux) $$$True Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml =================================================================== diff -u -r72621 -r72648 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 72621) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 72648) @@ -95,6 +95,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLDemo()) 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).BlumPLMeble()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLMebloa()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLMeblolux()) Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumPLHorst.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumPLHorst.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumPLHorst.txt (revision 72648) @@ -0,0 +1,6 @@ + + + 145.68 + 145.68 + 145.68 + \ No newline at end of file Index: DOM/common/enu/Personality/AutoComplete.cls.xml =================================================================== diff -u -r72621 -r72648 --- DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 72621) +++ DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 72648) @@ -79,6 +79,13 @@ 1 + +%String +"66" +1 +1 + + %String "56" Index: vhDeploy/Deploy20240216xAanmakenNieuweDistributeursBlumPolen.cls.xml =================================================================== diff -u -r72598 -r72648 --- vhDeploy/Deploy20240216xAanmakenNieuweDistributeursBlumPolen.cls.xml (.../Deploy20240216xAanmakenNieuweDistributeursBlumPolen.cls.xml) (revision 72598) +++ vhDeploy/Deploy20240216xAanmakenNieuweDistributeursBlumPolen.cls.xml (.../Deploy20240216xAanmakenNieuweDistributeursBlumPolen.cls.xml) (revision 72648) @@ -10,10 +10,7 @@ 1 - Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt =================================================================== diff -u -r72621 -r72648 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt (.../WS.EC.SessionService.txt) (revision 72621) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt (.../WS.EC.SessionService.txt) (revision 72648) @@ -163,6 +163,7 @@ + Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumPLHorst.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumPLHorst.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumPLHorst.txt (revision 72648) @@ -0,0 +1,6 @@ + + + 323.99 + 324 + 324 + \ No newline at end of file Index: vhDeploy/Deploy20240216xLogosNieuweDistributeursBlumPolen.cls.xml =================================================================== diff -u -r72598 -r72648 --- vhDeploy/Deploy20240216xLogosNieuweDistributeursBlumPolen.cls.xml (.../Deploy20240216xLogosNieuweDistributeursBlumPolen.cls.xml) (revision 72598) +++ vhDeploy/Deploy20240216xLogosNieuweDistributeursBlumPolen.cls.xml (.../Deploy20240216xLogosNieuweDistributeursBlumPolen.cls.xml) (revision 72648) @@ -5,19 +5,15 @@ %String -Nieuwe mapping voor logos van Meurer en BlumPLDrewTrans, voor alle etiketten en leverbon. +Nieuwe mapping voor logos van BlumPLHorst, voor alle etiketten en leverbon. 1 Index: DOM/common/BlumPLHorstPersonality.cls.xml =================================================================== diff -u --- DOM/common/BlumPLHorstPersonality.cls.xml (revision 0) +++ DOM/common/BlumPLHorstPersonality.cls.xml (revision 72648) @@ -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: vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml =================================================================== diff -u -r72598 -r72648 --- vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml (.../Test.cls.xml) (revision 72598) +++ vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml (.../Test.cls.xml) (revision 72648) @@ -85,6 +85,7 @@ Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLDemo()) 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).BlumPLMeble()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLMebloa()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLMeblolux())