Index: DOM/common/enu/Personality.cls.xml =================================================================== diff -u -r73289 -r74459 --- DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 73289) +++ DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 74459) @@ -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,BlumPLIntar,BlumPLMeblostyl,BlumPLKOK,BlumPLMarkat,OPODe,BlumPLKosmaz,BlumPLHeban,BlumCZ +,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,BlumPLMeblostyl,BlumPLKOK,BlumPLMarkat,OPODe,BlumPLKosmaz,BlumPLHeban,BlumCZ,BlumCZSchachermayer,BlumCZJAF,BlumCZTwd,BlumCZDrevoTrust -,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,68,69,70,71,72,73,74 +,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,68,69,70,71,72,73,74,75,76,77,78 @@ -536,6 +536,34 @@ ]]> + +1 +DOM.common.enu.Personality + + + + +1 +DOM.common.enu.Personality + + + + +1 +DOM.common.enu.Personality + + + + +1 +DOM.common.enu.Personality + + + 1 ValueToBeIgnored...:TECH.String Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumCZSchachermayer.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumCZSchachermayer.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumCZSchachermayer.txt (revision 74459) @@ -0,0 +1,5 @@ + + + 323.99 + 647.98 + \ No newline at end of file Index: vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml =================================================================== diff -u -r73168 -r74459 --- vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml (.../Test.cls.xml) (revision 73168) +++ vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml (.../Test.cls.xml) (revision 74459) @@ -54,6 +54,10 @@ continue:(Personality.GeefID() = ..Enum.Personality.BlumPLSchach) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLWior) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLWiP) + continue:(Personality.GeefID() = ..Enum.Personality.BlumCZSchachermayer) + continue:(Personality.GeefID() = ..Enum.Personality.BlumCZJAF) + continue:(Personality.GeefID() = ..Enum.Personality.BlumCZTwd) + continue:(Personality.GeefID() = ..Enum.Personality.BlumCZDrevoTrust) do ..AssertIsGeldigKlantId(Personality) } Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZDrevoTrust.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZDrevoTrust.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZDrevoTrust.txt (revision 74459) @@ -0,0 +1,5 @@ + + + 170.77 + 341.54 + \ No newline at end of file Index: DOM/common/BlumCZDrevoTrustPersonality.cls.xml =================================================================== diff -u --- DOM/common/BlumCZDrevoTrustPersonality.cls.xml (revision 0) +++ DOM/common/BlumCZDrevoTrustPersonality.cls.xml (revision 74459) @@ -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/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml =================================================================== diff -u -r73289 -r74459 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73289) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 74459) @@ -113,6 +113,10 @@ Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Meurer()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).OPODe()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumCZ()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumCZSchachermayer()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumCZJAF()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumCZTwd()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumCZDrevoTrust()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZJAF.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZJAF.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZJAF.txt (revision 74459) @@ -0,0 +1,5 @@ + + + 170.77 + 341.54 + \ No newline at end of file Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumCZDrevoTrust.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumCZDrevoTrust.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumCZDrevoTrust.txt (revision 74459) @@ -0,0 +1,5 @@ + + + 323.99 + 647.98 + \ No newline at end of file Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml =================================================================== diff -u -r73289 -r74459 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 73289) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 74459) @@ -111,6 +111,10 @@ Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Meurer()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).OPODe()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumCZ()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumCZSchachermayer()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumCZJAF()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumCZTwd()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumCZDrevoTrust()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumCZTwd.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumCZTwd.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumCZTwd.txt (revision 74459) @@ -0,0 +1,5 @@ + + + 323.99 + 647.98 + \ No newline at end of file Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZJAF.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZJAF.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZJAF.txt (revision 74459) @@ -0,0 +1,5 @@ + + + 145.68 + 291.36 + \ No newline at end of file Index: vhDeploy/Deploy20250212xAanmakenDistributeursBlumTsjechie.cls.xml =================================================================== diff -u --- vhDeploy/Deploy20250212xAanmakenDistributeursBlumTsjechie.cls.xml (revision 0) +++ vhDeploy/Deploy20250212xAanmakenDistributeursBlumTsjechie.cls.xml (revision 74459) @@ -0,0 +1,30 @@ + + + +vhDeploy.Deploy + + +%String +Aanmaken van personalities BlumCZSchachermayer, BlumCZJAF, BlumCZTwd,en BlumCZDrevoTrust + + + +1 + + + + +1 +PersonalityId:%Integer,PersonalityClassname:%String + + + + + + Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZSchachermayer.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZSchachermayer.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZSchachermayer.txt (revision 74459) @@ -0,0 +1,5 @@ + + + 145.68 + 291.36 + \ No newline at end of file Index: DOM/common/BlumCZSchachermayerPersonality.cls.xml =================================================================== diff -u --- DOM/common/BlumCZSchachermayerPersonality.cls.xml (revision 0) +++ DOM/common/BlumCZSchachermayerPersonality.cls.xml (revision 74459) @@ -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: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumCZJAF.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumCZJAF.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumCZJAF.txt (revision 74459) @@ -0,0 +1,5 @@ + + + 323.99 + 647.98 + \ No newline at end of file Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml =================================================================== diff -u -r73289 -r74459 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 73289) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 74459) @@ -114,6 +114,10 @@ Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Meurer()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).OPODe()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumCZ()) + Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumCZSchachermayer()) + Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumCZJAF()) + Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumCZTwd()) + Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumCZDrevoTrust()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml =================================================================== diff -u -r73168 -r74459 --- vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml (.../Test.cls.xml) (revision 73168) +++ vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml (.../Test.cls.xml) (revision 74459) @@ -102,6 +102,12 @@ Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLWior()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLWiP()) + // alle distributeurs van Blum Tsjechie hebben dezelfde prefix: _BCZD + Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumCZSchachermayer()) + Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumCZJAF()) + Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumCZTwd()) + Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumCZDrevoTrust()) + Quit Uitzonderingen ]]> Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZTwd.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZTwd.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZTwd.txt (revision 74459) @@ -0,0 +1,5 @@ + + + 145.68 + 291.36 + \ No newline at end of file Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml =================================================================== diff -u -r73289 -r74459 --- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 73289) +++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 74459) @@ -84,7 +84,11 @@ ..Personality.BlumPLKosmaz, ..Personality.BlumPLHeban, ..Personality.OPODe, - ..Personality.BlumCZ) { + ..Personality.BlumCZ, + ..Personality.BlumCZSchachermayer, + ..Personality.BlumCZJAF, + ..Personality.BlumCZTwd, + ..Personality.BlumCZDrevoTrust) { 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") @@ -166,7 +170,11 @@ ..Personality.BlumPLKosmaz, ..Personality.BlumPLHeban, ..Personality.OPODe, - ..Personality.BlumCZ) { + ..Personality.BlumCZ, + ..Personality.BlumCZSchachermayer, + ..Personality.BlumCZJAF, + ..Personality.BlumCZTwd, + ..Personality.BlumCZDrevoTrust) { 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: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZTwd.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZTwd.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZTwd.txt (revision 74459) @@ -0,0 +1,5 @@ + + + 170.77 + 341.54 + \ No newline at end of file Index: DOM/common/BlumCZTwdPersonality.cls.xml =================================================================== diff -u --- DOM/common/BlumCZTwdPersonality.cls.xml (revision 0) +++ DOM/common/BlumCZTwdPersonality.cls.xml (revision 74459) @@ -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 -r73289 -r74459 --- DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 73289) +++ DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 74459) @@ -20,6 +20,14 @@ Do ..VerwerkBiemarBois() } ElseIf Personality = "74" { Do ..VerwerkBlumCZ() + } ElseIf Personality = "78" { + Do ..VerwerkBlumCZDrevoTrust() + } ElseIf Personality = "76" { + Do ..VerwerkBlumCZJAF() + } ElseIf Personality = "75" { + Do ..VerwerkBlumCZSchachermayer() + } ElseIf Personality = "77" { + Do ..VerwerkBlumCZTwd() } ElseIf Personality = "48" { Do ..VerwerkBlumPL() } ElseIf Personality = "58" { @@ -187,6 +195,30 @@ + +1 +1 + + + + +1 +1 + + + + +1 +1 + + + + +1 +1 + + + 1 1 Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZSchachermayer.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZSchachermayer.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumCZSchachermayer.txt (revision 74459) @@ -0,0 +1,5 @@ + + + 170.77 + 341.54 + \ No newline at end of file Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt =================================================================== diff -u -r73330 -r74459 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt (.../WS.EC.SessionService.txt) (revision 73330) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt (.../WS.EC.SessionService.txt) (revision 74459) @@ -174,6 +174,10 @@ + + + + Index: DOM/common/impl/PersonalityService.cls.xml =================================================================== diff -u -r73289 -r74459 --- DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 73289) +++ DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 74459) @@ -155,6 +155,10 @@ Quit:(PersonalityID = Personality.Meurer) $$$True Quit:(PersonalityID = Personality.OPODe) $$$True Quit:(PersonalityID = Personality.BlumCZ) $$$True + Quit:(PersonalityID = Personality.BlumCZSchachermayer) $$$True + Quit:(PersonalityID = Personality.BlumCZJAF) $$$True + Quit:(PersonalityID = Personality.BlumCZTwd) $$$True + Quit:(PersonalityID = Personality.BlumCZDrevoTrust) $$$True If ..ProjectSettingsAPI.IsActiefDuPontNaarEindklant() { Quit:(PersonalityID = ##class(DOM.common.enu.Personality).Dupont()) $$$True } Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZDrevoTrust.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZDrevoTrust.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_BlumCZDrevoTrust.txt (revision 74459) @@ -0,0 +1,5 @@ + + + 145.68 + 291.36 + \ No newline at end of file Index: DOM/common/enu/Personality/AutoComplete.cls.xml =================================================================== diff -u -r73289 -r74459 --- DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 73289) +++ DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 74459) @@ -37,6 +37,34 @@ 1 + +%String +"78" +1 +1 + + + +%String +"76" +1 +1 + + + +%String +"75" +1 +1 + + + +%String +"77" +1 +1 + + %String "48" Index: DOM/common/BlumCZJAFPersonality.cls.xml =================================================================== diff -u --- DOM/common/BlumCZJAFPersonality.cls.xml (revision 0) +++ DOM/common/BlumCZJAFPersonality.cls.xml (revision 74459) @@ -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 + + + + +