Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml =================================================================== diff -u -r70668 -r70765 --- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 70668) +++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 70765) @@ -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){ + 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){ 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){ + 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){ 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/HandelToegelatenLadetypesBepaler/Test.cls.xml =================================================================== diff -u -r70636 -r70765 --- vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml (.../Test.cls.xml) (revision 70636) +++ vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml (.../Test.cls.xml) (revision 70765) @@ -25,6 +25,7 @@ DeceuninckDeforcePersonality:DOM.common.DeceuninckDeforcePersonality - Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/DeceuninckDeforcePrijsFactorBepaler.cls.xml =================================================================== diff -u --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/DeceuninckDeforcePrijsFactorBepaler.cls.xml (revision 0) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/DeceuninckDeforcePrijsFactorBepaler.cls.xml (revision 70765) @@ -0,0 +1,20 @@ + + + +TECH.RegisteredObject,APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.GeenPrijsFactorBepaler + + +%Numeric +1.00 + + + +MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn +%Numeric + + + + + + Index: DOM/common/impl/PersonalityService.cls.xml =================================================================== diff -u -r70667 -r70765 --- DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 70667) +++ DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 70765) @@ -128,6 +128,7 @@ Quit:(PersonalityID = Personality.Martens) $$$True Quit:(PersonalityID = Personality.Dozon) $$$True Quit:(PersonalityID = Personality.BlumPL) $$$True + Quit:(PersonalityID = Personality.DeceuninckDeforce) $$$True If ..ProjectSettingsAPI.IsActiefDuPontNaarEindklant() { Quit:(PersonalityID = ##class(DOM.common.enu.Personality).Dupont()) $$$True } @@ -171,6 +172,7 @@ Quit:(PersonalityID = Personality.Dupont) $$$True Quit:(PersonalityID = Personality.Martens) $$$True Quit:(PersonalityID = Personality.BlumPL) $$$True + Quit:(PersonalityID = Personality.DeceuninckDeforce) $$$True Quit $$$False ]]>