Index: DOM/common/PersonalityVisitor.cls.xml =================================================================== diff -u -r75090 -r75106 --- DOM/common/PersonalityVisitor.cls.xml (.../PersonalityVisitor.cls.xml) (revision 75090) +++ DOM/common/PersonalityVisitor.cls.xml (.../PersonalityVisitor.cls.xml) (revision 75106) @@ -243,6 +243,16 @@ 1 OstermannBEPersonality:DOM.common.OstermannBEPersonality + + +1 +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + +1 +OstermannDEPersonality:DOM.common.OstermannDEPersonality + Index: vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 75090) +++ vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 75106) @@ -262,6 +262,18 @@ ]]> + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + prijs die aan de handelsklant aangerekend wordt door leverancier (in principe vh aan klant personality, tenzij de Hein SubPersonalities) Index: DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 75090) +++ DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 75106) @@ -591,6 +591,28 @@ Do ..ToegelatenLadetypes.Insert("MVX") ]]> + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + Index: vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 75090) +++ vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 75106) @@ -59,6 +59,18 @@ ]]> + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + MartensPersonality:DOM.common.MartensPersonality Index: DOM/VKP/impl/OstermannDEKlantData.cls.xml =================================================================== diff -u --- DOM/VKP/impl/OstermannDEKlantData.cls.xml (revision 0) +++ DOM/VKP/impl/OstermannDEKlantData.cls.xml (revision 75106) @@ -0,0 +1,13 @@ + + + +DOM.VKP.impl.HandelKlantData + + +%Library.CacheStorage + + + + + + Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r75090 -r75106 --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 75090) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 75106) @@ -309,6 +309,18 @@ + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + Index: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 75090) +++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 75106) @@ -988,6 +988,14 @@ OstermannBEPersonality:DOM.common.OstermannBEPersonality + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + Index: DOM/VKP/enu/Klant/AutoComplete.cls.xml =================================================================== diff -u -r75090 -r75106 --- DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 75090) +++ DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 75106) @@ -632,6 +632,20 @@ 1 + +%String +"K||40895" +1 +1 + + + +%String +"K||40926" +1 +1 + + %String "K||30924" Index: DOM/VKP/enu/Klant/Verwerker.cls.xml =================================================================== diff -u -r75090 -r75106 --- DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 75090) +++ DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 75106) @@ -190,6 +190,10 @@ Do ..VerwerkOptimaPack() } ElseIf Klant = "K||40982" { Do ..VerwerkOstermannBelgie() + } ElseIf Klant = "K||40895" { + Do ..VerwerkOstermannDuitsland() + } ElseIf Klant = "K||40926" { + Do ..VerwerkOstermannNederland() } ElseIf Klant = "K||30924" { Do ..VerwerkPavanello() } ElseIf Klant = "K||3513" { @@ -795,6 +799,18 @@ + +1 +1 + + + + +1 +1 + + + 1 1 Index: DOM/common/OstermannDEPersonality.cls.xml =================================================================== diff -u --- DOM/common/OstermannDEPersonality.cls.xml (revision 0) +++ DOM/common/OstermannDEPersonality.cls.xml (revision 75106) @@ -0,0 +1,57 @@ + + + +persistent +1 +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: vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 75090) +++ vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 75106) @@ -262,6 +262,18 @@ ]]> + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + + +vhDeploy.Deploy + + +%String +Nieuwe mapping voor het logo van Ostermann Nederland en Duitsland, voor alle etiketten en leverbon. + + + +1 + + + + +1 +KlantNummer:%String,LogoPad:%String,LogoOpAlleBeslagEtiketten:%Boolean +1 + + + + + + Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/OstermannNLPrijsFactorBepaler.cls.xml =================================================================== diff -u --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/OstermannNLPrijsFactorBepaler.cls.xml (revision 0) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/OstermannNLPrijsFactorBepaler.cls.xml (revision 75106) @@ -0,0 +1,26 @@ + + + +1 + + +%Numeric +1 + + + +MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn +%Numeric + + + + +%Numeric + + + + + + Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/OstermannDEPrijsFactorBepaler.cls.xml =================================================================== diff -u --- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/OstermannDEPrijsFactorBepaler.cls.xml (revision 0) +++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/OstermannDEPrijsFactorBepaler.cls.xml (revision 75106) @@ -0,0 +1,26 @@ + + + +1 + + +%Numeric +1 + + + +MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn +%Numeric + + + + +%Numeric + + + + + + Index: vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 75090) +++ vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 75106) @@ -61,6 +61,18 @@ ]]> + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + MartensPersonality:DOM.common.MartensPersonality Index: vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml (.../Test.cls.xml) (revision 75090) +++ vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml (.../Test.cls.xml) (revision 75106) @@ -99,6 +99,8 @@ Do ..AssertToegelatenLadeTypes(..PersonalityEnum.BlumPL, VerwachteLadetypes) Do ..AssertToegelatenLadeTypes(..PersonalityEnum.BlumCZ, VerwachteLadetypes) Do ..AssertToegelatenLadeTypes(..PersonalityEnum.OstermannBE, VerwachteLadetypes) + Do ..AssertToegelatenLadeTypes(..PersonalityEnum.OstermannNL, VerwachteLadetypes) + Do ..AssertToegelatenLadeTypes(..PersonalityEnum.OstermannDE, VerwachteLadetypes) ]]> Index: APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml =================================================================== diff -u -r75095 -r75106 --- APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml (.../PersonalityEnVerwerkerLinker.cls.xml) (revision 75095) +++ APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml (.../PersonalityEnVerwerkerLinker.cls.xml) (revision 75106) @@ -128,8 +128,12 @@ Set PersonalityID = ##class(DOM.common.enu.Personality).OPODe() } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).BlumTsjechie() { Set PersonalityID = ##class(DOM.common.enu.Personality).BlumCZ() - } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).OstermannBelgie() { + } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).OstermannBelgie() { Set PersonalityID = ##class(DOM.common.enu.Personality).OstermannBE() + } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).OstermannNederland() { + Set PersonalityID = ##class(DOM.common.enu.Personality).OstermannNL() + } ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).OstermannDuitsland() { + Set PersonalityID = ##class(DOM.common.enu.Personality).OstermannDE() } Else { Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Kan de personalityID niet ophalen voor de WebShopVerwerker " _ DomeinVerwerker) Do ##class(TECH.ExceptionHandler).Throw(Exception) @@ -217,6 +221,10 @@ Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).BlumTsjechie() } ElseIf PersonalityID = ##class(DOM.common.enu.Personality).OstermannBE() { Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).OstermannBelgie() + } ElseIf PersonalityID = ##class(DOM.common.enu.Personality).OstermannNL() { + Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).OstermannNederland() + } ElseIf PersonalityID = ##class(DOM.common.enu.Personality).OstermannDE() { + Set Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).OstermannDuitsland() } Else { Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Kan de WebShopVerwerker niet ophalen voor de personalityID " _ PersonalityID) Do ##class(TECH.ExceptionHandler).Throw(Exception) Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 75090) +++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 75106) @@ -256,6 +256,18 @@ ]]> + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + + +persistent +1 +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: vhDeploy/Deploy20250825xAanmakenOstermannNLEnDEPersonalities.cls.xml =================================================================== diff -u --- vhDeploy/Deploy20250825xAanmakenOstermannNLEnDEPersonalities.cls.xml (revision 0) +++ vhDeploy/Deploy20250825xAanmakenOstermannNLEnDEPersonalities.cls.xml (revision 75106) @@ -0,0 +1,31 @@ + + + +vhDeploy.Deploy + + +%String +Aanmaken van Personalities voor Ostermann Nederland (PersonalityId = 80) en Duitsland (PersonalityId = 81) + + + +1 + + + + +1 +PersonalityId:%Integer,PersonalityClassname:%String,KlantId:%Integer + + + + + + Index: vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 75090) +++ vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 75106) @@ -61,6 +61,18 @@ ]]> + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + MartensPersonality:DOM.common.MartensPersonality Index: vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 75090) +++ vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml (.../HandelToegelatenLadetypesBepaler.cls.xml) (revision 75106) @@ -25,6 +25,18 @@ ]]> + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + BlumCZPersonality:DOM.common.BlumCZPersonality Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 75090) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 75106) @@ -119,6 +119,8 @@ Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumCZTwd()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).BlumCZDrevoTrust()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).OstermannBE()) + Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).OstermannNL()) + Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).OstermannDE()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 75090) +++ vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 75106) @@ -61,6 +61,18 @@ ]]> + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + MartensPersonality:DOM.common.MartensPersonality Index: WSimpl/Unishop/Login/KortingBewaarder.cls.xml =================================================================== diff -u -r75093 -r75106 --- WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 75093) +++ WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 75106) @@ -381,6 +381,18 @@ ]]> + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + Personality:DOM.common.Personality,Variant:DOM.PM.enu.Variant,DefaultVariantIndienNietMeegegeven:%String 1 Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml =================================================================== diff -u -r75090 -r75106 --- APPS/VKP/impl/KlantDataBewaarder.cls.xml (.../KlantDataBewaarder.cls.xml) (revision 75090) +++ APPS/VKP/impl/KlantDataBewaarder.cls.xml (.../KlantDataBewaarder.cls.xml) (revision 75106) @@ -536,6 +536,26 @@ ]]> + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + KlantId:TECH.String,Personality:DOM.common.Personality 1 Index: DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml =================================================================== diff -u -r75090 -r75106 --- DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml (.../VanHoeckeOfAnderePersonalityVisitor.cls.xml) (revision 75090) +++ DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml (.../VanHoeckeOfAnderePersonalityVisitor.cls.xml) (revision 75106) @@ -307,6 +307,18 @@ + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + Index: vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 75090) +++ vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 75106) @@ -255,6 +255,18 @@ ]]> + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality TECH.Enumeration -,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864,K||26329,K||36412,K||36413,K||36605,K||2913,K||32383,K||34258,K||37598,K||4250,K||39199,K||35830,K||39481,K||39580,K||40835,K||40982 +,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864,K||26329,K||36412,K||36413,K||36605,K||2913,K||32383,K||34258,K||37598,K||4250,K||39199,K||35830,K||39481,K||39580,K||40835,K||40982,K||40926,K||40895 @@ -859,6 +859,20 @@ ]]> + +1 +DOM.VKP.enu.Klant + + + + +1 +DOM.VKP.enu.Klant + + + 1 KlantNummer:%String Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 75090) +++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml (.../PrijsBerekeningPrijsBepaler.cls.xml) (revision 75106) @@ -111,6 +111,18 @@ ]]> + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + HaefeleFIPersonality:DOM.common.HaefeleFIPersonality Index: DOM/common/impl/PersonalityService.cls.xml =================================================================== diff -u -r75090 -r75106 --- DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 75090) +++ DOM/common/impl/PersonalityService.cls.xml (.../PersonalityService.cls.xml) (revision 75106) @@ -160,6 +160,8 @@ Quit:(PersonalityID = Personality.BlumCZTwd) $$$True Quit:(PersonalityID = Personality.BlumCZDrevoTrust) $$$True Quit:(PersonalityID = Personality.OstermannBE) $$$True + Quit:(PersonalityID = Personality.OstermannNL) $$$True + Quit:(PersonalityID = Personality.OstermannDE) $$$True If ..ProjectSettingsAPI.IsActiefDuPontNaarEindklant() { Quit:(PersonalityID = ##class(DOM.common.enu.Personality).Dupont()) $$$True } Index: WSimpl/Unishop/Login/ParameterBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 75090) +++ WSimpl/Unishop/Login/ParameterBepaler.cls.xml (.../ParameterBepaler.cls.xml) (revision 75106) @@ -395,6 +395,18 @@ ]]> + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + LoginParameters:WSimpl.Unishop.Login.Parameters,PrefixHandel:%String 1 Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 75090) +++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 75106) @@ -89,7 +89,9 @@ ..Personality.BlumCZJAF, ..Personality.BlumCZTwd, ..Personality.BlumCZDrevoTrust, - ..Personality.OstermannBE) { + ..Personality.OstermannBE, + ..Personality.OstermannNL, + ..Personality.OstermannDE) { 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") @@ -176,7 +178,9 @@ ..Personality.BlumCZJAF, ..Personality.BlumCZTwd, ..Personality.BlumCZDrevoTrust, - ..Personality.OstermannBE) { + ..Personality.OstermannBE, + ..Personality.OstermannNL, + ..Personality.OstermannDE) { 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/VKP/impl/KlantDataBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 75090) +++ DOM/VKP/impl/KlantDataBepaler.cls.xml (.../KlantDataBepaler.cls.xml) (revision 75106) @@ -538,7 +538,7 @@ @@ -549,7 +549,7 @@ @@ -560,12 +560,34 @@ + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + KlantData:DOM.VKP.impl.KlantData,HandelPrefix:%String 1 Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 75090) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 75106) @@ -116,6 +116,8 @@ Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumCZTwd()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BlumCZDrevoTrust()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).OstermannBE()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).OstermannNL()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).OstermannDE()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 75090) +++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 75106) @@ -67,6 +67,18 @@ ]]> + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + HaefeleATPersonality:DOM.common.HaefeleATPersonality Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 75090) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 75106) @@ -118,6 +118,8 @@ Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumCZTwd()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).BlumCZDrevoTrust()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).OstermannBE()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).OstermannNL()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).OstermannDE()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: DOM/VKP/impl/OstermannNLKlantData.cls.xml =================================================================== diff -u --- DOM/VKP/impl/OstermannNLKlantData.cls.xml (revision 0) +++ DOM/VKP/impl/OstermannNLKlantData.cls.xml (revision 75106) @@ -0,0 +1,13 @@ + + + +DOM.VKP.impl.HandelKlantData + + +%Library.CacheStorage + + + + + + Index: WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml =================================================================== diff -u -r75090 -r75106 --- WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 75090) +++ WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml (.../WebshopVerwerkerBepaler.cls.xml) (revision 75106) @@ -316,6 +316,18 @@ + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml =================================================================== diff -u -r75090 -r75106 --- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 75090) +++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml (.../PrijsFactorBepalerFactory.cls.xml) (revision 75106) @@ -249,6 +249,18 @@ ]]> + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality + +OstermannDEPersonality:DOM.common.OstermannDEPersonality + + + + +OstermannNLPersonality:DOM.common.OstermannNLPersonality + + + PavanelloPersonality:DOM.common.PavanelloPersonality