Index: DOM/VKP/enu/Klant/AutoComplete.cls.xml
===================================================================
diff -u -r66070 -r66984
--- DOM/VKP/enu/Klant/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 66070)
+++ DOM/VKP/enu/Klant/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 66984)
@@ -261,6 +261,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleFinland">
+<Type>%String</Type>
+<InitialExpression>"K||36413"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleFrankrijk">
 <Type>%String</Type>
 <InitialExpression>"K||35698"</InitialExpression>
@@ -289,6 +296,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleZweden">
+<Type>%String</Type>
+<InitialExpression>"K||36412"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleZwitserland">
 <Type>%String</Type>
 <InitialExpression>"K||35864"</InitialExpression>
Index: DOM/VKP/enu/Klant.cls.xml
===================================================================
diff -u -r66070 -r66984
--- DOM/VKP/enu/Klant.cls.xml	(.../Klant.cls.xml)	(revision 66070)
+++ DOM/VKP/enu/Klant.cls.xml	(.../Klant.cls.xml)	(revision 66984)
@@ -7,7 +7,7 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864,K||26329</Default>
+<Default>,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864,K||26329,K||36412,K||36413</Default>
 </Parameter>
 
 <Method name="Keller">
@@ -761,6 +761,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleZweden">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.VKP.enu.Klant</ReturnType>
+<Implementation><![CDATA[	Quit ..MaakPartijID(36412)
+]]></Implementation>
+</Method>
+
+<Method name="HaefeleFinland">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.VKP.enu.Klant</ReturnType>
+<Implementation><![CDATA[	Quit ..MaakPartijID(36413)
+]]></Implementation>
+</Method>
+
 <Method name="MaakPartijID">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KlantNummer:%String</FormalSpec>
Index: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml
===================================================================
diff -u -r66122 -r66984
--- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml	(.../LeverbonHoofdingBepaler.cls.xml)	(revision 66122)
+++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml	(.../LeverbonHoofdingBepaler.cls.xml)	(revision 66984)
@@ -88,6 +88,10 @@
 		Do ..VerwerkHaefeleAT(##class(DOM.common.HaefeleATPersonality).Instance()) // De LeverbonHoofding mag voor klant dezelfde zijn als i.g.v. multipersonality.
 	} ElseIf ..IsHaefeleCH(KLNr) {
 		Do ..VerwerkHaefeleCH(##class(DOM.common.HaefeleCHPersonality).Instance()) // De LeverbonHoofding mag voor klant dezelfde zijn als i.g.v. multipersonality.
+	} ElseIf ..IsHaefeleSE(KLNr) {
+		Do ..VerwerkHaefeleSE(##class(DOM.common.HaefeleCHPersonality).Instance()) // De LeverbonHoofding mag voor klant dezelfde zijn als i.g.v. multipersonality.
+	} ElseIf ..IsHaefeleFI(KLNr) {
+		Do ..VerwerkHaefeleFI(##class(DOM.common.HaefeleCHPersonality).Instance()) // De LeverbonHoofding mag voor klant dezelfde zijn als i.g.v. multipersonality.
 	} Else {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("Voor KLNr '"_KLNr_"' is er nog geen eigen LeverbonHoofding voorzien i.g.v. niet-multipersonality. "))
 	}
@@ -182,6 +186,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsHaefeleSE">
+<FormalSpec>KLNr:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (KLNr = 36412)
+]]></Implementation>
+</Method>
+
+<Method name="IsHaefeleFI">
+<FormalSpec>KLNr:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (KLNr = 36413)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/OrderVrijgaveBepaler/BestelOpmerkingValidator.cls.xml
===================================================================
diff -u -r65743 -r66984
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/OrderVrijgaveBepaler/BestelOpmerkingValidator.cls.xml	(.../BestelOpmerkingValidator.cls.xml)	(revision 65743)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/OrderVrijgaveBepaler/BestelOpmerkingValidator.cls.xml	(.../BestelOpmerkingValidator.cls.xml)	(revision 66984)
@@ -30,7 +30,7 @@
 <FormalSpec>KlantId:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..IsKlantHaefeleNL(KlantId) || ..IsKlantHaefeleBE(KlantId) || ..IsKlantHaefeleDE(KlantId) || ..IsKlantHaefeleIT(KlantId) || ..IsKlantHaefeleAT(KlantId) ||..IsKlantHaefeleFR(KlantId) ||..IsKlantHaefeleDK(KlantId)||..IsKlantHaefeleCH(KlantId)
+<Implementation><![CDATA[	Quit ..IsKlantHaefeleNL(KlantId) || ..IsKlantHaefeleBE(KlantId) || ..IsKlantHaefeleDE(KlantId) || ..IsKlantHaefeleIT(KlantId) || ..IsKlantHaefeleAT(KlantId) ||..IsKlantHaefeleFR(KlantId) ||..IsKlantHaefeleDK(KlantId)||..IsKlantHaefeleCH(KlantId)||..IsKlantHaefeleFI(KlantId)||..IsKlantHaefeleSE(KlantId)
 ]]></Implementation>
 </Method>
 
@@ -42,6 +42,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsKlantHaefeleSE">
+<FormalSpec>KlantId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (KlantId = ..Klant.HaefeleZweden)
+]]></Implementation>
+</Method>
+
+<Method name="IsKlantHaefeleFI">
+<FormalSpec>KlantId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (KlantId = ..Klant.HaefeleFinland)
+]]></Implementation>
+</Method>
+
 <Method name="IsKlantHaefeleIT">
 <FormalSpec>KlantId:%String</FormalSpec>
 <Private>1</Private>
Index: APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r65150 -r66984
--- APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 65150)
+++ APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 66984)
@@ -91,11 +91,21 @@
 				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() = Personality.HaefeleDE) || (Winkelkar.GeefPersonalityID() = Personality.HaefeleFI) || (Winkelkar.GeefPersonalityID() = Personality.HaefeleSE){
+			} ElseIf (Winkelkar.GeefPersonalityID() = Personality.HaefeleDE){
 				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() = Personality.HaefeleSE){
+				Set KlantID = ##class(DOM.VKP.enu.Klant).HaefeleZweden()
+				Set Partij = ..PartijApi.GeefPartij(KlantID)
+				Set VerzendWijzeID = ..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() = Personality.HaefeleFI){
+				Set KlantID = ##class(DOM.VKP.enu.Klant).HaefeleFinland()
+				Set Partij = ..PartijApi.GeefPartij(KlantID)
+				Set VerzendWijzeID = ..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() = Personality.HaefeleIT){
 				Set KlantID = ##class(DOM.VKP.enu.Klant).HaefeleItalie()
 				Set Partij = ..PartijApi.GeefPartij(KlantID)
Index: vhDeploy/Deploy20220217xHaefeleSEPersonalityUpdate.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20220217xHaefeleSEPersonalityUpdate.cls.xml	(revision 0)
+++ vhDeploy/Deploy20220217xHaefeleSEPersonalityUpdate.cls.xml	(revision 66984)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20220217xHaefeleSEPersonalityUpdate">
+<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>Update 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).HaefeleZweden(),
+																					$$$True
+																				 )
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/enu/Klant/Verwerker.cls.xml
===================================================================
diff -u -r66070 -r66984
--- DOM/VKP/enu/Klant/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 66070)
+++ DOM/VKP/enu/Klant/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 66984)
@@ -84,6 +84,8 @@
 		Do ..VerwerkHaefeleDenemarken()
 	} ElseIf Klant = "K||32672" {
 		Do ..VerwerkHaefeleDuitsland()
+	} ElseIf Klant = "K||36413" {
+		Do ..VerwerkHaefeleFinland()
 	} ElseIf Klant = "K||35698" {
 		Do ..VerwerkHaefeleFrankrijk()
 	} ElseIf Klant = "K||35412" {
@@ -92,6 +94,8 @@
 		Do ..VerwerkHaefeleNederland()
 	} ElseIf Klant = "K||35415" {
 		Do ..VerwerkHaefeleOostenrijk()
+	} ElseIf Klant = "K||36412" {
+		Do ..VerwerkHaefeleZweden()
 	} ElseIf Klant = "K||35864" {
 		Do ..VerwerkHaefeleZwitserland()
 	} ElseIf Klant = "K||19454" {
@@ -449,6 +453,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleFinland">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleFrankrijk">
 <Abstract>1</Abstract>
 <Private>1</Private>
@@ -473,6 +483,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleZweden">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleZwitserland">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: vhDeploy/Deploy20220221xHaefeleSEenFILogo.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20220221xHaefeleSEenFILogo.cls.xml	(revision 0)
+++ vhDeploy/Deploy20220221xHaefeleSEenFILogo.cls.xml	(revision 66984)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20220221xHaefeleSEenFILogo">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Logo voor Haefele SE en FI</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	;Haefele IT
+	Set ^IPCom("CS","LOGO36412",0) = "Logo Haefele NL 2671.jpg"
+	Set ^IPCom("CS","LOGO36412",0,"LogoOpAlleBeslagEtiketten")=1
+	;Haefele AT
+	Set ^IPCom("CS","LOGO36413",0) = "Logo Haefele NL 2671.jpg"
+	Set ^IPCom("CS","LOGO36413",0,"LogoOpAlleBeslagEtiketten")=1
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhDeploy/Deploy20220217xHaefeleFIPersonalityUpdate.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20220217xHaefeleFIPersonalityUpdate.cls.xml	(revision 0)
+++ vhDeploy/Deploy20220217xHaefeleFIPersonalityUpdate.cls.xml	(revision 66984)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20220217xHaefeleFIPersonalityUpdate">
+<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>Update 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).HaefeleFinland(),
+																					$$$True
+																				 )
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/common/HaefeleFIPersonality.cls.xml
===================================================================
diff -u -r63827 -r66984
--- DOM/common/HaefeleFIPersonality.cls.xml	(.../HaefeleFIPersonality.cls.xml)	(revision 63827)
+++ DOM/common/HaefeleFIPersonality.cls.xml	(.../HaefeleFIPersonality.cls.xml)	(revision 66984)
@@ -26,7 +26,7 @@
 
 <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><![CDATA[	quit ##class(DOM.common.LeverancierPersonalityData).%New(##class(DOM.common.enu.Personality).VanHoecke(),##class(DOM.VKP.enu.Klant).HaefeleFinland())
 ]]></Implementation>
 </Method>
 
Index: DOM/common/HaefeleSEPersonality.cls.xml
===================================================================
diff -u -r63827 -r66984
--- DOM/common/HaefeleSEPersonality.cls.xml	(.../HaefeleSEPersonality.cls.xml)	(revision 63827)
+++ DOM/common/HaefeleSEPersonality.cls.xml	(.../HaefeleSEPersonality.cls.xml)	(revision 66984)
@@ -26,7 +26,7 @@
 
 <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><![CDATA[	quit ##class(DOM.common.LeverancierPersonalityData).%New(##class(DOM.common.enu.Personality).VanHoecke(),##class(DOM.VKP.enu.Klant).HaefeleZweden())
 ]]></Implementation>
 </Method>