Index: APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r62170 -r63827
--- APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 62170)
+++ APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 63827)
@@ -59,9 +59,10 @@
 <ReturnType>APPS.VKP.VerzendWijze</ReturnType>
 <Implementation><![CDATA[
 	#dim VerzendWijze As APPS.VKP.VerzendWijze
+	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
 	
 	If (LeverAdres="") || (LeverAdres.GeefVerzendingWijze()="") || (Winkelkar.HeeftHerbestellingBijProbleem()) {
-		If Winkelkar.GeefPersonalityID() = ##class(DOM.common.enu.Personality).VanHoecke() {
+		If Winkelkar.GeefPersonalityID() = Personality.VanHoecke {
 			If Winkelkar.HeeftHerbestellingBijProbleem() {
 				#dim KlantID As DOM.common.PartijID = Winkelkar.GeefKlantID()
 				#dim Partij As DOM.PARTIJ.Partij = ..PartijApi.GeefPartij(KlantID)
@@ -81,28 +82,28 @@
 				}
 			}
 		} Else {
-			If Winkelkar.GeefPersonalityID() = ##class(DOM.common.enu.Personality).HaefeleNL(){
+			If Winkelkar.GeefPersonalityID() = Personality.HaefeleNL{
 				Set KlantID = ##class(DOM.VKP.enu.Klant).HaefeleNederland()
 				Set Partij = ..PartijApi.GeefPartij(KlantID)
 				Set VerzendWijze =  ##class(APPS.VKP.VerzendWijze).%New(..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantID),"DI1",Partij.GeefAdres().GeefLand().GeefCode(),Partij.GeefAdres().GeefPostcode())
-			} ElseIf (Winkelkar.GeefPersonalityID() = ##class(DOM.common.enu.Personality).HaefeleBE()) && ..ProjectSettingsAPI.IsActiefHaefeleBENaarEindklant(){
+			} ElseIf (Winkelkar.GeefPersonalityID() = Personality.HaefeleBE) && ..ProjectSettingsAPI.IsActiefHaefeleBENaarEindklant(){
 				Set KlantID = ##class(DOM.VKP.enu.Klant).HaefeleBelgie()
 				Set Partij = ..PartijApi.GeefPartij(KlantID)
 				Set VerzendWijze =  ##class(APPS.VKP.VerzendWijze).%New(..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantID),"DI1",Partij.GeefAdres().GeefLand().GeefCode(),Partij.GeefAdres().GeefPostcode())
-			} ElseIf Winkelkar.GeefPersonalityID() = ##class(DOM.common.enu.Personality).HaefeleDE(){
+			} ElseIf (Winkelkar.GeefPersonalityID() = Personality.HaefeleDE) || (Winkelkar.GeefPersonalityID() = Personality.HaefeleFI) || (Winkelkar.GeefPersonalityID() = Personality.HaefeleSE) {
 				Set KlantID = ##class(DOM.VKP.enu.Klant).HaefeleDuitsland()
 				Set Partij = ..PartijApi.GeefPartij(KlantID)
 				#dim VerzendWijzeID as %String = ..HaefeleDEVerzendwijzeBepaler.GeefVerzendWijze(LeverAdres.GeefLand().GeefCode(),LeverAdres.GeefPostcode())
 				Set VerzendWijze =  ##class(APPS.VKP.VerzendWijze).%New(..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantID),VerzendWijzeID,LeverAdres.GeefLand().GeefCode(),LeverAdres.GeefPostcode())
-			} ElseIf Winkelkar.GeefPersonalityID() = ##class(DOM.common.enu.Personality).Dupont() {
+			} ElseIf Winkelkar.GeefPersonalityID() = Personality.Dupont {
 					If ($$$Not($IsObject(LeverAdres)) || $$$HasLength(LeverAdres.GeefID()) || (Winkelkar.ExterneId = "")) {
 						Set VerzendWijze = ..GeefVerzendWijzeVanKlantID(##class(DOM.VKP.enu.Klant).DuPont())
 					} Else {
 						Set KlantID = ##class(DOM.VKP.enu.Klant).DuPont()
 						Set Partij = ..PartijApi.GeefPartij(KlantID)
 						Set VerzendWijze =  ##class(APPS.VKP.VerzendWijze).%New(..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantID),"DI1",Partij.GeefAdres().GeefLand().GeefCode(),Partij.GeefAdres().GeefPostcode())
 					}
-			} ElseIf Winkelkar.GeefPersonality().GeefLeverancierData().PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke() {
+			} ElseIf Winkelkar.GeefPersonality().GeefLeverancierData().PersonalityId = Personality.VanHoecke {
 				Set VerzendWijze =  ..GeefVerzendWijzeVanKlantID(Winkelkar.GeefPersonality().GeefLeverancierData().EigenKlantId)
 			} Else {
 				Set KlantID = ##class(DOM.VKP.enu.Klant).Hein()
Index: vhTest/Integratie/TestBase.cls.xml
===================================================================
diff -u -r58718 -r63827
--- vhTest/Integratie/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 58718)
+++ vhTest/Integratie/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 63827)
@@ -60,6 +60,34 @@
 ]]></Implementation>
 </Method>
 
+<Method name="UpdateHaefeleSEKlantData">
+<Final>1</Final>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,KlantNaam:%String,Taal:DOM.enu.Taal=##class(DOM.enu.Taal).Zweeds()</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim KlantBewaarder As APPS.VKP.KlantDataBewaarder = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefKlantDataBewaarder()
+	set KlantData = ##class(DOM.common.dto.KlantData).%New()
+	set KlantData.ID = KlantID
+	set KlantData.Naam = KlantNaam
+	set KlantData.Taal = Taal
+	do KlantBewaarder.Bewaar(##class(DOM.common.HaefeleSEPersonality).Instance(),KlantData)
+]]></Implementation>
+</Method>
+
+<Method name="UpdateHaefeleFIKlantData">
+<Final>1</Final>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,KlantNaam:%String,Taal:DOM.enu.Taal=##class(DOM.enu.Taal).Fins()</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim KlantBewaarder As APPS.VKP.KlantDataBewaarder = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefKlantDataBewaarder()
+	set KlantData = ##class(DOM.common.dto.KlantData).%New()
+	set KlantData.ID = KlantID
+	set KlantData.Naam = KlantNaam
+	set KlantData.Taal = Taal
+	do KlantBewaarder.Bewaar(##class(DOM.common.HaefeleFIPersonality).Instance(),KlantData)
+]]></Implementation>
+</Method>
+
 <Method name="UpdateKlantData">
 <Final>1</Final>
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,KlantNaam:%String,Taal:DOM.enu.Taal=##class(DOM.enu.Taal).Nederlands(),Personality:DOM.common.Personality</FormalSpec>
Index: BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml
===================================================================
diff -u -r63391 -r63827
--- BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 63391)
+++ BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 63827)
@@ -44,13 +44,27 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleFI">
+<Type>%String</Type>
+<InitialExpression>"HAEFELEFI"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleNL">
 <Type>%String</Type>
 <InitialExpression>"HAEFELENL"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleSE">
+<Type>%String</Type>
+<InitialExpression>"HAEFELESE"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="Halux">
 <Type>%String</Type>
 <InitialExpression>"HALUX"</InitialExpression>
Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml
===================================================================
diff -u -r63674 -r63827
--- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml	(.../Test.cls.xml)	(revision 63674)
+++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml	(.../Test.cls.xml)	(revision 63827)
@@ -24,7 +24,7 @@
 	Set Service = ##class(DOM.common.impl.PersonalityService).%New()
 	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.DSGroup){
+		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){
 			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.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) {
 			Do $$$AssertFalse(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout")
Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml
===================================================================
diff -u -r59320 -r63827
--- APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 59320)
+++ APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 63827)
@@ -106,6 +106,26 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, HaefeleSEPersonality)
+	
+	Do ..ValideerKlantId(..KlantDataDto.ID, HaefeleSEPersonality)
+	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, HaefeleFIPersonality)
+	
+	Do ..ValideerKlantId(..KlantDataDto.ID, HaefeleFIPersonality)
+	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleFIPrijsFactorBepaler.cls.xml
===================================================================
diff -u
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleFIPrijsFactorBepaler.cls.xml	(revision 0)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleFIPrijsFactorBepaler.cls.xml	(revision 63827)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.HaefeleFIPrijsFactorBepaler">
+<Super>APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.GeenPrijsFactorBepaler,DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerkenVisitor</Super>
+
+<Parameter name="TBXLade">
+<Type>%Decimal</Type>
+<Default>1.57</Default>
+</Parameter>
+
+<Parameter name="LBXLade">
+<Type>%Decimal</Type>
+<Default>1.70</Default>
+</Parameter>
+
+<Parameter name="TAORLade">
+<Type>%Decimal</Type>
+<Default>1.50</Default>
+</Parameter>
+
+<Parameter name="Orgalux">
+<Type>%Decimal</Type>
+<Default>1.63</Default>
+</Parameter>
+
+<Property name="PrijsFactor">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrijsFactor">
+<FormalSpec>MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn</FormalSpec>
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	Set ..PrijsFactor = 1
+	Do MaatwerkLijn.GeefIngegevenKenmerken().Accept($this)
+	
+	Quit ..PrijsFactor
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrgaluxPrijsFactor">
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	Set ..PrijsFactor = ..#Orgalux
+	
+	Quit ..PrijsFactor
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTAORKenmerken">
+<FormalSpec>TAORKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#TAORLade
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkLBXKenmerken">
+<FormalSpec>LBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#LBXLade
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTBXKenmerken">
+<FormalSpec>TBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#TBXLade
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml
===================================================================
diff -u -r62990 -r63827
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 62990)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 63827)
@@ -219,6 +219,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	;Do ..MailVerzenderHandel.Rapporteer(..Offerte)
+	Do ..HttpZenderHaefele.Verzend(..Offerte)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[
+	;Do ..MailVerzenderHandel.Rapporteer(..Offerte)
+	Do ..HttpZenderHaefele.Verzend(..Offerte)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..MailVerzenderHandel.Rapporteer(..Offerte)
Index: cspBasis/TBX/enu/Verwerker/AutoComplete.cls.xml
===================================================================
diff -u -r58718 -r63827
--- cspBasis/TBX/enu/Verwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 58718)
+++ cspBasis/TBX/enu/Verwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 63827)
@@ -37,13 +37,27 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleFinland">
+<Type>%String</Type>
+<InitialExpression>"HFLFI"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleNederland">
 <Type>%String</Type>
 <InitialExpression>"HFLE"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleZweden">
+<Type>%String</Type>
+<InitialExpression>"HFLSE"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="Hein">
 <Type>%String</Type>
 <InitialExpression>"HEIN"</InitialExpression>
Index: APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml
===================================================================
diff -u -r59330 -r63827
--- APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml	(.../KlantRapporteurVhisie3.cls.xml)	(revision 59330)
+++ APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml	(.../KlantRapporteurVhisie3.cls.xml)	(revision 63827)
@@ -101,6 +101,14 @@
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r59328 -r63827
--- vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 59328)
+++ vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 63827)
@@ -112,12 +112,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFI",HaefeleFIPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHahleOy",HahleOyPersonality)
Index: WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml
===================================================================
diff -u -r60377 -r63827
--- WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 60377)
+++ WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 63827)
@@ -168,8 +168,8 @@
 <Implementation><![CDATA[
 	#dim LeverDatum As %Date = $$INTDATE^vhLib.DataTypes(GevraagdeLeverdatum)
 	#dim HuidigeDatum As %Date = ..DateTimeAPI.CurrentDate()
-	
-	If ##class(TECH.StringUtils).Equals(..Shop, ##class(APPS.EC.enu.UniShopVerwerker).HaefeleBelgie(), ##class(APPS.EC.enu.UniShopVerwerker).HaefeleNederland(),##class(APPS.EC.enu.UniShopVerwerker).HaefeleDuitsland()) && (LeverDatum = HuidigeDatum) {
+	Set UniShopVerwerker = ##class(APPS.EC.enu.UniShopVerwerker.AutoComplete).%New()
+	If ##class(TECH.StringUtils).Equals(..Shop, UniShopVerwerker.HaefeleBelgie, UniShopVerwerker.HaefeleNederland,UniShopVerwerker.HaefeleDuitsland,UniShopVerwerker.HaefeleZweden,UniShopVerwerker.HaefeleFinland) && (LeverDatum = HuidigeDatum) {
 		Do VanHoeckeOfferte.ZetLeverDatum(..BepaalLeverDatum(VanHoeckeOfferte.GeefWensLeverDatum(),LeverDatum))
 	} Else {
 		Do VanHoeckeOfferte.ZetLeverDatum(LeverDatum)
Index: vhDeploy/Deploy20210211xHaefeleSEPersonalityAanmaken.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20210211xHaefeleSEPersonalityAanmaken.cls.xml	(revision 0)
+++ vhDeploy/Deploy20210211xHaefeleSEPersonalityAanmaken.cls.xml	(revision 63827)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20210211xHaefeleSEPersonalityAanmaken">
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="PersonalityID">
+<Type>%String</Type>
+<Default>37</Default>
+</Parameter>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Aanmaken van Personality voor Haefele SE (ID=37)</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Do ##class(DOM.common.impl.PersonalityCreator).%New().StelInNieuwePersonality(	..#PersonalityID, 
+																					##class(DOM.common.HaefeleSEPersonality).%ClassName($$$True), 
+																					##class(DOM.VKP.enu.Klant).HaefeleDuitsland()																					
+																				 )
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r59328 -r63827
--- WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 59328)
+++ WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 63827)
@@ -136,6 +136,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleSE).%New(),HaefeleSEPersonality.GeefPrefix())
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleFI).%New(),HaefeleFIPersonality.GeefPrefix())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanRaemdonck">
 <FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHandelMetVerificatie).%New(),VanRaemdonckPersonality.GeefPrefix())
Index: APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml
===================================================================
diff -u -r58718 -r63827
--- APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml	(.../OfferteKopieerder.cls.xml)	(revision 58718)
+++ APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml	(.../OfferteKopieerder.cls.xml)	(revision 63827)
@@ -63,7 +63,7 @@
 	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
 	#dim IsBestelOpmerkingTeKopieren As %Boolean = $$$True
 	
-	If ##class(TECH.StringUtils).Equals(Offerte.GeefPersonalityID(), Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE ) {   ; , ##class(DOM.common.enu.Personality).SFS() 
+	If ##class(TECH.StringUtils).Equals(Offerte.GeefPersonalityID(), Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI ) {   ; , ##class(DOM.common.enu.Personality).SFS() 
 		// Handel Bevestigt ViaWebService, dus de bestelopmerking niet overnemen. 
 		Set IsBestelOpmerkingTeKopieren = $$$False
 	}
Index: DOM/common/impl/GebruikerAPIimpl.cls.xml
===================================================================
diff -u -r59335 -r63827
--- DOM/common/impl/GebruikerAPIimpl.cls.xml	(.../GebruikerAPIimpl.cls.xml)	(revision 59335)
+++ DOM/common/impl/GebruikerAPIimpl.cls.xml	(.../GebruikerAPIimpl.cls.xml)	(revision 63827)
@@ -120,6 +120,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..StelInDummyGebruiker()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..StelInDummyGebruiker()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInDummyGebruiker()
Index: PRGACNTs.inc.rou
===================================================================
diff -u -r59317 -r63827
--- PRGACNTs.inc.rou	(.../PRGACNTs.inc.rou)	(revision 59317)
+++ PRGACNTs.inc.rou	(.../PRGACNTs.inc.rou)	(revision 63827)
@@ -134,6 +134,8 @@
 	#define KleinerKey				   "N9B5zz.TUk~q()^,"
 	#define LayerKey				   "C?ZHZrzG6jvzq3K\"
 	#define HahleOyKey				   "pV&Ec3F.+{/eV#%H"
+	#define HafeleSEKey				   "y+c#Hm6V6V>}pwYN"
+	#define HafeleFIKey				   "Qv/Tz-(]u$k6!u@$"
 	
 	; Toegang voor OptimaFIX page : beperkt via controle op IP-adres 
 	;   !!! Te compileren in routines :           
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r59331 -r63827
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 59331)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 63827)
@@ -112,12 +112,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFI",HaefeleFIPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHahleOy",HahleOyPersonality)
Index: APPS/EC/impl/KlantInstellingenServiceHaefeleFI.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/KlantInstellingenServiceHaefeleFI.cls.xml	(revision 0)
+++ APPS/EC/impl/KlantInstellingenServiceHaefeleFI.cls.xml	(revision 63827)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.KlantInstellingenServiceHaefeleFI">
+<Super>APPS.common.impl.KlantInstellingenService</Super>
+
+<Method name="MagKlantLBXVerpakkingTypeBestellen">
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.LBXVerpakkingType</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (VerpakkingType '= ##class(DOM.PM.enu.LBXVerpakkingType).VHoss())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml
===================================================================
diff -u -r58718 -r63827
--- APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml	(.../LijnPrijsBepaler.cls.xml)	(revision 58718)
+++ APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml	(.../LijnPrijsBepaler.cls.xml)	(revision 63827)
@@ -118,6 +118,14 @@
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[	Set ..IsAdviesPrijsToegelaten = $$$True
Index: DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml
===================================================================
diff -u -r59318 -r63827
--- DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml	(.../VanHoeckeOfAnderePersonalityVisitor.cls.xml)	(revision 59318)
+++ DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml	(.../VanHoeckeOfAnderePersonalityVisitor.cls.xml)	(revision 63827)
@@ -44,6 +44,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkAnderePersonality(HaefeleSEPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkAnderePersonality(HaefeleFIPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkAnderePersonality(DestilPersonality)
Index: APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml
===================================================================
diff -u -r58718 -r63827
--- APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml	(.../OfferteKlantDataBepaler.cls.xml)	(revision 58718)
+++ APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml	(.../OfferteKlantDataBepaler.cls.xml)	(revision 63827)
@@ -59,6 +59,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..StelInDummyKlantData()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..StelInDummyKlantData()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanRaemdonck">
 <FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInDummyKlantData()
Index: APPS/EC/enu/UniShopVerwerker.cls.xml
===================================================================
diff -u -r59329 -r63827
--- APPS/EC/enu/UniShopVerwerker.cls.xml	(.../UniShopVerwerker.cls.xml)	(revision 59329)
+++ APPS/EC/enu/UniShopVerwerker.cls.xml	(.../UniShopVerwerker.cls.xml)	(revision 63827)
@@ -7,11 +7,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;SFS;HFLB;HFLE;VHEPN;DUPO;KISCH;HELMY;RAEM;DARO;HEIN;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;JBAR;BIBO;CAMP;RINI;FURN;YSPL;HFLD;KLNR;LAYR;HAHL</Default>
+<Default>;SFS;HFLB;HFLE;VHEPN;DUPO;KISCH;HELMY;RAEM;DARO;HEIN;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;JBAR;BIBO;CAMP;RINI;FURN;YSPL;HFLD;KLNR;LAYR;HAHL;HFLSE;HFLFI</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;SFS;HaefeleBelgie;HaefeleNederland;VHEPN;Dupont;Kisch;Destil;VanRaemdonck;Daro;Hein;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;JBarth;BiemarBois;CampeTonny;Rini;Furnifit;YachtSupplier;HaefeleDuitsland;Kleiner;Layer;HahleOy</Default>
+<Default>;SFS;HaefeleBelgie;HaefeleNederland;VHEPN;Dupont;Kisch;Destil;VanRaemdonck;Daro;Hein;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;JBarth;BiemarBois;CampeTonny;Rini;Furnifit;YachtSupplier;HaefeleDuitsland;Kleiner;Layer;HahleOy;HaefeleZweden;HaefeleFinland</Default>
 </Parameter>
 
 <Method name="SFS">
@@ -223,6 +223,20 @@
 <Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).HahleOy()
 ]]></Implementation>
 </Method>
+
+<Method name="HaefeleZweden">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.UniShopVerwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZweden()
+]]></Implementation>
+</Method>
+
+<Method name="HaefeleFinland">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.UniShopVerwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).HaefeleFinland()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r62170 -r63827
--- vhTest/Mock/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 62170)
+++ vhTest/Mock/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 63827)
@@ -118,12 +118,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFI",HaefeleFIPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHahleOy",HahleOyPersonality)
Index: vhDeploy/Deploy20210211xHaefeleFIPersonalityAanmaken.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20210211xHaefeleFIPersonalityAanmaken.cls.xml	(revision 0)
+++ vhDeploy/Deploy20210211xHaefeleFIPersonalityAanmaken.cls.xml	(revision 63827)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20210211xHaefeleFIPersonalityAanmaken">
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="PersonalityID">
+<Type>%String</Type>
+<Default>38</Default>
+</Parameter>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Aanmaken van Personality voor Haefele FI (ID=38)</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Do ##class(DOM.common.impl.PersonalityCreator).%New().StelInNieuwePersonality(	..#PersonalityID, 
+																					##class(DOM.common.HaefeleFIPersonality).%ClassName($$$True), 
+																					##class(DOM.VKP.enu.Klant).HaefeleDuitsland()																					
+																				 )
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: JW.mac.rou
===================================================================
diff -u
--- JW.mac.rou	(revision 0)
+++ JW.mac.rou	(revision 63827)
@@ -0,0 +1,98 @@
+#include Prod.Product
+#include BL.Derde.KlantSpecifiek
+
+TEST
+ w !,"Begin"
+ FOR  Read !, "Number: ",x quit:x=5  do
+ . W !,"hiere " _ x
+ . i x=2 w !,"koekoe" quit
+ . W !,"dare " _ x
+ w !,"Einde"
+ Quit
+
+TEST2
+ w !,"Begin"
+ FOR  Read !, "Number: ",x quit:x=5  do
+ . W !,"hiere " _ x
+ . if x=2 
+ . . w !,"koekoe" quit
+ . W !,"dare " _ x
+ w !,"Einde"
+ Quit
+
+TEST3
+ w !,"Begin"
+ FOR  Read !, "Number: ",x quit:x=5  do
+ . W !,"hiere " _ x
+ . if x=2 
+ . . w !,"koekoe" 
+ . . quit
+ . W !,"dare " _ x
+ w !,"Einde"
+ Quit
+
+VRD
+ Set (CONSNr,ORDNr,OLUNr,SOLNr)=""
+ Set (Count1,Count2,Count3,Count4)=0
+ kill Array
+ For  Set CONSNr=$O(^ORDW("D",CONSNr)) Quit:CONSNr=""  Do
+ . Set Rec=^ORDW("D",CONSNr)
+ . Set KLNr=$P(Rec,"\")
+ . Quit:(KLNr=$$$KlantHalux)
+ . Quit:(KLNr=$$$KlantVanHoeckeNV)
+ . Set Status=$P(Rec,"\",20)
+ . Quit:Status="" ; Staat W,P,A,B zijn toegelaten
+ . Set DueOut=+$P(Rec,"\",3)
+ . ;Quit:DueOut'=+$H ; niet voor vandaag
+ . Set Vzw=$P(Rec,"\",2)
+ . Quit:'((Vzw="DI1")||(Vzw="DD1")) 
+ . Set Count1=Count1+1 
+ . Quit:$$CheckOpTransport(KLNr,CONSNr)
+ . Set Count2=Count2+1
+ . Do GetKenmerken(KLNr,CONSNr,.Gewicht,.AantalMaatwerk)
+ . Set AdresID=$P($G(^ORDW("D",CONSNr,"A")),"\",29)
+ . Set Array(AdresID_KLNr,CONSNr)=$LB(KLNr,AdresID,Gewicht, AantalMaatwerk)
+ ; kleine en geen maatwerk er uit gooien
+ Kill ArrayVRD
+ Set (Key, CONSNr)=""
+ For  Set Key=$O(Array(Key)) Quit:Key=""  Do
+ . Set KLNr=""
+ . Set Gewicht=""
+ . Set AantalMaatwerk=""
+ . Set ConsNrs = ""
+ . For  Set CONSNr=$O(Array(Key,CONSNr)) Quit:CONSNr=""  Do
+ . . Set ConsNrs = ConsNrs_ ","  _ CONSNr
+ . . Set Gewicht=Gewicht+$LI(Array(Key,CONSNr),3)
+ . . Set AantalMaatwerk=AantalMaatwerk+$LI(Array(Key,CONSNr),4)
+ . . Set KLNr=$LI(Array(Key,CONSNr),1)
+ . . Set AdresID=$LI(Array(Key,CONSNr),2)
+ . . Set Adres=$G(^ORDW("D",CONSNr,"A"))
+ . Quit:(Gewicht<20)&&('AantalMaatwerk) ; 20Kg en geen maatwerk
+ . w !,KLNr_"/"_AdresID _ ":" _ConsNrs
+ . ;Set ArrayVRD(Key)=$LB(KLNr,$P(Adres,"\",2,8),AdresID,Gewicht,AantalMaatwerk,1+(AantalMaatwerk\10))
+ . Set Land = $$GeefLand($P(Adres,"\",8))
+ . Set ArrayVRD(Key)=$LB(KLNr,$P(Adres,"\",2),$P(Adres,"\",5),$P(Adres,"\",6),$P(Adres,"\",7),Land,Gewicht\1,1+(AantalMaatwerk\10))
+ . Set Count4=Count4+1
+ w !
+ zw Count1,Count2,Count4,ArrayVRD
+ Quit
+ 
+GeefLand(LandId)
+	Quit $Select(LandId=1019:"BE",LandId=1147:"NL",LandId=1120:"LU",1:"onbepaald")
+
+CheckOpTransport(KLNr,CONSNr)
+                Quit $P($G(^KUL(KLNr,"F",CONSNr,1)),"\",8)'=""
+
+GetKenmerken(KLNr,COSNr,Gewicht, AantalMaatwerk)
+ Set (ORDNr,OLUNr,SOLNr)=""
+ Set (Gewicht,AantalMaatwerk)=0
+ For  Set ORDNr=$O(^ORDW("D",CONSNr,"D",ORDNr)) Quit:ORDNr=""  Do
+ . For  Set OLUNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLUNr)) Quit:OLUNr=""  Do
+ .. Set Rec=^(OLUNr)
+ .. Set PRNr=$P(Rec,"\",1)
+ .. Set Qty=$P(Rec,"\",4)
+ .. Set ProdGrp=$$PRODGRP^PRODUKT(PRNr)
+ .. Set:",TBX,LBX,TA.B,KAD,"[(","_ProdGrp_",") AantalMaatwerk=AantalMaatwerk+Qty
+ .. Set Gewicht=Gewicht+($$$PRGet($$$Gewicht)*Qty/1000)
+ Quit
+
Index: DOM/VKP/impl/HaefeleFIKlantData.cls.xml
===================================================================
diff -u
--- DOM/VKP/impl/HaefeleFIKlantData.cls.xml	(revision 0)
+++ DOM/VKP/impl/HaefeleFIKlantData.cls.xml	(revision 63827)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.VKP.impl.HaefeleFIKlantData">
+<Super>DOM.VKP.impl.HandelKlantData</Super>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+<Package name="DOM.VKP.impl" sqlname="DOM_VKP_impl"/>
+</Export>
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml
===================================================================
diff -u -r59322 -r63827
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 59322)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 63827)
@@ -76,6 +76,8 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Pierard())
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleDE())
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HahleOy())
+	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleSE())
+	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleFI())
 
 	Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Hein())
 	Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Seefelder())
Index: APPS/EC/impl/HaefeleSEWebshopSessie.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/HaefeleSEWebshopSessie.cls.xml	(revision 0)
+++ APPS/EC/impl/HaefeleSEWebshopSessie.cls.xml	(revision 63827)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.HaefeleSEWebshopSessie">
+<Super>APPS.EC.impl.HandelWebshopSessie</Super>
+
+<Method name="GeefTeGebruikenPersonalityID">
+<Private>1</Private>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.enu.Personality).HaefeleSE()
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: APPS/VKP/Korting/impl/EDIVerwerker.cls.xml
===================================================================
diff -u -r62863 -r63827
--- APPS/VKP/Korting/impl/EDIVerwerker.cls.xml	(.../EDIVerwerker.cls.xml)	(revision 62863)
+++ APPS/VKP/Korting/impl/EDIVerwerker.cls.xml	(.../EDIVerwerker.cls.xml)	(revision 63827)
@@ -18,6 +18,16 @@
 <Default>deHAFELE</Default>
 </Parameter>
 
+<Parameter name="DomeinCodeHaefeleSE">
+<Type>%String</Type>
+<Default>seHAFELE</Default>
+</Parameter>
+
+<Parameter name="DomeinCodeHaefeleFI">
+<Type>%String</Type>
+<Default>fiHAFELE</Default>
+</Parameter>
+
 <Property name="KortingFactory">
 <Type>APPS.VKP.Korting.KortingFactory</Type>
 <Private>1</Private>
@@ -100,6 +110,10 @@
 		Set Personality = ##class(DOM.common.enu.Personality).HaefeleNL()
 	}ElseIf KlantNaam = ..#DomeinCodeHaefeleDE {
 		Set Personality = ##class(DOM.common.enu.Personality).HaefeleDE()
+	}ElseIf KlantNaam = ..#DomeinCodeHaefeleSE {
+		Set Personality = ##class(DOM.common.enu.Personality).HaefeleSE()
+	}ElseIf KlantNaam = ..#DomeinCodeHaefeleFI {
+		Set Personality = ##class(DOM.common.enu.Personality).HaefeleFI()
 	}Else{
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Bestand '"_BestandNaam_"' wordt niet ondersteund voor verwerking."))
 	}
Index: APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml
===================================================================
diff -u -r59328 -r63827
--- APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml	(.../PersonalityEnVerwerkerLinker.cls.xml)	(revision 59328)
+++ APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml	(.../PersonalityEnVerwerkerLinker.cls.xml)	(revision 63827)
@@ -44,6 +44,10 @@
 		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleNL()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleDuitsland() {
 		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleDE()
+	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZweden() {
+		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleSE()
+	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleFinland() {
+		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleFI()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Destil() {
 		Set PersonalityID = ##class(DOM.common.enu.Personality).Destil()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).BiemarBois() {
@@ -121,6 +125,10 @@
 		Set Verwerker =  ##class(APPS.EC.enu.WebShopVerwerker).HaefeleNederland()
 	} ElseIf PersonalityID = ##class(DOM.common.enu.Personality).HaefeleDE() {
 		Set Verwerker =  ##class(APPS.EC.enu.WebShopVerwerker).HaefeleDuitsland()
+	} ElseIf PersonalityID = ##class(DOM.common.enu.Personality).HaefeleSE() {
+		Set Verwerker =  ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZweden()
+	} ElseIf PersonalityID = ##class(DOM.common.enu.Personality).HaefeleFI() {
+		Set Verwerker =  ##class(APPS.EC.enu.WebShopVerwerker).HaefeleFinland()
 	} ElseIf PersonalityID = ##class(DOM.common.enu.Personality).Destil() {
 		Set Verwerker =  ##class(APPS.EC.enu.WebShopVerwerker).Destil()
 	} ElseIf PersonalityID = ##class(DOM.common.enu.Personality).BiemarBois() {
Index: DOM/common/enu/Personality/AutoComplete.cls.xml
===================================================================
diff -u -r59312 -r63827
--- DOM/common/enu/Personality/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 59312)
+++ DOM/common/enu/Personality/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 63827)
@@ -121,13 +121,27 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleFI">
+<Type>%String</Type>
+<InitialExpression>"38"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleNL">
 <Type>%String</Type>
 <InitialExpression>"12"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleSE">
+<Type>%String</Type>
+<InitialExpression>"37"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HahleOy">
 <Type>%String</Type>
 <InitialExpression>"36"</InitialExpression>
Index: vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml
===================================================================
diff -u -r62170 -r63827
--- vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml	(.../Test.cls.xml)	(revision 62170)
+++ vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml	(.../Test.cls.xml)	(revision 63827)
@@ -179,6 +179,44 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Winkelkar voor klant van HäfeleSE">
+<Implementation><![CDATA[
+	Set HDEVerzendwijzeBepalerMock = ##class(vhTest.Mock.APPS.EC.impl.HaefeleDEVerzendwijzeBepaler).%New()
+	Do HDEVerzendwijzeBepalerMock.VerwachtMethodCall("GeefVerzendWijze","SE","680 51").DanReturn("DA4")
+	
+	Do ..Winkelkar.ZetPersonalityID(##class(DOM.common.enu.Personality).HaefeleSE())
+		
+	Set PartijApiStub = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
+	Do PartijApiStub.IndienMethodCall("GeefPartij",$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.DOM.PARTIJ.Partij).StandaardPartij())
+	
+	Set VerzendWijzeBepaler = ##class(APPS.EC.impl.VerzendWijzeBepaler).%New(..VerkoopApiStub, PartijApiStub,HDEVerzendwijzeBepalerMock)
+	#dim LeverAdresDummy as DOM.VKP.LeverAdres = ##class(vhTest.Utils.DOM.VKP.LeverAdres).Zweeds()
+	#dim VerzendWijze As APPS.VKP.VerzendWijze = VerzendWijzeBepaler.GeefVerzendWijze(..Winkelkar,LeverAdresDummy)
+
+	Do HDEVerzendwijzeBepalerMock.Verifieer()	
+	Do $$$AssertEquals(VerzendWijze.VerzendWijzeID,"DA4")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Winkelkar voor klant van HäfeleFI">
+<Implementation><![CDATA[
+	Set HDEVerzendwijzeBepalerMock = ##class(vhTest.Mock.APPS.EC.impl.HaefeleDEVerzendwijzeBepaler).%New()
+	Do HDEVerzendwijzeBepalerMock.VerwachtMethodCall("GeefVerzendWijze","FI","11101").DanReturn("DA4")
+	
+	Do ..Winkelkar.ZetPersonalityID(##class(DOM.common.enu.Personality).HaefeleFI())
+		
+	Set PartijApiStub = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
+	Do PartijApiStub.IndienMethodCall("GeefPartij",$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.DOM.PARTIJ.Partij).StandaardPartij())
+	
+	Set VerzendWijzeBepaler = ##class(APPS.EC.impl.VerzendWijzeBepaler).%New(..VerkoopApiStub, PartijApiStub,HDEVerzendwijzeBepalerMock)
+	#dim LeverAdresDummy as DOM.VKP.LeverAdres = ##class(vhTest.Utils.DOM.VKP.LeverAdres).Fins()
+	#dim VerzendWijze As APPS.VKP.VerzendWijze = VerzendWijzeBepaler.GeefVerzendWijze(..Winkelkar,LeverAdresDummy)
+
+	Do HDEVerzendwijzeBepalerMock.Verifieer()	
+	Do $$$AssertEquals(VerzendWijze.VerzendWijzeID,"DA4")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Winkelkar voor JBarth (niet HäfeleNL)">
 <Implementation><![CDATA[
 	Do ..Winkelkar.ZetPersonalityID(##class(DOM.common.enu.Personality).JBarth())
Index: BL/Legacy/FactuurMailAfzenderBepaler.cls.xml
===================================================================
diff -u -r59333 -r63827
--- BL/Legacy/FactuurMailAfzenderBepaler.cls.xml	(.../FactuurMailAfzenderBepaler.cls.xml)	(revision 59333)
+++ BL/Legacy/FactuurMailAfzenderBepaler.cls.xml	(.../FactuurMailAfzenderBepaler.cls.xml)	(revision 63827)
@@ -101,6 +101,14 @@
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r59331 -r63827
--- vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 59331)
+++ vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 63827)
@@ -125,12 +125,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFI",HaefeleFIPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHahleOy",HahleOyPersonality)
Index: APPS/EC/impl/KlantInstellingenServiceHaefeleSE.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/KlantInstellingenServiceHaefeleSE.cls.xml	(revision 0)
+++ APPS/EC/impl/KlantInstellingenServiceHaefeleSE.cls.xml	(revision 63827)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.KlantInstellingenServiceHaefeleSE">
+<Super>APPS.common.impl.KlantInstellingenService</Super>
+
+<Method name="MagKlantLBXVerpakkingTypeBestellen">
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,VerpakkingType:DOM.PM.enu.LBXVerpakkingType</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (VerpakkingType '= ##class(DOM.PM.enu.LBXVerpakkingType).VHoss())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r59335 -r63827
--- DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 59335)
+++ DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 63827)
@@ -153,6 +153,28 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantDataDto = ##class(DOM.common.dto.KlantData).%New()
+	
+	#dim KlantData As DOM.VKP.impl.HaefeleSEKlantData = ..OpenKlantData(..KlantID, HaefeleSEPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, HaefeleSEPersonality.GeefPrefix())
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantDataDto = ##class(DOM.common.dto.KlantData).%New()
+	
+	#dim KlantData As DOM.VKP.impl.HaefeleDEKlantData = ..OpenKlantData(..KlantID, HaefeleFIPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, HaefeleFIPersonality.GeefPrefix())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: DOM/common/impl/PersonalityService.cls.xml
===================================================================
diff -u -r63674 -r63827
--- DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 63674)
+++ DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 63827)
@@ -108,6 +108,8 @@
 	Quit:(PersonalityID = Personality.Seefelder) $$$True
 	Quit:(PersonalityID = Personality.HaefeleNL) $$$True
 	Quit:(PersonalityID = Personality.HaefeleDE) $$$True
+	Quit:(PersonalityID = Personality.HaefeleSE) $$$True
+	Quit:(PersonalityID = Personality.HaefeleFI) $$$True
 	Quit:(PersonalityID = Personality.Zweygart) $$$True
 	Quit:(PersonalityID = Personality.JBarth) $$$True
 	Quit:(PersonalityID = Personality.Kleiner) $$$True
Index: DOM/common/enu/Personality.cls.xml
===================================================================
diff -u -r59338 -r63827
--- DOM/common/enu/Personality.cls.xml	(.../Personality.cls.xml)	(revision 59338)
+++ DOM/common/enu/Personality.cls.xml	(.../Personality.cls.xml)	(revision 63827)
@@ -6,11 +6,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="DISPLAYLIST">
-<Default>,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</Default>
+<Default>,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</Default>
 </Parameter>
 
 <Parameter name="VALUELIST">
-<Default>,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</Default>
+<Default>,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</Default>
 </Parameter>
 
 <Method name="VanHoecke">
@@ -270,6 +270,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleSE">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit 37
+]]></Implementation>
+</Method>
+
+<Method name="HaefeleFI">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit 38
+]]></Implementation>
+</Method>
+
 <Method name="RandomValue">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ValueToBeIgnored...:TECH.String</FormalSpec>
Index: vhTest/Fake/APPS/VKP/Klantspecifiek/Haefele/KortingParser.cls.xml
===================================================================
diff -u -r61294 -r63827
--- vhTest/Fake/APPS/VKP/Klantspecifiek/Haefele/KortingParser.cls.xml	(.../KortingParser.cls.xml)	(revision 61294)
+++ vhTest/Fake/APPS/VKP/Klantspecifiek/Haefele/KortingParser.cls.xml	(.../KortingParser.cls.xml)	(revision 63827)
@@ -9,8 +9,7 @@
 
 <Method name="Parse">
 <FormalSpec>BestandNaam:%String,PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r59335 -r63827
--- vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 59335)
+++ vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 63827)
@@ -19,12 +19,23 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
-<Method name="VerwerkHahleOy">
-<FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 <Implementation><![CDATA[
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHahleOy">
+<FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkDSGroup">
 <FormalSpec>DSGroupPersonality:DOM.common.DSGroupPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/impl/HaefeleFIWebshopSessie.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/HaefeleFIWebshopSessie.cls.xml	(revision 0)
+++ APPS/EC/impl/HaefeleFIWebshopSessie.cls.xml	(revision 63827)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.HaefeleFIWebshopSessie">
+<Super>APPS.EC.impl.HandelWebshopSessie</Super>
+
+<Method name="GeefTeGebruikenPersonalityID">
+<Private>1</Private>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.enu.Personality).HaefeleFI()
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml
===================================================================
diff -u -r59329 -r63827
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml	(.../ResultaatBepalerNietOpgegevenGebruiker.cls.xml)	(revision 59329)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml	(.../ResultaatBepalerNietOpgegevenGebruiker.cls.xml)	(revision 63827)
@@ -51,6 +51,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleZweden">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..VerwachteGebruikerID = "hfleSE_1000_1"
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFinland">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..VerwachteGebruikerID = "hfleFI_1000_1"
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <Private>1</Private>
 <Implementation><![CDATA[	Set ..VerwachteGebruikerID = "kisch_1000_1"
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r62767 -r63827
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 62767)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 63827)
@@ -138,6 +138,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim LeverancierData As DOM.common.LeverancierPersonalityData = HaefeleSEPersonality.GeefLeverancierData()
+	Set ..AankoopPrijs = ..GeefAankoopPrijsBijPersonalityLeverancierInclusiefKorting(..PersonalityRepo.GeefViaID(LeverancierData.PersonalityId),LeverancierData.EigenKlantId)
+	Set ..VerkoopPrijs = ..GeefVerkoopPrijsOBVPersonalityAankoopPrijs(HaefeleSEPersonality,..Winkelkar.GeefKlantID())
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim LeverancierData As DOM.common.LeverancierPersonalityData = HaefeleFIPersonality.GeefLeverancierData()
+	Set ..AankoopPrijs = ..GeefAankoopPrijsBijPersonalityLeverancierInclusiefKorting(..PersonalityRepo.GeefViaID(LeverancierData.PersonalityId),LeverancierData.EigenKlantId)
+	Set ..VerkoopPrijs = ..GeefVerkoopPrijsOBVPersonalityAankoopPrijs(HaefeleFIPersonality,..Winkelkar.GeefKlantID())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml
===================================================================
diff -u -r59316 -r63827
--- APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 59316)
+++ APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 63827)
@@ -114,13 +114,27 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleFinland">
+<Type>%String</Type>
+<InitialExpression>"HFLFI"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleNederland">
 <Type>%String</Type>
 <InitialExpression>"HFLE"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleZweden">
+<Type>%String</Type>
+<InitialExpression>"HFLSE"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HahleOy">
 <Type>%String</Type>
 <InitialExpression>"HAHL"</InitialExpression>
Index: vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml
===================================================================
diff -u -r59412 -r63827
--- vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml	(.../TestGeefKlantInstellingenService.cls.xml)	(revision 59412)
+++ vhUnitTest/APPS/OV/impl/OrderVerwerkingAPI/TestGeefKlantInstellingenService.cls.xml	(.../TestGeefKlantInstellingenService.cls.xml)	(revision 63827)
@@ -43,6 +43,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestPersonalityHaefeleSE">
+<Implementation><![CDATA[
+	#dim Personality As DOM.common.Personality = ##class(DOM.common.HaefeleSEPersonality).Instance()
+	#dim KlantInstellingenService As APPS.common.KlantInstellingenService = ##class(APPS.EC.impl.ECommerceAPI).%New().GeefKlantInstellingenService(Personality)
+	Do $$$AssertContains(KlantInstellingenService.%ClassName(1),"HaefeleSE")
+]]></Implementation>
+</Method>
+
+<Method name="TestPersonalityHaefeleFI">
+<Implementation><![CDATA[
+	#dim Personality As DOM.common.Personality = ##class(DOM.common.HaefeleFIPersonality).Instance()
+	#dim KlantInstellingenService As APPS.common.KlantInstellingenService = ##class(APPS.EC.impl.ECommerceAPI).%New().GeefKlantInstellingenService(Personality)
+	Do $$$AssertContains(KlantInstellingenService.%ClassName(1),"HaefeleFI")
+]]></Implementation>
+</Method>
+
 <Method name="TestPersonalityVanHoecke">
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
Index: vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r58718 -r63827
--- vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 58718)
+++ vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 63827)
@@ -25,6 +25,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleSEPrijsFactorBepaler.cls.xml
===================================================================
diff -u
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleSEPrijsFactorBepaler.cls.xml	(revision 0)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBepaler/HaefeleSEPrijsFactorBepaler.cls.xml	(revision 63827)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.HaefeleSEPrijsFactorBepaler">
+<Super>APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.GeenPrijsFactorBepaler,DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerkenVisitor</Super>
+
+<Parameter name="TBXLade">
+<Type>%Decimal</Type>
+<Default>1.57</Default>
+</Parameter>
+
+<Parameter name="LBXLade">
+<Type>%Decimal</Type>
+<Default>1.70</Default>
+</Parameter>
+
+<Parameter name="TAORLade">
+<Type>%Decimal</Type>
+<Default>1.50</Default>
+</Parameter>
+
+<Parameter name="Orgalux">
+<Type>%Decimal</Type>
+<Default>1.63</Default>
+</Parameter>
+
+<Property name="PrijsFactor">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrijsFactor">
+<FormalSpec>MaatwerkLijn:DOM.EC.Winkelkar.MaatwerkLijn</FormalSpec>
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	Set ..PrijsFactor = 1
+	Do MaatwerkLijn.GeefIngegevenKenmerken().Accept($this)
+	
+	Quit ..PrijsFactor
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrgaluxPrijsFactor">
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	Set ..PrijsFactor = ..#Orgalux
+	
+	Quit ..PrijsFactor
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTAORKenmerken">
+<FormalSpec>TAORKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#TAORLade
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkLBXKenmerken">
+<FormalSpec>LBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#LBXLade
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkTBXKenmerken">
+<FormalSpec>TBXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.TBXKenmerken</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactor = ..#TBXLade
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: cspBasis/TBX/enu/Verwerker.cls.xml
===================================================================
diff -u -r58718 -r63827
--- cspBasis/TBX/enu/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58718)
+++ cspBasis/TBX/enu/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 63827)
@@ -7,11 +7,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;SFS;LMC;MBHO;HFLB;VHEPN;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;HFLD</Default>
+<Default>;SFS;LMC;MBHO;HFLB;VHEPN;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;HFLD;HFLSE;HFLFI</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;VHEPN;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;HaefeleDuitsland</Default>
+<Default>;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;VHEPN;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;HaefeleDuitsland;HaefeleZweden;HaefeleFinland</Default>
 </Parameter>
 
 <Method name="SFS">
@@ -84,6 +84,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleZweden">
+<ClassMethod>1</ClassMethod>
+<ReturnType>cspBasis.TBX.enu.Verwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZweden()
+]]></Implementation>
+</Method>
+
+<Method name="HaefeleFinland">
+<ClassMethod>1</ClassMethod>
+<ReturnType>cspBasis.TBX.enu.Verwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).HaefeleFinland()
+]]></Implementation>
+</Method>
+
 <Method name="VanRaemdonck">
 <ClassMethod>1</ClassMethod>
 <ReturnType>cspBasis.TBX.enu.Verwerker</ReturnType>
Index: DOM/common/PersonalityUnishopVisitor.cls.xml
===================================================================
diff -u -r58718 -r63827
--- DOM/common/PersonalityUnishopVisitor.cls.xml	(.../PersonalityUnishopVisitor.cls.xml)	(revision 58718)
+++ DOM/common/PersonalityUnishopVisitor.cls.xml	(.../PersonalityUnishopVisitor.cls.xml)	(revision 63827)
@@ -27,6 +27,16 @@
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<Abstract>1</Abstract>
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<Abstract>1</Abstract>
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkDestil">
 <Abstract>1</Abstract>
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
Index: APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml
===================================================================
diff -u -r59329 -r63827
--- APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 59329)
+++ APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 63827)
@@ -41,8 +41,12 @@
 		Do ..VerwerkHaefeleBelgie()
 	} ElseIf UniShopVerwerker = "HFLD" {
 		Do ..VerwerkHaefeleDuitsland()
+	} ElseIf UniShopVerwerker = "HFLFI" {
+		Do ..VerwerkHaefeleFinland()
 	} ElseIf UniShopVerwerker = "HFLE" {
 		Do ..VerwerkHaefeleNederland()
+	} ElseIf UniShopVerwerker = "HFLSE" {
+		Do ..VerwerkHaefeleZweden()
 	} ElseIf UniShopVerwerker = "HAHL" {
 		Do ..VerwerkHahleOy()
 	} ElseIf UniShopVerwerker = "HEIN" {
@@ -164,12 +168,24 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFinland">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNederland">
 <Abstract>1</Abstract>
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleZweden">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: vhTest/Utils/DOM/VKP/LeverAdres.cls.xml
===================================================================
diff -u -r61823 -r63827
--- vhTest/Utils/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 61823)
+++ vhTest/Utils/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 63827)
@@ -78,6 +78,34 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Zweeds">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	Do LeverAdres.ZetNaam("Zweeds adres")
+	Do LeverAdres.ZetLandNr(1235)
+	Do LeverAdres.ZetPostcode("680 51")
+	Do LeverAdres.ZetStraat("Fastnas 53")
+	Do LeverAdres.ZetGemeente("Stollet")
+	Quit LeverAdres
+]]></Implementation>
+</Method>
+
+<Method name="Fins">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	Do LeverAdres.ZetNaam("Duits adres")
+	Do LeverAdres.ZetLandNr(1063)
+	Do LeverAdres.ZetPostcode("11101")
+	Do LeverAdres.ZetStraat("Kalevankatu")
+	Do LeverAdres.ZetGemeente("Riihimaki")
+	Quit LeverAdres
+]]></Implementation>
+</Method>
+
 <Method name="NietEuLid">
 <ClassMethod>1</ClassMethod>
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
Index: vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r59328 -r63827
--- vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 59328)
+++ vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 63827)
@@ -19,12 +19,23 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
-<Method name="VerwerkHahleOy">
-<FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 <Implementation><![CDATA[
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHahleOy">
+<FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/impl/KlantDataReferentieBepaler.cls.xml
===================================================================
diff -u -r59329 -r63827
--- APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 59329)
+++ APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 63827)
@@ -253,6 +253,28 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ..GeefKlantIDVoorInfoVanOfferte(..Offerte)			
+	#dim KlantData As DOM.VKP.impl.KlantData = ..DataService.GeefKlantData(HaefeleSEPersonality.GeefID(), KlantID)
+	
+	#dim Naam As %String = KlantData.Naam
+	Do ..VoegToeIndienNodig(Naam)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ..GeefKlantIDVoorInfoVanOfferte(..Offerte)			
+	#dim KlantData As DOM.VKP.impl.KlantData = ..DataService.GeefKlantData(HaefeleFIPersonality.GeefID(), KlantID)
+	
+	#dim Naam As %String = KlantData.Naam
+	Do ..VoegToeIndienNodig(Naam)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: DOM/common/PersonalityVisitor.cls.xml
===================================================================
diff -u -r59318 -r63827
--- DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 59318)
+++ DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 63827)
@@ -34,6 +34,16 @@
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<Abstract>1</Abstract>
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<Abstract>1</Abstract>
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkDestil">
 <Abstract>1</Abstract>
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
Index: vhUnitTest/APPS/EC/impl/HaefeleDEVerzendwijzeBepaler/Test.cls.xml
===================================================================
diff -u -r62774 -r63827
--- vhUnitTest/APPS/EC/impl/HaefeleDEVerzendwijzeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 62774)
+++ vhUnitTest/APPS/EC/impl/HaefeleDEVerzendwijzeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 63827)
@@ -72,12 +72,37 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test Zweden">
+<Implementation><![CDATA[
+	#dim LandCode as %String = "SE"
+	Set Bepaler = ##class(APPS.EC.impl.HaefeleDEVerzendwijzeBepaler).%New()
+		
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"0000"),"DA4")
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"7700"),"DA4")
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"7800"),"DA5")
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"8900"),"DA5")
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"9000"),"DA6")
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"9900"),"DA6")
+]]></Implementation>
+</Method>
+
+<Method name="Test Finland">
+<Implementation><![CDATA[
+	#dim LandCode as %String = "FI"
+	Set Bepaler = ##class(APPS.EC.impl.HaefeleDEVerzendwijzeBepaler).%New()
+		
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"0000"),"DA4")
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"0000"),"DA4")
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"1600"),"DA6")
+	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,"9900"),"DA6")
+]]></Implementation>
+</Method>
+
 <Method name="Test Luxemburg">
 <Implementation><![CDATA[
 	#dim LandCode as %String = "LU"
 	Set Bepaler = ##class(APPS.EC.impl.HaefeleDEVerzendwijzeBepaler).%New()
-	
-	
+		
 	Do $$$AssertEquals(Bepaler.GeefVerzendWijze(LandCode,9420),"HD2")
 ]]></Implementation>
 </Method>
Index: WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r59327 -r63827
--- WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 59327)
+++ WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 63827)
@@ -53,6 +53,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..WebshopVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZweden()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..WebshopVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleFinland()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 <Implementation><![CDATA[	Set ..WebshopVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Hein()
Index: APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml
===================================================================
diff -u -r59316 -r63827
--- APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 59316)
+++ APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 63827)
@@ -42,8 +42,12 @@
 		Do ..VerwerkHaefeleBelgie()
 	} ElseIf WebShopVerwerker = "HFLD" {
 		Do ..VerwerkHaefeleDuitsland()
+	} ElseIf WebShopVerwerker = "HFLFI" {
+		Do ..VerwerkHaefeleFinland()
 	} ElseIf WebShopVerwerker = "HFLE" {
 		Do ..VerwerkHaefeleNederland()
+	} ElseIf WebShopVerwerker = "HFLSE" {
+		Do ..VerwerkHaefeleZweden()
 	} ElseIf WebShopVerwerker = "HAHL" {
 		Do ..VerwerkHahleOy()
 	} ElseIf WebShopVerwerker = "HEIN" {
@@ -175,12 +179,24 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFinland">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNederland">
 <Abstract>1</Abstract>
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleZweden">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: BL/Legacy/DCPRINT2.cls.xml
===================================================================
diff -u -r63584 -r63827
--- BL/Legacy/DCPRINT2.cls.xml	(.../DCPRINT2.cls.xml)	(revision 63584)
+++ BL/Legacy/DCPRINT2.cls.xml	(.../DCPRINT2.cls.xml)	(revision 63827)
@@ -161,26 +161,27 @@
 <FormalSpec>BonId:%Integer</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
 	#dim IsAfdrukOpBlancoPapier As %Boolean = $$$False
 	
 	#dim PersonalityId As DOM.common.enu.Personality = ..GeefPersonalityIdVoorBon(BonId)
 	Set ProjectSettingsAPI = ##class(DOM.common.impl.ProjectSettingsAPI).%New()
 	
-	If (PersonalityId = ##class(DOM.common.enu.Personality).Noteborn()) {
+	If (PersonalityId = Personality.Noteborn()) {
 		Set IsAfdrukOpBlancoPapier = $$$True
-	} ElseIf (PersonalityId = ##class(DOM.common.enu.Personality).HaefeleNL()) || (PersonalityId = ##class(DOM.common.enu.Personality).HaefeleDE()){
+	} ElseIf (PersonalityId = Personality.HaefeleNL) || (PersonalityId = Personality.HaefeleDE) || (PersonalityId = Personality.HaefeleSE) || (PersonalityId = Personality.HaefeleFI){
 		Set IsAfdrukOpBlancoPapier = $$$True
-	} ElseIf (PersonalityId = ##class(DOM.common.enu.Personality).HaefeleBE()) && (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefHaefeleBENaarEindklant()) {
+	} ElseIf (PersonalityId = Personality.HaefeleBE) && (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefHaefeleBENaarEindklant()) {
 		Set IsAfdrukOpBlancoPapier = $$$True
-	} ElseIf (ProjectSettingsAPI.IsActiefHeinNaarEindklant()) && (PersonalityId = ##class(DOM.common.enu.Personality).Hein()) {
+	} ElseIf (ProjectSettingsAPI.IsActiefHeinNaarEindklant()) && (PersonalityId = Personality.Hein) {
 		Set IsAfdrukOpBlancoPapier = $$$True
-	} ElseIf (ProjectSettingsAPI.IsActiefDuPontNaarEindklant()) && ((..GeefKlantIDVoorBon(BonId) = ##class(DOM.VKP.enu.Klant).DuPont()) || (PersonalityId = ##class(DOM.common.enu.Personality).Dupont())) {
+	} ElseIf (ProjectSettingsAPI.IsActiefDuPontNaarEindklant()) && ((..GeefKlantIDVoorBon(BonId) = ##class(DOM.VKP.enu.Klant).DuPont()) || (PersonalityId = Personality.Dupont)) {
 		Set IsAfdrukOpBlancoPapier = $$$True
-	} ElseIf ((..GeefKlantIDVoorBon(BonId) = ##class(DOM.VKP.enu.Klant).SFS()) || (PersonalityId = ##class(DOM.common.enu.Personality).SFS())) {
+	} ElseIf ((..GeefKlantIDVoorBon(BonId) = ##class(DOM.VKP.enu.Klant).SFS()) || (PersonalityId = Personality.SFS)) {
 		Set IsAfdrukOpBlancoPapier = $$$True
-	}ElseIf ((PersonalityId = ##class(DOM.common.enu.Personality).VanRaemdonck())) {
+	}ElseIf ((PersonalityId = Personality.VanRaemdonck)) {
 		Set IsAfdrukOpBlancoPapier = $$$True
-	}ElseIf ((PersonalityId = ##class(DOM.common.enu.Personality).CampeTonny())) {
+	}ElseIf ((PersonalityId = Personality.CampeTonny)) {
 		Set IsAfdrukOpBlancoPapier = $$$True
 	}
 	
Index: APPS/EC/impl/HaefeleDEVerzendwijzeBepaler.cls.xml
===================================================================
diff -u -r62774 -r63827
--- APPS/EC/impl/HaefeleDEVerzendwijzeBepaler.cls.xml	(.../HaefeleDEVerzendwijzeBepaler.cls.xml)	(revision 62774)
+++ APPS/EC/impl/HaefeleDEVerzendwijzeBepaler.cls.xml	(.../HaefeleDEVerzendwijzeBepaler.cls.xml)	(revision 63827)
@@ -11,7 +11,7 @@
 	
 	#dim Verzendwijze as %String = ""
 	#dim NumPostcode as %Integer = +Postcode
-	if ((LandCode = "DE") & ($$$HasLength(Postcode)) & (##class(TECH.StringUtils).RemoveAllWhitespaces(##class(TECH.StringUtils).StripAllNumeric(Postcode))="")) {
+	if ((LandCode = "DE") && ($$$HasLength(Postcode)) & (##class(TECH.StringUtils).RemoveAllWhitespaces(##class(TECH.StringUtils).StripAllNumeric(Postcode))="")) {
 		if (((NumPostcode >= 0) & (NumPostcode < 20000))||((NumPostcode >=20000) & (NumPostcode < 28000))) {
 			Set Verzendwijze = "HD3"
 		} elseif (((NumPostcode >=28000) & (NumPostcode <67000)) || ((NumPostcode >=80000) & (NumPostcode < 100000))) {
@@ -21,10 +21,30 @@
 		} 
 	}
 
-	if ((LandCode = "LU") & ($$$HasLength(Postcode)) & (##class(TECH.StringUtils).RemoveAllWhitespaces(##class(TECH.StringUtils).StripAllNumeric(Postcode))="")) {
+	if ((LandCode = "LU") && ($$$HasLength(Postcode)) & (##class(TECH.StringUtils).RemoveAllWhitespaces(##class(TECH.StringUtils).StripAllNumeric(Postcode))="")) {
 		Set Verzendwijze = "HD2"
 	}
+	
+	if ((LandCode = "SE") && ($$$HasLength(Postcode)) & (##class(TECH.StringUtils).RemoveAllWhitespaces(##class(TECH.StringUtils).StripAllNumeric(Postcode))="")) {
+		#dim Regio as %Integer = +$Extract(Postcode,1,2)
+		If (Regio < 78) {
+			Set Verzendwijze = "DA4"
+		} Elseif ((Regio > 77) && (Regio < 90)) {
+			Set Verzendwijze = "DA5"
+		} Else {
+			Set Verzendwijze = "DA6"
+		}
+	}
 
+	if ((LandCode = "FI") && ($$$HasLength(Postcode)) & (##class(TECH.StringUtils).RemoveAllWhitespaces(##class(TECH.StringUtils).StripAllNumeric(Postcode))="")) {
+		Set Regio = +$Extract(Postcode,1,2)
+		If (Regio < 16) {
+			Set Verzendwijze = "DA4"
+		} Else {
+			Set Verzendwijze = "DA6"
+		}		
+	}
+
 	if $$$Not($$$HasLength(Verzendwijze)){
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ongeldige landcode ("_LandCode_") / postcode ("_Postcode_")  combinatie voor Haefele DE"))
 	} 
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r62141 -r63827
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 62141)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 63827)
@@ -58,6 +58,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactorBepaler = ##class(APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.HaefeleSEPrijsFactorBepaler).%New()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..PrijsFactorBepaler = ##class(APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBepaler.HaefeleFIPrijsFactorBepaler).%New()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInGeenPrijsFactorBepaler()
Index: DOM/common/enu/Personality/Verwerker.cls.xml
===================================================================
diff -u -r59312 -r63827
--- DOM/common/enu/Personality/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 59312)
+++ DOM/common/enu/Personality/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 63827)
@@ -44,8 +44,12 @@
 		Do ..VerwerkHaefeleBE()
 	} ElseIf Personality = "33" {
 		Do ..VerwerkHaefeleDE()
+	} ElseIf Personality = "38" {
+		Do ..VerwerkHaefeleFI()
 	} ElseIf Personality = "12" {
 		Do ..VerwerkHaefeleNL()
+	} ElseIf Personality = "37" {
+		Do ..VerwerkHaefeleSE()
 	} ElseIf Personality = "36" {
 		Do ..VerwerkHahleOy()
 	} ElseIf Personality = "11" {
@@ -183,12 +187,24 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <Abstract>1</Abstract>
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r59319 -r63827
--- vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 59319)
+++ vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 63827)
@@ -112,12 +112,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFI",HaefeleFIPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHahleOy",HahleOyPersonality)
Index: WSimpl/Unishop/Login/ParametersHaefeleSE.cls.xml
===================================================================
diff -u
--- WSimpl/Unishop/Login/ParametersHaefeleSE.cls.xml	(revision 0)
+++ WSimpl/Unishop/Login/ParametersHaefeleSE.cls.xml	(revision 63827)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.Unishop.Login.ParametersHaefeleSE">
+<Super>WSimpl.Unishop.Login.Parameters</Super>
+
+<Property name="KlantNaam">
+<Type>%String</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml
===================================================================
diff -u -r59418 -r63827
--- vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 59418)
+++ vhUnitTest/DOM/VKP/impl/HandelToegelatenLadetypesBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 63827)
@@ -62,6 +62,8 @@
 	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Seefelder, VerwachteLadetypes)
 	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.Beslagteknikk, VerwachteLadetypes)
 	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HahleOy, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleSE, VerwachteLadetypes)
+	Do ..AssertToegelatenLadeTypes(..PersonalityEnum.HaefeleFI, VerwachteLadetypes)
 ]]></Implementation>
 </Method>
 
Index: APPS/VKP/Korting/impl/KortingFactory.cls.xml
===================================================================
diff -u -r58718 -r63827
--- APPS/VKP/Korting/impl/KortingFactory.cls.xml	(.../KortingFactory.cls.xml)	(revision 58718)
+++ APPS/VKP/Korting/impl/KortingFactory.cls.xml	(.../KortingFactory.cls.xml)	(revision 63827)
@@ -50,6 +50,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..KortingParser = ##class(APPS.VKP.Klantspecifiek.Haefele.KortingParser).%New()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..KortingParser = ##class(APPS.VKP.Klantspecifiek.Haefele.KortingParser).%New()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml
===================================================================
diff -u -r58718 -r63827
--- APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml	(.../DomeinVerwerkerBepaler.cls.xml)	(revision 58718)
+++ APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml	(.../DomeinVerwerkerBepaler.cls.xml)	(revision 63827)
@@ -53,6 +53,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleZweden()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleFinland()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Destil()
Index: vhUnitTest/APPS/VKP/Offerte/impl/OfferteKopieerder/KopieerOfferte/Test.cls.xml
===================================================================
diff -u -r51735 -r63827
--- vhUnitTest/APPS/VKP/Offerte/impl/OfferteKopieerder/KopieerOfferte/Test.cls.xml	(.../Test.cls.xml)	(revision 51735)
+++ vhUnitTest/APPS/VKP/Offerte/impl/OfferteKopieerder/KopieerOfferte/Test.cls.xml	(.../Test.cls.xml)	(revision 63827)
@@ -152,10 +152,12 @@
 	Do ..WinkelkarKopieerderStub.IndienMethodCall("KopieerWinkelkar", ..#WinkelkarID,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..#WinkelkarKopieID)
 	
 	Do ..InitOfferteKopieerder()
+	Do ..DummyOfferte.VerwachtMethodCall("GeefBestelOpmerking").Nooit() ; DanReturn($$$DummyString)
 	Do ..DummyOfferte.IndienMethodCall("GeefPersonalityID").DanReturn(##class(DOM.common.enu.Personality).HaefeleBE())
 	
 	#dim OfferteKopie As APPS.VKP.Offerte = ..OfferteKopieerder.KopieerOfferte(..DummyOfferte)
 	
+	Do ..DummyOfferte.Verifieer()
 	Do $$$AssertEquals(OfferteKopie.GeefBestelOpmerking(), "")
 ]]></Implementation>
 </Method>
Index: WSimpl/Unishop/Login/ParametersHaefeleFI.cls.xml
===================================================================
diff -u
--- WSimpl/Unishop/Login/ParametersHaefeleFI.cls.xml	(revision 0)
+++ WSimpl/Unishop/Login/ParametersHaefeleFI.cls.xml	(revision 63827)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.Unishop.Login.ParametersHaefeleFI">
+<Super>WSimpl.Unishop.Login.Parameters</Super>
+
+<Property name="KlantNaam">
+<Type>%String</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml
===================================================================
diff -u -r59330 -r63827
--- APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml	(.../KlantRapporteurVhisie4.cls.xml)	(revision 59330)
+++ APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml	(.../KlantRapporteurVhisie4.cls.xml)	(revision 63827)
@@ -113,6 +113,14 @@
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling/VerzendingService.cls.xml
===================================================================
diff -u -r61243 -r63827
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling/VerzendingService.cls.xml	(.../VerzendingService.cls.xml)	(revision 61243)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/BereidVoorBestelling/VerzendingService.cls.xml	(.../VerzendingService.cls.xml)	(revision 63827)
@@ -116,7 +116,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
-	Quit ((KlantPartijID = Klant.DuPont) || (##class(TECH.StringUtils).StartsWith(KlantPartijID,"dupont")) || (KlantPartijID = Klant.HaefeleDuitsland) || (##class(TECH.StringUtils).StartsWith(KlantPartijID,"hfleDE")))
+	Quit ((KlantPartijID = Klant.DuPont) || (##class(TECH.StringUtils).StartsWith(KlantPartijID,"dupont")) || (KlantPartijID = Klant.HaefeleDuitsland) || (##class(TECH.StringUtils).StartsWith(KlantPartijID,"hfleDE","hfleSE","hfleFI")))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r59324 -r63827
--- vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 59324)
+++ vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 63827)
@@ -19,6 +19,18 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml
===================================================================
diff -u -r63584 -r63827
--- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml	(.../LeverbonHoofdingBepaler.cls.xml)	(revision 63584)
+++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml	(.../LeverbonHoofdingBepaler.cls.xml)	(revision 63827)
@@ -300,6 +300,62 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleSE()
+	
+	Set ..LeverbonHoofding.ColLeftWidth = "40mm"
+    Set ..LeverbonHoofding.ColRightWidth = "73mm"
+    
+	#dim URL As %String = ""
+	
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(HaefeleSEPersonality.GeefKlantID())
+	If Klant.HeeftEigenLogo(){
+    	Set URL = "\\fop\Resources\Media\KlantLogos\"
+		#dim Bestand As %String = Klant.GeefLogo()
+		#dim Extensie As %String = ##class(TECH.StringUtils).GetLastPart(Bestand,".")
+    	Set URL = ##class(TECH.Files).AppendFile(URL,Bestand)
+    	Set ..LeverbonHoofding.LOGO = ##class(BL.FOP.Basis.pxAttribType).Create(URL,##class(TECH.StringUtils).ToUpper(Extensie),,)
+	}	    
+    Set ..LeverbonHoofding.NAAM = "Häfele GmbH & Co KG"
+    Set ..LeverbonHoofding.STRAATNRBUS = "Adolf-Häfele-Str. 1"    
+    Set ..LeverbonHoofding.WOONPLAATS = "Nagold"
+    Set ..LeverbonHoofding.POSTCODE = "72202"
+	Set ..LeverbonHoofding.TELEFOON = "+49 745 29 50"	
+	Set ..LeverbonHoofding.EMAIL = "Info@hafele.de"
+	Set ..LeverbonHoofding.T1 = "USt-ID: DE144425382"
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleFI()
+	
+	Set ..LeverbonHoofding.ColLeftWidth = "40mm"
+    Set ..LeverbonHoofding.ColRightWidth = "73mm"
+    
+	#dim URL As %String = ""
+	
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(HaefeleFIPersonality.GeefKlantID())
+	If Klant.HeeftEigenLogo(){
+    	Set URL = "\\fop\Resources\Media\KlantLogos\"
+		#dim Bestand As %String = Klant.GeefLogo()
+		#dim Extensie As %String = ##class(TECH.StringUtils).GetLastPart(Bestand,".")
+    	Set URL = ##class(TECH.Files).AppendFile(URL,Bestand)
+    	Set ..LeverbonHoofding.LOGO = ##class(BL.FOP.Basis.pxAttribType).Create(URL,##class(TECH.StringUtils).ToUpper(Extensie),,)
+	}	    
+    Set ..LeverbonHoofding.NAAM = "Häfele GmbH & Co KG"
+    Set ..LeverbonHoofding.STRAATNRBUS = "Adolf-Häfele-Str. 1"    
+    Set ..LeverbonHoofding.WOONPLAATS = "Nagold"
+    Set ..LeverbonHoofding.POSTCODE = "72202"
+	Set ..LeverbonHoofding.TELEFOON = "+49 745 29 50"	
+	Set ..LeverbonHoofding.EMAIL = "Info@hafele.de"
+	Set ..LeverbonHoofding.T1 = "USt-ID: DE144425382"
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/impl/ECommerceAPI.cls.xml
===================================================================
diff -u -r60586 -r63827
--- APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 60586)
+++ APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 63827)
@@ -142,6 +142,10 @@
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServicePierard).%New()
 	} ElseIf (Personality.GeefID() = ..Personality.HahleOy) {
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHahleOy).%New()
+	} ElseIf (Personality.GeefID() = ..Personality.HaefeleSE) {
+		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleSE).%New()
+	} ElseIf (Personality.GeefID() = ..Personality.HaefeleFI) {
+		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleFI).%New()
 	} Else {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Voor Personality '" _ $Select($IsObject(Personality):Personality.GeefID(),1:"[geen object]") _ "' bestaat geen KlantInstellingenService."))
 	}
Index: DOM/VKP/impl/HaefeleSEKlantData.cls.xml
===================================================================
diff -u
--- DOM/VKP/impl/HaefeleSEKlantData.cls.xml	(revision 0)
+++ DOM/VKP/impl/HaefeleSEKlantData.cls.xml	(revision 63827)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.VKP.impl.HaefeleSEKlantData">
+<Super>DOM.VKP.impl.HandelKlantData</Super>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+<Package name="DOM.VKP.impl" sqlname="DOM_VKP_impl"/>
+</Export>
Index: vhTest/Fake/APPS/VKP/Korting/impl/KortingService.cls.xml
===================================================================
diff -u -r61294 -r63827
--- vhTest/Fake/APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 61294)
+++ vhTest/Fake/APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 63827)
@@ -16,14 +16,12 @@
 
 <Method name="Parse">
 <FormalSpec>BestandNaam:%String,PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="StelInKortingenUitBestand">
 <FormalSpec>BestandNaam:%String,PersonalityID:DOM.common.enu.Personality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r59331 -r63827
--- vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 59331)
+++ vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 63827)
@@ -21,12 +21,23 @@
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkHahleOy">
-<FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 <Implementation><![CDATA[
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHahleOy">
+<FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml
===================================================================
diff -u -r59329 -r63827
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml	(.../ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml)	(revision 59329)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml	(.../ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml)	(revision 63827)
@@ -51,6 +51,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleZweden">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..VerwachteGebruikerID = "hfleSE_1000_"_..GebruikerID
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFinland">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..VerwachteGebruikerID = "hfleFI_1000_"_..GebruikerID
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <Private>1</Private>
 <Implementation><![CDATA[	Set ..VerwachteGebruikerID = "kisch_1000_"_..GebruikerID
Index: APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r59331 -r63827
--- APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 59331)
+++ APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 63827)
@@ -157,6 +157,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Do ..ControleerReedsBesteld()
+	Do ..ControleerToegangEnPrijzen()
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Do ..ControleerReedsBesteld()
+	Do ..ControleerToegangEnPrijzen()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoeckeVoorHalux">
 <FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkVanHoecke(VanHoeckVoorHaluxPersonality)
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r62086 -r63827
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 62086)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 63827)
@@ -16,188 +16,169 @@
 
 <Method name="VerwerkBeslagDesign">
 <FormalSpec>BeslagDesignPersonality:DOM.common.BeslagDesignPersonality</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 <Implementation><![CDATA[
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkBeslagteknikk">
-<FormalSpec>BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality</FormalSpec>
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
 <Implementation><![CDATA[
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkBeslagteknikk">
+<FormalSpec>BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkBiemarBois">
 <FormalSpec>BiemarBoisPersonality:DOM.common.BiemarBoisPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkCampeTonny">
 <FormalSpec>CampeTonnyPersonality:DOM.common.CampeTonnyPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkDSGroup">
 <FormalSpec>DSGroupPersonality:DOM.common.DSGroupPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkDaro">
 <FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkDeBisschop">
 <FormalSpec>DeBisschopPersonality:DOM.common.DeBisschopPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkDeceuninckDeforce">
 <FormalSpec>DeceuninckDeforcePersonality:DOM.common.DeceuninckDeforcePersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkDupont">
 <FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkFerexpert">
 <FormalSpec>FerexpertPersonality:DOM.common.FerexpertPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkFurnifit">
 <FormalSpec>FurnifitPersonality:DOM.common.FurnifitPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkGalimberti">
 <FormalSpec>GalimbertiPersonality:DOM.common.GalimbertiPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleBE">
 <FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkJBarth">
 <FormalSpec>JBarthPersonality:DOM.common.JBarthPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkKleiner">
 <FormalSpec>KleinerPersonality:DOM.common.KleinerPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkLayer">
 <FormalSpec>LayerPersonality:DOM.common.LayerPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkPavanello">
 <FormalSpec>PavanelloPersonality:DOM.common.PavanelloPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkPierard">
 <FormalSpec>PierardPersonality:DOM.common.PierardPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkRini">
 <FormalSpec>RiniPersonality:DOM.common.RiniPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkSeefelder">
 <FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkVanRaemdonck">
 <FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkYachtSupplier">
 <FormalSpec>YachtSupplierPersonality:DOM.common.YachtSupplierPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkZweygart">
 <FormalSpec>ZweygartPersonality:DOM.common.ZweygartPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml
===================================================================
diff -u -r59322 -r63827
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 59322)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 63827)
@@ -75,6 +75,8 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Pierard())
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleDE())
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HahleOy())
+	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleSE())
+	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleFI())
 	
 	Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein())
 	Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Seefelder())
Index: vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r59327 -r63827
--- vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 59327)
+++ vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 63827)
@@ -105,12 +105,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFI",HaefeleFIPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHahleOy",HahleOyPersonality)
Index: APPS/VKP/Korting/impl/KortingService.cls.xml
===================================================================
diff -u -r61294 -r63827
--- APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 61294)
+++ APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 63827)
@@ -116,8 +116,8 @@
 	Else {
 		Set lbVariantenVoorTbx = $LB(##class(DOM.PM.enu.Variant).TandemboxAntaro())
 	}
-	
-	#dim KopieerKortingVanTbxNaarAndereTypes As %Boolean = ((PersonalityID = ##class(DOM.common.enu.Personality).HaefeleNL())||(PersonalityID = ##class(DOM.common.enu.Personality).HaefeleDE()))
+	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
+	#dim KopieerKortingVanTbxNaarAndereTypes As %Boolean = ((PersonalityID =Personality.HaefeleNL)||(PersonalityID = Personality.HaefeleDE)||(PersonalityID = Personality.HaefeleSE)||(PersonalityID = Personality.HaefeleFI))
 	If KopieerKortingVanTbxNaarAndereTypes {
 		Set lbVariantenVoorTbx = lbVariantenVoorTbx _ $LB(##class(DOM.PM.enu.Variant).LegraboxPure()) _ $LB(##class(DOM.PM.enu.Variant).Taorbox())
 	}
Index: vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r59335 -r63827
--- vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 59335)
+++ vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 63827)
@@ -112,12 +112,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFI",HaefeleFIPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHahleOy",HahleOyPersonality)
Index: DOM/common/HaefeleFIPersonality.cls.xml
===================================================================
diff -u
--- DOM/common/HaefeleFIPersonality.cls.xml	(revision 0)
+++ DOM/common/HaefeleFIPersonality.cls.xml	(revision 63827)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.common.HaefeleFIPersonality">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.common.impl.HandelPersonality</Super>
+
+<Method name="Instance">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.impl.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(##class(DOM.common.enu.Personality).HaefeleFI())
+]]></Implementation>
+</Method>
+
+<Method name="Accept">
+<FormalSpec>Visitor:DOM.common.PersonalityVisitor</FormalSpec>
+<Implementation><![CDATA[	Do Visitor.VerwerkHaefeleFI($this)
+]]></Implementation>
+</Method>
+
+<Method name="GeefTaal">
+<ReturnType>DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.enu.Taal).Fins()
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverancierData">
+<ReturnType>DOM.common.LeverancierPersonalityData</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.common.LeverancierPersonalityData).%New(##class(DOM.common.enu.Personality).VanHoecke(),##class(DOM.VKP.enu.Klant).HaefeleDuitsland())
+]]></Implementation>
+</Method>
+
+<Method name="IsHandel">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="GeefNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "Häfele FI"
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrefix">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "hfleFI_"
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: APPS/EC/enu/WebShopVerwerker.cls.xml
===================================================================
diff -u -r59316 -r63827
--- APPS/EC/enu/WebShopVerwerker.cls.xml	(.../WebShopVerwerker.cls.xml)	(revision 59316)
+++ APPS/EC/enu/WebShopVerwerker.cls.xml	(.../WebShopVerwerker.cls.xml)	(revision 63827)
@@ -6,11 +6,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;VHEPN;SFS;LMC;MBHO;HFLB;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;DARO;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;BETE;BIBO;JBAR;CAMP;RINI;FURN;YSPL;DSGR;DBSP;DCDF;PIER;HFLD;KLNR;LAYR;HAHL</Default>
+<Default>;VHEPN;SFS;LMC;MBHO;HFLB;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;DARO;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;BETE;BIBO;JBAR;CAMP;RINI;FURN;YSPL;DSGR;DBSP;DCDF;PIER;HFLD;KLNR;LAYR;HAHL;HFLSE;HFLFI</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;VHEPN;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;Daro;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;Beslagteknikk;BiemarBois;JBarth;CampeTonny;Rini;Furnifit;YachtSupplier;DSGroup;DeBisschop;DeceuninckDeforce;Pierard;HaefeleDuitsland;Kleiner;Layer;HahleOy</Default>
+<Default>;VHEPN;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;Daro;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;Beslagteknikk;BiemarBois;JBarth;CampeTonny;Rini;Furnifit;YachtSupplier;DSGroup;DeBisschop;DeceuninckDeforce;Pierard;HaefeleDuitsland;Kleiner;Layer;HahleOy;HaefeleZweden;HaefeleFinland</Default>
 </Parameter>
 
 <Method name="VHEPN">
@@ -244,6 +244,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleZweden">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.WebShopVerwerker</ReturnType>
+<Implementation><![CDATA[	Quit "HFLSE"
+]]></Implementation>
+</Method>
+
+<Method name="HaefeleFinland">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.WebShopVerwerker</ReturnType>
+<Implementation><![CDATA[	Quit "HFLFI"
+]]></Implementation>
+</Method>
+
 <Method name="RandomValue">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ValueToBeIgnored...:TECH.String</FormalSpec>
Index: BL/FOP/Proxy/enu/HoofdingType.cls.xml
===================================================================
diff -u -r63391 -r63827
--- BL/FOP/Proxy/enu/HoofdingType.cls.xml	(.../HoofdingType.cls.xml)	(revision 63391)
+++ BL/FOP/Proxy/enu/HoofdingType.cls.xml	(.../HoofdingType.cls.xml)	(revision 63827)
@@ -51,6 +51,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleSE">
+<ClassMethod>1</ClassMethod>
+<ReturnType>BL.FOP.Proxy.enu.HoofdingType</ReturnType>
+<Implementation><![CDATA[	Quit "HAEFELESE"
+]]></Implementation>
+</Method>
+
+<Method name="HaefeleFI">
+<ClassMethod>1</ClassMethod>
+<ReturnType>BL.FOP.Proxy.enu.HoofdingType</ReturnType>
+<Implementation><![CDATA[	Quit "HAEFELEFI"
+]]></Implementation>
+</Method>
+
 <Method name="HaefeleBE">
 <ClassMethod>1</ClassMethod>
 <ReturnType>BL.FOP.Proxy.enu.HoofdingType</ReturnType>
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml
===================================================================
diff -u -r59322 -r63827
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 59322)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 63827)
@@ -73,6 +73,8 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).DeceuninckDeforce())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Pierard())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HahleOy())
+	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleSE())
+	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleFI())
 	
 	
 	Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein())
Index: cspBasis/TBX/Lib.mac.rou
===================================================================
diff -u -r59317 -r63827
--- cspBasis/TBX/Lib.mac.rou	(.../Lib.mac.rou)	(revision 59317)
+++ cspBasis/TBX/Lib.mac.rou	(.../Lib.mac.rou)	(revision 63827)
@@ -158,6 +158,8 @@
 	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).Kleiner() $$$KleinerKey
 	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).Layer() $$$LayerKey
 	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HahleOy() $$$HahleOyKey
+	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleZweden() $$$HafeleSEKey
+	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleFinland() $$$HafeleFIKey
 	Quit "DummyKey"
 	
 
Index: APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml
===================================================================
diff -u -r58718 -r63827
--- APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml	(.../LoginParametersNaarSessieConverter.cls.xml)	(revision 58718)
+++ APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml	(.../LoginParametersNaarSessieConverter.cls.xml)	(revision 63827)
@@ -68,12 +68,30 @@
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[
-	Set ..WebshopSessie = ##class(APPS.EC.impl.HaefeleNLWebshopSessie).%New(..LoginParameters.GebruikerID)
+	Set ..WebshopSessie = ##class(APPS.EC.impl.HaefeleDEWebshopSessie).%New(..LoginParameters.GebruikerID)
 	Do ..BewaarKlant(HaefeleDEPersonality,..GeefKlantData())
 	Do ..WebshopSessie.ZetKlant(..LoginParameters.KlantID,..LoginParameters.KlantNaam)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..WebshopSessie = ##class(APPS.EC.impl.HaefeleSEWebshopSessie).%New(..LoginParameters.GebruikerID)
+	Do ..BewaarKlant(HaefeleSEPersonality,..GeefKlantData())
+	Do ..WebshopSessie.ZetKlant(..LoginParameters.KlantID,..LoginParameters.KlantNaam)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..WebshopSessie = ##class(APPS.EC.impl.HaefeleFIWebshopSessie).%New(..LoginParameters.GebruikerID)
+	Do ..BewaarKlant(HaefeleFIPersonality,..GeefKlantData())
+	Do ..WebshopSessie.ZetKlant(..LoginParameters.KlantID,..LoginParameters.KlantNaam)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r58718 -r63827
--- vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 58718)
+++ vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 63827)
@@ -45,12 +45,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFI",HaefeleFIPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHein",HeinPersonality)
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r62086 -r63827
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 62086)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 63827)
@@ -105,12 +105,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleFI",HaefeleFIPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleSE",HaefeleSEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHahleOy",HahleOyPersonality)
Index: DOM/common/HaefeleSEPersonality.cls.xml
===================================================================
diff -u
--- DOM/common/HaefeleSEPersonality.cls.xml	(revision 0)
+++ DOM/common/HaefeleSEPersonality.cls.xml	(revision 63827)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.common.HaefeleSEPersonality">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.common.impl.HandelPersonality</Super>
+
+<Method name="Instance">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.impl.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(##class(DOM.common.enu.Personality).HaefeleSE())
+]]></Implementation>
+</Method>
+
+<Method name="Accept">
+<FormalSpec>Visitor:DOM.common.PersonalityVisitor</FormalSpec>
+<Implementation><![CDATA[	Do Visitor.VerwerkHaefeleSE($this)
+]]></Implementation>
+</Method>
+
+<Method name="GeefTaal">
+<ReturnType>DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.enu.Taal).Zweeds()
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverancierData">
+<ReturnType>DOM.common.LeverancierPersonalityData</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.common.LeverancierPersonalityData).%New(##class(DOM.common.enu.Personality).VanHoecke(),##class(DOM.VKP.enu.Klant).HaefeleDuitsland())
+]]></Implementation>
+</Method>
+
+<Method name="IsHandel">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="GeefNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "Häfele SE"
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrefix">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "hfleSE_"
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r61243 -r63827
--- vhTest/Fake/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 61243)
+++ vhTest/Fake/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 63827)
@@ -67,6 +67,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r59319 -r63827
--- DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 59319)
+++ DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 63827)
@@ -77,6 +77,24 @@
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..ToegelatenLadetypes = ##class(%ListOfDataTypes).%New()
+	
+	Do ..ToegelatenLadetypes.Insert("TAX")
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..ToegelatenLadetypes = ##class(%ListOfDataTypes).%New()
+	
+	Do ..ToegelatenLadetypes.Insert("TAX")
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml
===================================================================
diff -u -r59329 -r63827
--- APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 59329)
+++ APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 63827)
@@ -107,13 +107,27 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleFinland">
+<Type>%String</Type>
+<InitialExpression>"HFLFI"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleNederland">
 <Type>%String</Type>
 <InitialExpression>"HFLE"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleZweden">
+<Type>%String</Type>
+<InitialExpression>"HFLSE"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HahleOy">
 <Type>%String</Type>
 <InitialExpression>"HAHL"</InitialExpression>
Index: APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r58718 -r63827
--- APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 58718)
+++ APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 63827)
@@ -67,6 +67,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..ToonExceptie(HaefeleSEPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..ToonExceptie(HaefeleFIPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..ToonExceptie(KischPersonality)
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r61463 -r63827
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 61463)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 63827)
@@ -21,6 +21,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHahleOy">
 <FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r59327 -r63827
--- vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 59327)
+++ vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 63827)
@@ -19,12 +19,23 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
-<Method name="VerwerkHahleOy">
-<FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
+<Method name="VerwerkHaefeleFI">
+<FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
 <Implementation><![CDATA[
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHahleOy">
+<FormalSpec>HahleOyPersonality:DOM.common.HahleOyPersonality</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleDE">
 <FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml
===================================================================
diff -u -r63391 -r63827
--- BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 63391)
+++ BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 63827)
@@ -22,8 +22,12 @@
 		Do ..VerwerkHaefeleBE()
 	} ElseIf HoofdingType = "HAEFELEDE" {
 		Do ..VerwerkHaefeleDE()
+	} ElseIf HoofdingType = "HAEFELEFI" {
+		Do ..VerwerkHaefeleFI()
 	} ElseIf HoofdingType = "HAEFELENL" {
 		Do ..VerwerkHaefeleNL()
+	} ElseIf HoofdingType = "HAEFELESE" {
+		Do ..VerwerkHaefeleSE()
 	} ElseIf HoofdingType = "HALUX" {
 		Do ..VerwerkHalux()
 	} ElseIf HoofdingType = "HEIN" {
@@ -73,12 +77,24 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFI">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <Abstract>1</Abstract>
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleSE">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHalux">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml
===================================================================
diff -u -r62990 -r63827
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 62990)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 63827)
@@ -188,11 +188,13 @@
 	Set ..OfferteDto.VHKlantTotaalPrijs = ..GeefPrijsObject(..TotaalEnPrijsBerekendResultaat.GeefVHKlantTotaalPrijs(), ..TotaalEnPrijsBerekendResultaat.GeefMuntVoorAankoopPrijs())
 	Set ..OfferteDto.TotaalAantalProducten = ..TotaalEnPrijsBerekendResultaat.GeefTotaalAantalProducten()
 	If (..IsVersie002Compliant()){
-		If ##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID(),Personality.HaefeleBE,Personality.HaefeleDE,Personality.HaefeleNL) {
+		If ##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID(),Personality.HaefeleBE,Personality.HaefeleDE,Personality.HaefeleNL,Personality.HaefeleSE,Personality.HaefeleFI) {
 			If ##class(TECH.Config.ConfigMgr).Instance().GeefBoolean("HaefeleLeveradresInHTTPPost", $$$False){
 				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleBE) ..OfferteDto.Vestiging = "HBE"
-				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleDE) ..OfferteDto.Vestiging = "HDE"
 				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleNL) ..OfferteDto.Vestiging = "HNL"
+				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleDE) ..OfferteDto.Vestiging = "HDE"
+				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleSE) ..OfferteDto.Vestiging = "HDE" ; SE = salesoffice of subsidiary DE
+				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleFI) ..OfferteDto.Vestiging = "HDE" ; FI = salesoffice of subsidiary DE
 				
 				Set Leveradres = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.Leveradres).%New()
 				#dim OfferteLeveradres as DOM.VKP.LeverAdres = Offerte.GeefLeverAdres()
@@ -364,7 +366,7 @@
 <Implementation><![CDATA[
 	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
 	#dim IsVersie002Compliant As %Boolean = $$$False
-	If (##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID() , Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE, Personality.Daro,Personality.Galimberti, Personality.Dupont, Personality.Kisch )) {
+	If (##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID() , Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE,Personality.HaefeleSE,Personality.HaefeleFI, Personality.Daro,Personality.Galimberti, Personality.Dupont, Personality.Kisch )) {
 		Set IsVersie002Compliant = $$$True
 	}
 	Quit IsVersie002Compliant
Index: BL/Flow/Proxy/pxLevering.cls.xml
===================================================================
diff -u -r63395 -r63827
--- BL/Flow/Proxy/pxLevering.cls.xml	(.../pxLevering.cls.xml)	(revision 63395)
+++ BL/Flow/Proxy/pxLevering.cls.xml	(.../pxLevering.cls.xml)	(revision 63827)
@@ -333,10 +333,11 @@
 	#dim AfzenderHoofdingDto As BL.Flow.Proxy.dto.AfzenderHoofdingDto = LeverbonHoofdingBepaler.BepaalLeverbonHoofding(##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(..GeefPersonalityId(Bon)), KLNr)
 	
 	#dim HeeftEigenHoofding As %Boolean = $$$False
+
+	Set HeeftEigenHoofding = ##class(TECH.StringUtils).Equals(AfzenderHoofdingDto.HeaderType, HoofdingType.HaefeleSE,HoofdingType.HaefeleFI,HoofdingType.HaefeleNL,HoofdingType.HaefeleDE,HoofdingType.Noteborn,HoofdingType.SFS,HoofdingType.VanRaemdonck, HoofdingType.CampeTonny)
+	
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefHeinNaarEindklant()) {
-		Set HeeftEigenHoofding = ##class(TECH.StringUtils).Equals(AfzenderHoofdingDto.HeaderType, HoofdingType.HaefeleNL,HoofdingType.HaefeleDE,HoofdingType.Noteborn,HoofdingType.SFS,HoofdingType.VanRaemdonck, HoofdingType.Hein, HoofdingType.CampeTonny)
-	} Else {
-		Set HeeftEigenHoofding = ##class(TECH.StringUtils).Equals(AfzenderHoofdingDto.HeaderType, HoofdingType.HaefeleNL,HoofdingType.HaefeleDE,HoofdingType.Noteborn,HoofdingType.SFS,HoofdingType.VanRaemdonck, HoofdingType.CampeTonny)
+		Set HeeftEigenHoofding =  HeeftEigenHoofding || (AfzenderHoofdingDto.HeaderType = HoofdingType.Hein)
 	}
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefDuPontNaarEindklant()){
 		Set HeeftEigenHoofding = HeeftEigenHoofding || (AfzenderHoofdingDto.HeaderType = HoofdingType.Dupont)
Index: vhDeploy/Deploy20210217xHaefeleSEenFIUrlsVhisie4.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20210217xHaefeleSEenFIUrlsVhisie4.cls.xml	(revision 0)
+++ vhDeploy/Deploy20210217xHaefeleSEenFIUrlsVhisie4.cls.xml	(revision 63827)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20210217xHaefeleSEenFIUrlsVhisie4">
+<Super>vhDeploy.Deploy</Super>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	If ($$$Server = "CACHE01") {
+		Do ..ZetSleutel("HaefeleSE", "https://hafelese.drawerconfigurator.com")
+		Do ..ZetSleutel("HaefeleFI", "https://hafelefi.drawerconfigurator.com")
+	} Else {
+		Do ..ZetSleutel("HaefeleSE", "http://hafelese.website.testing.vanhoecke.be")
+		Do ..ZetSleutel("HaefeleFI", "http://hafelefi.website.testing.vanhoecke.be")
+	}
+	
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetString("Personality_WebshopVersie_HaefeleSE", "V4")
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetString("Personality_WebshopVersie_HaefeleFI", "V4")
+]]></Implementation>
+</Method>
+
+<Method name="ZetSleutel">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Personality:%String,Url:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Do ##class(TECH.Config.ConfigMgr).Instance().SetString("APPS.EC.impl.Webshop.UrlBepaler_V4_"_Personality, Url)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: cspBasis/TBX/enu/Verwerker/Verwerker.cls.xml
===================================================================
diff -u -r58718 -r63827
--- cspBasis/TBX/enu/Verwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58718)
+++ cspBasis/TBX/enu/Verwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 63827)
@@ -20,8 +20,12 @@
 		Do ..VerwerkHaefeleBelgie()
 	} ElseIf Verwerker = "HFLD" {
 		Do ..VerwerkHaefeleDuitsland()
+	} ElseIf Verwerker = "HFLFI" {
+		Do ..VerwerkHaefeleFinland()
 	} ElseIf Verwerker = "HFLE" {
 		Do ..VerwerkHaefeleNederland()
+	} ElseIf Verwerker = "HFLSE" {
+		Do ..VerwerkHaefeleZweden()
 	} ElseIf Verwerker = "HEIN" {
 		Do ..VerwerkHein()
 	} ElseIf Verwerker = "KISCH" {
@@ -67,12 +71,24 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFinland">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNederland">
 <Abstract>1</Abstract>
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleZweden">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHein">
 <Abstract>1</Abstract>
 <Private>1</Private>