Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumPLMeblolux.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumPLMeblolux.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumPLMeblolux.txt (revision 72598) @@ -0,0 +1,6 @@ + + + 323.99 + 324 + 324 + \ No newline at end of file Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumPLWiP.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumPLWiP.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumPLWiP.txt (revision 72598) @@ -0,0 +1,6 @@ + + + 323.99 + 324 + 324 + \ No newline at end of file Index: vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml =================================================================== diff -u -r72516 -r72598 --- vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml (.../Test.cls.xml) (revision 72516) +++ vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml (.../Test.cls.xml) (revision 72598) @@ -33,8 +33,10 @@ If ($$$Not(Personality.%Extends(##class(DOM.common.DemoPersonality).%ClassName($$$True)))) { continue:(Personality.GeefID() = ..Enum.Personality.VanHoeckeVoorHalux) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLAbler) + continue:(Personality.GeefID() = ..Enum.Personality.BlumPLBiuroStyl) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLCMeube) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLDemo) + continue:(Personality.GeefID() = ..Enum.Personality.BlumPLDrewno) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLDrewTrans) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMeble) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLMebloa) @@ -43,6 +45,7 @@ continue:(Personality.GeefID() = ..Enum.Personality.BlumPLPakdrew) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLSAS) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLSchach) + continue:(Personality.GeefID() = ..Enum.Personality.BlumPLWior) continue:(Personality.GeefID() = ..Enum.Personality.BlumPLWiP) do ..AssertIsGeldigKlantId(Personality) Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml =================================================================== diff -u -r72516 -r72598 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72516) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72598) @@ -88,8 +88,10 @@ Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Dozon()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPL()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLAbler()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLBiuroStyl()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLCMeube()) 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).BlumPLMeble()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLMebloa()) @@ -98,6 +100,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLPakdrew()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLSAS()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLSchach()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLWior()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumPLWiP()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Meurer()) Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_Meurer.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_Meurer.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_Meurer.txt (revision 72598) @@ -0,0 +1,6 @@ + + + 58.93 + 84.18 + 84.18 + \ No newline at end of file Index: DOM/common/enu/Personality.cls.xml =================================================================== diff -u -r72516 -r72598 --- DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 72516) +++ DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 72598) @@ -445,6 +445,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_Meurer.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_Meurer.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_Meurer.txt (revision 72598) @@ -0,0 +1,6 @@ + + + 113.4 + 162 + 162.00 + \ No newline at end of file Index: DOM/common/BlumPLBiuroStylPersonality.cls.xml =================================================================== diff -u --- DOM/common/BlumPLBiuroStylPersonality.cls.xml (revision 0) +++ DOM/common/BlumPLBiuroStylPersonality.cls.xml (revision 72598) @@ -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/TestLBXMPprijzen/LBX_BlumPLAbler.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumPLAbler.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumPLAbler.txt (revision 72598) @@ -0,0 +1,6 @@ + + + 170.77 + 168.36 + 168.36 + \ No newline at end of file Index: vhDeploy/Deploy20240216xAanmakenNieuweDistributeursBlumPolen.cls.xml =================================================================== diff -u --- vhDeploy/Deploy20240216xAanmakenNieuweDistributeursBlumPolen.cls.xml (revision 0) +++ vhDeploy/Deploy20240216xAanmakenNieuweDistributeursBlumPolen.cls.xml (revision 72598) @@ -0,0 +1,29 @@ + + + +vhDeploy.Deploy + + +%String +Aanmaken van personality Blum Polen Wior, Drewno en BiuroStyl + + + +1 + + + + +1 +PersonalityId:%Integer,PersonalityClassname:%String + + + + + + Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumPLAbler.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumPLAbler.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_BlumPLAbler.txt (revision 72598) @@ -0,0 +1,6 @@ + + + 323.99 + 324 + 324 + \ No newline at end of file Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml =================================================================== diff -u -r72516 -r72598 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 72516) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 72598) @@ -89,8 +89,10 @@ Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Dozon()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPL()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLAbler()) + Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLBiuroStyl()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLCMeube()) 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).BlumPLMeble()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLMebloa()) @@ -99,6 +101,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLPakdrew()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLSAS()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLSchach()) + Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLWior()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumPLWiP()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Meurer()) Index: DOM/common/BlumPLWiorPersonality.cls.xml =================================================================== diff -u --- DOM/common/BlumPLWiorPersonality.cls.xml (revision 0) +++ DOM/common/BlumPLWiorPersonality.cls.xml (revision 72598) @@ -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/AutoComplete.cls.xml =================================================================== diff -u -r72516 -r72598 --- DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 72516) +++ DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 72598) @@ -44,6 +44,13 @@ 1 + +%String +"65" +1 +1 + + %String "50" @@ -65,6 +72,13 @@ 1 + +%String +"64" +1 +1 + + %String "56" @@ -121,6 +135,13 @@ 1 + +%String +"63" +1 +1 + + %String "22" @@ -282,6 +303,13 @@ 1 + +%String +"62" +1 +1 + + %String "36" Index: DOM/common/BlumPLDrewnoPersonality.cls.xml =================================================================== diff -u --- DOM/common/BlumPLDrewnoPersonality.cls.xml (revision 0) +++ DOM/common/BlumPLDrewnoPersonality.cls.xml (revision 72598) @@ -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/TestLBXMPprijzen/LBX_BlumPLWiP.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumPLWiP.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumPLWiP.txt (revision 72598) @@ -0,0 +1,6 @@ + + + 170.77 + 168.36 + 168.36 + \ No newline at end of file Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml =================================================================== diff -u -r72516 -r72598 --- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 72516) +++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 72598) @@ -34,7 +34,7 @@ while PersonalityIterator.HasNext() { #dim PersonalityId as %String = PersonalityIterator.Next() - if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleFR,..Personality.HaefeleDK,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens, ..Personality.Dozon, ..Personality.BlumPL, ..Personality.DeceuninckDeforce, ..Personality.BlumPLCMeube, ..Personality.BlumPLDemo, ..Personality.BlumPLMeble, ..Personality.BlumPLMebloa, ..Personality.BlumPLMerkur, ..Personality.BlumPLPakdrew, ..Personality.BlumPLSAS, ..Personality.BlumPLSchach, ..Personality.BlumPLMeblolux, ..Personality.BlumPLAbler, ..Personality.BlumPLWiP, ..Personality.BlumPLDrewTrans, ..Personality.Meurer){ + if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleFR,..Personality.HaefeleDK,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens, ..Personality.Dozon, ..Personality.BlumPL, ..Personality.DeceuninckDeforce, ..Personality.BlumPLCMeube, ..Personality.BlumPLDemo, ..Personality.BlumPLMeble, ..Personality.BlumPLMebloa, ..Personality.BlumPLMerkur, ..Personality.BlumPLPakdrew, ..Personality.BlumPLSAS, ..Personality.BlumPLSchach, ..Personality.BlumPLMeblolux, ..Personality.BlumPLAbler, ..Personality.BlumPLWiP, ..Personality.BlumPLDrewTrans, ..Personality.Meurer, ..Personality.BlumPLWior, ..Personality.BlumPLDrewno, ..Personality.BlumPLBiuroStyl){ 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") @@ -61,7 +61,7 @@ while PersonalityIterator.HasNext() { #dim PersonalityId as %String = PersonalityIterator.Next() - if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer, ..Personality.Dupont,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Pavanello,..Personality.Ferexpert,,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleDK,..Personality.HaefeleFR,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens, ..Personality.Dozon, ..Personality.BlumPL, ..Personality.DeceuninckDeforce, ..Personality.BlumPLCMeube, ..Personality.BlumPLDemo, ..Personality.BlumPLMeble, ..Personality.BlumPLMebloa, ..Personality.BlumPLMerkur, ..Personality.BlumPLPakdrew, ..Personality.BlumPLSAS, ..Personality.BlumPLSchach, ..Personality.BlumPLMeblolux, ..Personality.BlumPLAbler, ..Personality.BlumPLWiP, ..Personality.BlumPLDrewTrans, ..Personality.Meurer){ + if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer, ..Personality.Dupont,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Pavanello,..Personality.Ferexpert,,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleDK,..Personality.HaefeleFR,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens, ..Personality.Dozon, ..Personality.BlumPL, ..Personality.DeceuninckDeforce, ..Personality.BlumPLCMeube, ..Personality.BlumPLDemo, ..Personality.BlumPLMeble, ..Personality.BlumPLMebloa, ..Personality.BlumPLMerkur, ..Personality.BlumPLPakdrew, ..Personality.BlumPLSAS, ..Personality.BlumPLSchach, ..Personality.BlumPLMeblolux, ..Personality.BlumPLAbler, ..Personality.BlumPLWiP, ..Personality.BlumPLDrewTrans, ..Personality.Meurer, ..Personality.BlumPLWior, ..Personality.BlumPLDrewno, ..Personality.BlumPLBiuroStyl){ 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/impl/PersonalityService.cls.xml =================================================================== diff -u -r72516 -r72598 --- DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 72516) +++ DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 72598) @@ -129,8 +129,10 @@ Quit:(PersonalityID = Personality.Dozon) $$$True Quit:(PersonalityID = Personality.BlumPL) $$$True Quit:(PersonalityID = Personality.BlumPLAbler) $$$True + Quit:(PersonalityID = Personality.BlumPLBiuroStyl) $$$True Quit:(PersonalityID = Personality.BlumPLCMeube) $$$True Quit:(PersonalityID = Personality.BlumPLDemo) $$$True + Quit:(PersonalityID = Personality.BlumPLDrewno) $$$True Quit:(PersonalityID = Personality.BlumPLDrewTrans) $$$True Quit:(PersonalityID = Personality.BlumPLMeble) $$$True Quit:(PersonalityID = Personality.BlumPLMebloa) $$$True @@ -139,6 +141,7 @@ Quit:(PersonalityID = Personality.BlumPLPakdrew) $$$True Quit:(PersonalityID = Personality.BlumPLSAS) $$$True Quit:(PersonalityID = Personality.BlumPLSchach) $$$True + Quit:(PersonalityID = Personality.BlumPLWior) $$$True Quit:(PersonalityID = Personality.BlumPLWiP) $$$True Quit:(PersonalityID = Personality.DeceuninckDeforce) $$$True Quit:(PersonalityID = Personality.Meurer) $$$True Index: vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml =================================================================== diff -u -r72516 -r72598 --- vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml (.../Test.cls.xml) (revision 72516) +++ vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml (.../Test.cls.xml) (revision 72598) @@ -80,8 +80,10 @@ // alle distributeurs van Blum Polen hebben dezelfde prefix: _BPLD Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLAbler()) + Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLBiuroStyl()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLCMeube()) 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).BlumPLMeble()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLMebloa()) @@ -90,6 +92,7 @@ Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLPakdrew()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLSAS()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLSchach()) + Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLWior()) Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).BlumPLWiP()) Quit Uitzonderingen Index: DOM/common/enu/Personality/Verwerker.cls.xml =================================================================== diff -u -r72516 -r72598 --- DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 72516) +++ DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 72598) @@ -22,12 +22,16 @@ Do ..VerwerkBlumPL() } ElseIf Personality = "58" { Do ..VerwerkBlumPLAbler() + } ElseIf Personality = "65" { + Do ..VerwerkBlumPLBiuroStyl() } ElseIf Personality = "50" { Do ..VerwerkBlumPLCMeube() } ElseIf Personality = "52" { Do ..VerwerkBlumPLDemo() } ElseIf Personality = "61" { Do ..VerwerkBlumPLDrewTrans() + } ElseIf Personality = "64" { + Do ..VerwerkBlumPLDrewno() } ElseIf Personality = "56" { Do ..VerwerkBlumPLMeble() } ElseIf Personality = "55" { @@ -44,6 +48,8 @@ Do ..VerwerkBlumPLSchach() } ElseIf Personality = "59" { Do ..VerwerkBlumPLWiP() + } ElseIf Personality = "63" { + Do ..VerwerkBlumPLWior() } ElseIf Personality = "22" { Do ..VerwerkCampeTonny() } ElseIf Personality = "28" { @@ -90,6 +96,8 @@ Do ..VerwerkHaefeleNO() } ElseIf Personality = "37" { Do ..VerwerkHaefeleSE() + } ElseIf Personality = "62" { + Do ..VerwerkHaefeleSP() } ElseIf Personality = "36" { Do ..VerwerkHahleOy() } ElseIf Personality = "11" { @@ -167,6 +175,12 @@ + +1 +1 + + + 1 1 @@ -185,6 +199,12 @@ + +1 +1 + + + 1 1 @@ -233,6 +253,12 @@ + +1 +1 + + + 1 1 @@ -371,6 +397,12 @@ + +1 +1 + + + 1 1 Index: vhDeploy/Deploy20240216xLogosNieuweDistributeursBlumPolen.cls.xml =================================================================== diff -u --- vhDeploy/Deploy20240216xLogosNieuweDistributeursBlumPolen.cls.xml (revision 0) +++ vhDeploy/Deploy20240216xLogosNieuweDistributeursBlumPolen.cls.xml (revision 72598) @@ -0,0 +1,26 @@ + + + +vhDeploy.Deploy + + +%String +Nieuwe mapping voor logos van Meurer en BlumPLDrewTrans, voor alle etiketten en leverbon. + + + +1 + + + + + + Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumPLMeblolux.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumPLMeblolux.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_BlumPLMeblolux.txt (revision 72598) @@ -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 -r72516 -r72598 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72516) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72598) @@ -86,8 +86,10 @@ Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Dozon()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPL()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLAbler()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLBiuroStyl()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLCMeube()) 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).BlumPLMeble()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLMebloa()) @@ -96,6 +98,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLPakdrew()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLSAS()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLSchach()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLWior()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumPLWiP()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Meurer())