Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml	(.../ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml)	(revision 58528)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml	(.../ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml)	(revision 58718)
@@ -45,6 +45,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDuitsland">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..VerwachteGebruikerID = "hfleDE_1000_"_..GebruikerID
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <Private>1</Private>
 <Implementation><![CDATA[	Set ..VerwachteGebruikerID = "kisch_1000_"_..GebruikerID
Index: DOM/VKP/enu/Klant/AutoComplete.cls.xml
===================================================================
diff -u -r58528 -r58718
--- DOM/VKP/enu/Klant/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 58528)
+++ DOM/VKP/enu/Klant/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 58718)
@@ -212,6 +212,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleDuitsland">
+<Type>%String</Type>
+<InitialExpression>"K||32672"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleNederland">
 <Type>%String</Type>
 <InitialExpression>"K||2671"</InitialExpression>
Index: vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 58528)
+++ vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 58718)
@@ -119,6 +119,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
Index: BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml
===================================================================
diff -u -r57691 -r58718
--- BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 57691)
+++ BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 58718)
@@ -23,6 +23,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleDE">
+<Type>%String</Type>
+<InitialExpression>"HAEFELEDE"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleNL">
 <Type>%String</Type>
 <InitialExpression>"HAEFELENL"</InitialExpression>
Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml	(.../Test.cls.xml)	(revision 58528)
+++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml	(.../Test.cls.xml)	(revision 58718)
@@ -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.Dupont,..Personality.BiemarBois,..Personality.CampeTonny,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop){
+		if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth, ..Personality.Dupont,..Personality.BiemarBois,..Personality.CampeTonny,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE){
 			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.DSGroup,..Personality.DeceuninckDeforce,..Personality.Pierard) {
 			Do $$$AssertFalse(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout")
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 58528)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 58718)
@@ -73,6 +73,7 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).DeBisschop())
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).DeceuninckDeforce())
 	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Pierard())
+	Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleDE())
 	
 	Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein())
 	Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Seefelder())
Index: APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml
===================================================================
diff -u -r51734 -r58718
--- APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml	(.../OfferteKopieerder.cls.xml)	(revision 51734)
+++ APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml	(.../OfferteKopieerder.cls.xml)	(revision 58718)
@@ -60,9 +60,10 @@
 <Private>1</Private>
 <ReturnType>APPS.VKP.Offerte</ReturnType>
 <Implementation><![CDATA[
+	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
 	#dim IsBestelOpmerkingTeKopieren As %Boolean = $$$True
 	
-	If ##class(TECH.StringUtils).Equals(Offerte.GeefPersonalityID(), ##class(DOM.common.enu.Personality).HaefeleBE(), ##class(DOM.common.enu.Personality).HaefeleNL() ) {   ; , ##class(DOM.common.enu.Personality).SFS() 
+	If ##class(TECH.StringUtils).Equals(Offerte.GeefPersonalityID(), Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE ) {   ; , ##class(DOM.common.enu.Personality).SFS() 
 		// Handel Bevestigt ViaWebService, dus de bestelopmerking niet overnemen. 
 		Set IsBestelOpmerkingTeKopieren = $$$False
 	}
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/OrderVrijgaveBepaler/BestelOpmerkingValidator.cls.xml
===================================================================
diff -u -r54911 -r58718
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/OrderVrijgaveBepaler/BestelOpmerkingValidator.cls.xml	(.../BestelOpmerkingValidator.cls.xml)	(revision 54911)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/OrderVrijgaveBepaler/BestelOpmerkingValidator.cls.xml	(.../BestelOpmerkingValidator.cls.xml)	(revision 58718)
@@ -33,10 +33,18 @@
 <FormalSpec>KlantId:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..IsKlantHaefeleNL(KlantId) || ..IsKlantHaefeleBE(KlantId)
+<Implementation><![CDATA[	Quit ..IsKlantHaefeleNL(KlantId) || ..IsKlantHaefeleBE(KlantId) || ..IsKlantHaefeleDE(KlantId)
 ]]></Implementation>
 </Method>
 
+<Method name="IsKlantHaefeleDE">
+<FormalSpec>KlantId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (KlantId = ..Klant.HaefeleDuitsland)
+]]></Implementation>
+</Method>
+
 <Method name="IsKlantHaefeleNL">
 <FormalSpec>KlantId:%String</FormalSpec>
 <Private>1</Private>
Index: WSimpl/Unishop/Login/KortingBewaarder.cls.xml
===================================================================
diff -u -r58528 -r58718
--- WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 58528)
+++ WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 58718)
@@ -96,6 +96,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	// Bewaar geen korting want Haefele geeft weliswaar expliciet cijfer nul mee in DataOpt maar het nachtelijk kortingbestand is het enige dat telt.
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(SFSPersonality)
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt
===================================================================
diff -u -r58528 -r58718
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt	(.../WS.EC.SessionService.txt)	(revision 58528)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt	(.../WS.EC.SessionService.txt)	(revision 58718)
@@ -128,6 +128,7 @@
                     <s:enumeration value="30"/>
                     <s:enumeration value="31"/>
                     <s:enumeration value="32"/>
+                    <s:enumeration value="33"/>
                 </s:restriction>
             </s:simpleType>
             <s:complexType name="WebshopSessieSettings">
Index: BL/Legacy/DCPRINT2.cls.xml
===================================================================
diff -u -r56866 -r58718
--- BL/Legacy/DCPRINT2.cls.xml	(.../DCPRINT2.cls.xml)	(revision 56866)
+++ BL/Legacy/DCPRINT2.cls.xml	(.../DCPRINT2.cls.xml)	(revision 58718)
@@ -168,7 +168,7 @@
 	Set ProjectSettingsAPI = ##class(DOM.common.impl.ProjectSettingsAPI).%New()
 	If PersonalityId=##class(DOM.common.enu.Personality).Noteborn() {
 		Set IsAfdrukOpBlancoPapier = $$$True
-	} ElseIf PersonalityId=##class(DOM.common.enu.Personality).HaefeleNL() {
+	} ElseIf (PersonalityId=##class(DOM.common.enu.Personality).HaefeleNL()) || (PersonalityId=##class(DOM.common.enu.Personality).HaefeleDE()){
 		Set IsAfdrukOpBlancoPapier = $$$True
 	} ElseIf (ProjectSettingsAPI.IsActiefHeinNaarEindklant()) && (PersonalityId=##class(DOM.common.enu.Personality).Hein()) {
 		Set IsAfdrukOpBlancoPapier = $$$True
Index: cspBasis/TBX/enu/Verwerker/Verwerker.cls.xml
===================================================================
diff -u
--- cspBasis/TBX/enu/Verwerker/Verwerker.cls.xml	(revision 0)
+++ cspBasis/TBX/enu/Verwerker/Verwerker.cls.xml	(revision 58718)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="cspBasis.TBX.enu.Verwerker.Verwerker">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie methoden moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+
+<Method name="Verwerk">
+<Final>1</Final>
+<FormalSpec>Verwerker:cspBasis.TBX.enu.Verwerker</FormalSpec>
+<Implementation><![CDATA[
+	If Verwerker = "HELMY" {
+		Do ..VerwerkDestil()
+	} ElseIf Verwerker = "DUPO" {
+		Do ..VerwerkDupont()
+	} ElseIf Verwerker = "HFLB" {
+		Do ..VerwerkHaefeleBelgie()
+	} ElseIf Verwerker = "HFLD" {
+		Do ..VerwerkHaefeleDuitsland()
+	} ElseIf Verwerker = "HFLE" {
+		Do ..VerwerkHaefeleNederland()
+	} ElseIf Verwerker = "HEIN" {
+		Do ..VerwerkHein()
+	} ElseIf Verwerker = "KISCH" {
+		Do ..VerwerkKisch()
+	} ElseIf Verwerker = "MBHO" {
+		Do ..VerwerkMeubelBeslagHolland()
+	} ElseIf Verwerker = "LMC" {
+		Do ..VerwerkOptimaPack()
+	} ElseIf Verwerker = "SFS" {
+		Do ..VerwerkSFS()
+	} ElseIf Verwerker = "VHEPN" {
+		Do ..VerwerkVHEPN()
+	} ElseIf Verwerker = "RAEM" {
+		Do ..VerwerkVanRaemdonck()
+	} Else {
+		Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New(Verwerker,"cspBasis.TBX.enu.Verwerker",$classname())
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDestil">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkDupont">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleBelgie">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleDuitsland">
+<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="VerwerkHein">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkKisch">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkMeubelBeslagHolland">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkOptimaPack">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkSFS">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkVHEPN">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanRaemdonck">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/common/enu/Personality.cls.xml
===================================================================
diff -u -r58528 -r58718
--- DOM/common/enu/Personality.cls.xml	(.../Personality.cls.xml)	(revision 58528)
+++ DOM/common/enu/Personality.cls.xml	(.../Personality.cls.xml)	(revision 58718)
@@ -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</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</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</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</Default>
 </Parameter>
 
 <Method name="VanHoecke">
@@ -242,6 +242,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleDE">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit 33
+]]></Implementation>
+</Method>
+
 <Method name="RandomValue">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ValueToBeIgnored...:TECH.String</FormalSpec>
Index: BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml
===================================================================
diff -u -r40835 -r58718
--- BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml	(.../OnderdelendoosLogoBepaler.cls.xml)	(revision 40835)
+++ BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml	(.../OnderdelendoosLogoBepaler.cls.xml)	(revision 58718)
@@ -10,6 +10,7 @@
 	Quit:(Klant.GeefID()=##class(DOM.VKP.enu.Klant).DuPont()) "logo\Logo Du Pont 1736.jpg"
 	Quit:(Klant.GeefID()=##class(DOM.VKP.enu.Klant).HaefeleNederland()) ""
 	Quit:(Klant.GeefID()=##class(DOM.VKP.enu.Klant).HaefeleBelgie()) ""
+	Quit:(Klant.GeefID()=##class(DOM.VKP.enu.Klant).HaefeleDuitsland()) ""
 	Quit "logo\Logo VHZwart.svg"
 ]]></Implementation>
 </Method>
Index: APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml
===================================================================
diff -u -r55420 -r58718
--- APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml	(.../KlantRapporteurVhisie3.cls.xml)	(revision 55420)
+++ APPS/EC/Rapporteur/impl/KlantRapporteurVhisie3.cls.xml	(.../KlantRapporteurVhisie3.cls.xml)	(revision 58718)
@@ -97,6 +97,10 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/VKP/Korting/impl/KortingService.cls.xml
===================================================================
diff -u -r53486 -r58718
--- APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 53486)
+++ APPS/VKP/Korting/impl/KortingService.cls.xml	(.../KortingService.cls.xml)	(revision 58718)
@@ -124,7 +124,7 @@
 		Set lbVariantenVoorTbx = $LB(##class(DOM.PM.enu.Variant).TandemboxAntaro())
 	}
 	
-	#dim KopieerKortingVanTbxNaarAndereTypes As %Boolean = (PersonalityID = ##class(DOM.common.enu.Personality).HaefeleNL())
+	#dim KopieerKortingVanTbxNaarAndereTypes As %Boolean = ((PersonalityID = ##class(DOM.common.enu.Personality).HaefeleNL())||(PersonalityID = ##class(DOM.common.enu.Personality).HaefeleDE()))
 	If KopieerKortingVanTbxNaarAndereTypes {
 		Set lbVariantenVoorTbx = lbVariantenVoorTbx _ $LB(##class(DOM.PM.enu.Variant).LegraboxPure()) _ $LB(##class(DOM.PM.enu.Variant).Taorbox())
 	}
Index: APPS/common/impl/KlantInstellingenService.cls.xml
===================================================================
diff -u -r57828 -r58718
--- APPS/common/impl/KlantInstellingenService.cls.xml	(.../KlantInstellingenService.cls.xml)	(revision 57828)
+++ APPS/common/impl/KlantInstellingenService.cls.xml	(.../KlantInstellingenService.cls.xml)	(revision 58718)
@@ -41,7 +41,9 @@
 <Method name="GebruiktKlantOrderNummer">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).Equals(KlantID, ##class(DOM.VKP.enu.Klant).SFS(), ##class(DOM.VKP.enu.Klant).HaefeleBelgie(), ##class(DOM.VKP.enu.Klant).HaefeleNederland())
+<Implementation><![CDATA[
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	Quit ##class(TECH.StringUtils).Equals(KlantID, Klant.SFS, Klant.HaefeleBelgie, Klant.HaefeleNederland, Klant.HaefeleDuitsland)
 ]]></Implementation>
 </Method>
 
Index: vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 58528)
+++ vhTest/Fake/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 58718)
@@ -21,6 +21,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkBeslagteknikk">
 <FormalSpec>BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhTest/Fake/APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r56421 -r58718
--- vhTest/Fake/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 56421)
+++ vhTest/Fake/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 58718)
@@ -19,6 +19,78 @@
 <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>
+</Method>
+
+<Method name="VerwerkCampeTonny">
+<FormalSpec>CampeTonnyPersonality:DOM.common.CampeTonnyPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDSGroup">
+<FormalSpec>DSGroupPersonality:DOM.common.DSGroupPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDeBisschop">
+<FormalSpec>DeBisschopPersonality:DOM.common.DeBisschopPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDeceuninckDeforce">
+<FormalSpec>DeceuninckDeforcePersonality:DOM.common.DeceuninckDeforcePersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkFurnifit">
+<FormalSpec>FurnifitPersonality:DOM.common.FurnifitPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkJBarth">
+<FormalSpec>JBarthPersonality:DOM.common.JBarthPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkPierard">
+<FormalSpec>PierardPersonality:DOM.common.PierardPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkRini">
+<FormalSpec>RiniPersonality:DOM.common.RiniPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkYachtSupplier">
+<FormalSpec>YachtSupplierPersonality:DOM.common.YachtSupplierPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkFerexpert">
 <FormalSpec>FerexpertPersonality:DOM.common.FerexpertPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 58528)
+++ vhTest/Fake/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 58718)
@@ -19,6 +19,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkBeslagteknikk">
 <FormalSpec>BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 58528)
+++ APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 58718)
@@ -107,6 +107,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleDuitsland">
+<Type>%String</Type>
+<InitialExpression>"HFLD"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleNederland">
 <Type>%String</Type>
 <InitialExpression>"HFLE"</InitialExpression>
Index: vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 58528)
+++ vhTest/Mock/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 58718)
@@ -99,6 +99,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
Index: APPS/VKP/Korting/impl/KortingFactory.cls.xml
===================================================================
diff -u -r36507 -r58718
--- APPS/VKP/Korting/impl/KortingFactory.cls.xml	(.../KortingFactory.cls.xml)	(revision 36507)
+++ APPS/VKP/Korting/impl/KortingFactory.cls.xml	(.../KortingFactory.cls.xml)	(revision 58718)
@@ -44,6 +44,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<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: vhUnitTest/APPS/VKP/Korting/impl/KortingService/StelInKortingen/Test.cls.xml
===================================================================
diff -u -r53486 -r58718
--- vhUnitTest/APPS/VKP/Korting/impl/KortingService/StelInKortingen/Test.cls.xml	(.../Test.cls.xml)	(revision 53486)
+++ vhUnitTest/APPS/VKP/Korting/impl/KortingService/StelInKortingen/Test.cls.xml	(.../Test.cls.xml)	(revision 58718)
@@ -46,6 +46,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test HaefeleDE">
+<Implementation><![CDATA[
+		#dim PersonalityID As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).HaefeleDE()
+		Set ..Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityID)
+		Set KortingParser = ##class(vhUnitTest.APPS.VKP.Korting.impl.KortingService.StelInKortingen.DummyKortingParser).%New()
+		Set KortingVerwijderaarMock = ##class(vhTest.Mock.APPS.VKP.Korting.impl.KortingVerwijderaar).%New()
+		Do KortingVerwijderaarMock.VerwachtMethodCall("Verwijder",PersonalityID)
+		
+		#dim VerkoopPrijsAPI As vhUnitTest.APPS.VKP.Korting.impl.KortingService.StelInKortingen.VerkoopPrijsAPIMock = ##class(vhUnitTest.APPS.VKP.Korting.impl.KortingService.StelInKortingen.VerkoopPrijsAPIMock).MockInstance()
+		
+		Set KortingService = ##class(APPS.VKP.Korting.impl.KortingService).%New(KortingParser,KortingVerwijderaarMock)
+		Do KortingService.StelInKortingenUitBestand($$$DummyString,PersonalityID)
+		
+		Do ..AssertKortingConfiguratieLijstHaefeleDE(VerkoopPrijsAPI.GeefKortingConfiguratieLijst())
+		
+		Do KortingVerwijderaarMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="AssertKortingConfiguratieLijstHaefeleBE">
 <FormalSpec>KortingConfiguratieLijst:APPS.VKP.dto.KortingConfiguratieLijst</FormalSpec>
 <Implementation><![CDATA[
@@ -86,6 +105,25 @@
 			Do ..AssertKortingConfiguratie(KortingConfiguratieLijstIt.Next(),KlantID,0.101,##class(DOM.PM.enu.Variant).Taorbox())
 			Do ..AssertKortingConfiguratie(KortingConfiguratieLijstIt.Next(),KlantID,0.101,##class(DOM.PM.enu.Variant).TandemboxAntaro())
 		}
+]]></Implementation>
+</Method>
+
+<Method name="AssertKortingConfiguratieLijstHaefeleDE">
+<FormalSpec>KortingConfiguratieLijst:APPS.VKP.dto.KortingConfiguratieLijst</FormalSpec>
+<Implementation><![CDATA[
+		Set KortingConfiguratieLijstIt = ##class(TECH.ListIterator).%New(KortingConfiguratieLijst)
+		
+		While KortingConfiguratieLijstIt.HasNext() {
+			#dim KortingConfiguratie As APPS.VKP.dto.KortingConfiguratie = KortingConfiguratieLijstIt.Next()
+			Quit:(KortingConfiguratie.KlantID = "hfleDE_DE2000001")
+		}
+		
+		If $$$AssertTrue(KortingConfiguratieLijstIt.HasNext()){
+			#dim KlantID As DOM.VKP.VanHoeckeKlantID = ..Personality.GeefPrefix()_"DE2000001"
+			Do ..AssertKortingConfiguratie(KortingConfiguratie,KlantID,0.101,##class(DOM.PM.enu.Variant).LegraboxPure())
+			Do ..AssertKortingConfiguratie(KortingConfiguratieLijstIt.Next(),KlantID,0.101,##class(DOM.PM.enu.Variant).Taorbox())
+			Do ..AssertKortingConfiguratie(KortingConfiguratieLijstIt.Next(),KlantID,0.101,##class(DOM.PM.enu.Variant).TandemboxAntaro())
+		}
 		Do $$$AssertFalse(KortingConfiguratieLijstIt.HasNext())
 ]]></Implementation>
 </Method>
Index: APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml
===================================================================
diff -u -r44518 -r58718
--- APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml	(.../LijnPrijsBepaler.cls.xml)	(revision 44518)
+++ APPS/EC/Winkelkar/impl/LijnPrijsBepaler.cls.xml	(.../LijnPrijsBepaler.cls.xml)	(revision 58718)
@@ -114,6 +114,10 @@
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[	Set ..IsAdviesPrijsToegelaten = $$$True
Index: vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 58528)
+++ vhTest/Mock/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 58718)
@@ -106,6 +106,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
Index: cspBasis/TBX/Lib.mac.rou
===================================================================
diff -u -r58528 -r58718
--- cspBasis/TBX/Lib.mac.rou	(.../Lib.mac.rou)	(revision 58528)
+++ cspBasis/TBX/Lib.mac.rou	(.../Lib.mac.rou)	(revision 58718)
@@ -154,6 +154,7 @@
 	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).DeBisschop() $$$DeBisschopKey
 	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).DeceuninckDeforce() $$$DeceuninckDeforceKey
 	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).Pierard() $$$PierardKey
+	Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleDuitsland() $$$HafeleDEKey
 	Quit "DummyKey"
 	
 
Index: WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 58528)
+++ WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 58718)
@@ -130,6 +130,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkHandelMetVerificatie(##class(WSimpl.Unishop.Login.ParametersHaefeleDE).%New(),HaefeleDEPersonality.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/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 58528)
+++ APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 58718)
@@ -149,6 +149,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Do ..ControleerReedsBesteld()
+	Do ..ControleerToegangEnPrijzen()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoeckeVoorHalux">
 <FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkVanHoecke(VanHoeckVoorHaluxPersonality)
Index: APPS/EC/enu/WebShopVerwerker.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/EC/enu/WebShopVerwerker.cls.xml	(.../WebShopVerwerker.cls.xml)	(revision 58528)
+++ APPS/EC/enu/WebShopVerwerker.cls.xml	(.../WebShopVerwerker.cls.xml)	(revision 58718)
@@ -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</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</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</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</Default>
 </Parameter>
 
 <Method name="VHEPN">
@@ -216,6 +216,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleDuitsland">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.WebShopVerwerker</ReturnType>
+<Implementation><![CDATA[	Quit "HFLD"
+]]></Implementation>
+</Method>
+
 <Method name="RandomValue">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ValueToBeIgnored...:TECH.String</FormalSpec>
Index: APPS/EC/impl/ECommerceAPI.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 58528)
+++ APPS/EC/impl/ECommerceAPI.cls.xml	(.../ECommerceAPI.cls.xml)	(revision 58718)
@@ -134,6 +134,8 @@
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceYachtSupplier).%New()
 	} ElseIf (Personality.GeefID() = ..Personality.YachtSupplier) {
 		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceYachtSupplier).%New()
+	} ElseIf (Personality.GeefID() = ..Personality.HaefeleDE) {
+		Set KlantInstellingenService = ##class(APPS.EC.impl.KlantInstellingenServiceHaefeleDE).%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: vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 58528)
+++ vhTest/Fake/WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 58718)
@@ -17,6 +17,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkBeslagteknikk">
 <FormalSpec>BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml	(.../KlantRapporteurVhisie4.cls.xml)	(revision 58528)
+++ APPS/EC/Rapporteur/impl/KlantRapporteurVhisie4.cls.xml	(.../KlantRapporteurVhisie4.cls.xml)	(revision 58718)
@@ -109,6 +109,10 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: DOM/VKP/enu/Klant.cls.xml
===================================================================
diff -u -r58528 -r58718
--- DOM/VKP/enu/Klant.cls.xml	(.../Klant.cls.xml)	(revision 58528)
+++ DOM/VKP/enu/Klant.cls.xml	(.../Klant.cls.xml)	(revision 58718)
@@ -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</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</Default>
 </Parameter>
 
 <Method name="Keller">
@@ -628,6 +628,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleDuitsland">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.VKP.enu.Klant</ReturnType>
+<Implementation><![CDATA[	Quit ..MaakPartijID(32672)
+]]></Implementation>
+</Method>
+
 <Method name="MaakPartijID">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KlantNummer:%String</FormalSpec>
Index: vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml
===================================================================
diff -u -r58210 -r58718
--- vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml	(.../Test.cls.xml)	(revision 58210)
+++ vhUnitTest/APPS/EC/impl/VerzendWijzeBepaler/GeefVerzendWijze/Test.cls.xml	(.../Test.cls.xml)	(revision 58718)
@@ -83,6 +83,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Winkelkar voor klant van HäfeleDE">
+<Implementation><![CDATA[
+	Do ..Winkelkar.ZetPersonalityID(##class(DOM.common.enu.Personality).HaefeleDE())
+		
+	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)
+	#dim VerzendWijze As APPS.VKP.VerzendWijze = VerzendWijzeBepaler.GeefVerzendWijze(..Winkelkar)
+	
+	Do $$$AssertEquals(VerzendWijze.VerzendWijzeID,"DI1")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Winkelkar voor handelsklant (niet HäfeleNL)">
 <Implementation><![CDATA[
 	Do ..Winkelkar.ZetPersonalityID(##class(DOM.common.enu.Personality).SFS())
Index: DOM/common/PersonalityVisitor.cls.xml
===================================================================
diff -u -r58528 -r58718
--- DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 58528)
+++ DOM/common/PersonalityVisitor.cls.xml	(.../PersonalityVisitor.cls.xml)	(revision 58718)
@@ -29,6 +29,11 @@
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<Abstract>1</Abstract>
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkDestil">
 <Abstract>1</Abstract>
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
Index: APPS/EC/impl/KlantInstellingenServiceHaefeleDE.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/KlantInstellingenServiceHaefeleDE.cls.xml	(revision 0)
+++ APPS/EC/impl/KlantInstellingenServiceHaefeleDE.cls.xml	(revision 58718)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.KlantInstellingenServiceHaefeleDE">
+<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 -r58528 -r58718
--- DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 58528)
+++ DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 58718)
@@ -142,6 +142,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantDataDto = ##class(DOM.common.dto.KlantData).%New()
+	
+	#dim KlantData As DOM.VKP.impl.HaefeleDEKlantData = ..OpenKlantData(..KlantID, HaefeleDEPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, HaefeleDEPersonality.GeefPrefix())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 58528)
+++ vhTest/Mock/WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 58718)
@@ -105,6 +105,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
Index: APPS/VKP/Korting/impl/EDIVerwerker.cls.xml
===================================================================
diff -u -r36066 -r58718
--- APPS/VKP/Korting/impl/EDIVerwerker.cls.xml	(.../EDIVerwerker.cls.xml)	(revision 36066)
+++ APPS/VKP/Korting/impl/EDIVerwerker.cls.xml	(.../EDIVerwerker.cls.xml)	(revision 58718)
@@ -13,6 +13,11 @@
 <Default>nlHAFELE</Default>
 </Parameter>
 
+<Parameter name="DomeinCodeHaefeleDE">
+<Type>%String</Type>
+<Default>deHAFELE</Default>
+</Parameter>
+
 <Property name="KortingFactory">
 <Type>APPS.VKP.Korting.KortingFactory</Type>
 <Private>1</Private>
@@ -61,6 +66,8 @@
 		Set Personality = ##class(DOM.common.enu.Personality).HaefeleBE()
 	}ElseIf KlantNaam = ..#DomeinCodeHaefeleNL {
 		Set Personality = ##class(DOM.common.enu.Personality).HaefeleNL()
+	}ElseIf KlantNaam = ..#DomeinCodeHaefeleDE {
+		Set Personality = ##class(DOM.common.enu.Personality).HaefeleDE()
 	}Else{
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Bestand '"_BestandNaam_"' wordt niet ondersteund voor verwerking."))
 	}
Index: APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58528)
+++ APPS/EC/enu/UniShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58718)
@@ -39,6 +39,8 @@
 		Do ..VerwerkGalimberti()
 	} ElseIf UniShopVerwerker = "HFLB" {
 		Do ..VerwerkHaefeleBelgie()
+	} ElseIf UniShopVerwerker = "HFLD" {
+		Do ..VerwerkHaefeleDuitsland()
 	} ElseIf UniShopVerwerker = "HFLE" {
 		Do ..VerwerkHaefeleNederland()
 	} ElseIf UniShopVerwerker = "HEIN" {
@@ -150,6 +152,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDuitsland">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNederland">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: vhTest/Mock/BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml
===================================================================
diff -u -r40835 -r58718
--- vhTest/Mock/BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml	(.../OnderdelendoosLogoBepaler.cls.xml)	(revision 40835)
+++ vhTest/Mock/BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml	(.../OnderdelendoosLogoBepaler.cls.xml)	(revision 58718)
@@ -3,8 +3,7 @@
 <Class name="vhTest.Mock.BL.PPS.common.impl.OnderdelendoosLogoBepaler">
 <Description>
 Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
-Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
-Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>BL.PPS.common.impl.OnderdelendoosLogoBepaler,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml
===================================================================
diff -u -r58530 -r58718
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 58530)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsFactorBepalerFactory.cls.xml	(.../PrijsFactorBepalerFactory.cls.xml)	(revision 58718)
@@ -52,6 +52,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..StelInGeenPrijsFactorBepaler()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInGeenPrijsFactorBepaler()
Index: APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml	(.../PersonalityEnVerwerkerLinker.cls.xml)	(revision 58528)
+++ APPS/EC/impl/WebshopSessionService/impl/PersonalityEnVerwerkerLinker.cls.xml	(.../PersonalityEnVerwerkerLinker.cls.xml)	(revision 58718)
@@ -42,6 +42,8 @@
 		Set PersonalityID = ##class(DOM.common.enu.Personality).HaefeleBE()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleNederland() {
 		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).Destil() {
 		Set PersonalityID = ##class(DOM.common.enu.Personality).Destil()
 	} ElseIf DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).BiemarBois() {
@@ -112,6 +114,8 @@
 		Set Verwerker =  ##class(APPS.EC.enu.WebShopVerwerker).HaefeleBelgie()
 	} ElseIf PersonalityID = ##class(DOM.common.enu.Personality).HaefeleNL() {
 		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).Destil() {
 		Set Verwerker =  ##class(APPS.EC.enu.WebShopVerwerker).Destil()
 	} ElseIf PersonalityID = ##class(DOM.common.enu.Personality).BiemarBois() {
Index: DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml
===================================================================
diff -u -r57019 -r58718
--- DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 57019)
+++ DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 58718)
@@ -438,7 +438,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim Resultaat As %Boolean = $$$False
-	If ..GeefKlantID() = ##class(DOM.VKP.enu.Klant).HaefeleNederland() {
+	If (..GeefKlantID() = ##class(DOM.VKP.enu.Klant).HaefeleNederland()) || (..GeefKlantID() = ##class(DOM.VKP.enu.Klant).HaefeleDuitsland()) {
 		Set Resultaat = $$$True
 	}
 	If ((..GeefKlantID() = ##class(DOM.VKP.enu.Klant).DuPont()) && ($Piece(..NodeAdres,"\",29)="")) {
Index: DOM/VKP/impl/HaefeleDEKlantData.cls.xml
===================================================================
diff -u
--- DOM/VKP/impl/HaefeleDEKlantData.cls.xml	(revision 0)
+++ DOM/VKP/impl/HaefeleDEKlantData.cls.xml	(revision 58718)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.VKP.impl.HaefeleDEKlantData">
+<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: APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58528)
+++ APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58718)
@@ -40,6 +40,8 @@
 		Do ..VerwerkGalimberti()
 	} ElseIf WebShopVerwerker = "HFLB" {
 		Do ..VerwerkHaefeleBelgie()
+	} ElseIf WebShopVerwerker = "HFLD" {
+		Do ..VerwerkHaefeleDuitsland()
 	} ElseIf WebShopVerwerker = "HFLE" {
 		Do ..VerwerkHaefeleNederland()
 	} ElseIf WebShopVerwerker = "HEIN" {
@@ -161,6 +163,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDuitsland">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNederland">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: BL/Flow/Levering/Label.cls.xml
===================================================================
diff -u -r56678 -r58718
--- BL/Flow/Levering/Label.cls.xml	(.../Label.cls.xml)	(revision 56678)
+++ BL/Flow/Levering/Label.cls.xml	(.../Label.cls.xml)	(revision 58718)
@@ -164,7 +164,7 @@
     
     If (KlantID = ##class(DOM.VKP.enu.Klant).OptimaPack()){
 	    Set ..pxLabelKlant.Logo = ""
-    } ElseIf (KlantID = ##class(DOM.VKP.enu.Klant).HaefeleNederland()) || (KlantID = ##class(DOM.VKP.enu.Klant).HaefeleBelgie()) {
+    } ElseIf (KlantID = ##class(DOM.VKP.enu.Klant).HaefeleNederland()) || (KlantID = ##class(DOM.VKP.enu.Klant).HaefeleBelgie())|| (KlantID = ##class(DOM.VKP.enu.Klant).HaefeleDuitsland())  {
 	    Set ..pxLabelKlant.Logo="logo\"_^IPCom("CS","LOGO"_KLNr,0)
     } ElseIf (KlantID = ##class(DOM.VKP.enu.Klant).DuPont()) {
 	    Set ..pxLabelKlant.Logo="logo\"_^IPCom("CS","LOGO"_KLNr,0)
Index: vhDeploy/Deploy20191028xHaefeleDEUrlsVhisie4.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20191028xHaefeleDEUrlsVhisie4.cls.xml	(revision 0)
+++ vhDeploy/Deploy20191028xHaefeleDEUrlsVhisie4.cls.xml	(revision 58718)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20191028xHaefeleDEUrlsVhisie4">
+<Super>vhDeploy.Deploy</Super>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	If ($$$Server = "CACHE01") {
+		Do ..ZetSleutel("HaefeleDE", "https://hafelede.drawerconfigurator.com")
+	} Else {
+		Do ..ZetSleutel("HaefeleDE", "http://hafelede.website.testing.vanhoecke.be")
+	}
+	
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetString("Personality_WebshopVersie_HaefeleDE", "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: vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 58528)
+++ vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 58718)
@@ -21,6 +21,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkBeslagteknikk">
 <FormalSpec>BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/impl/KlantDataReferentieBepaler.cls.xml
===================================================================
diff -u -r58537 -r58718
--- APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 58537)
+++ APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 58718)
@@ -230,6 +230,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ..GeefKlantIDVoorInfoVanOfferte(..Offerte)			
+	#dim KlantData As DOM.VKP.impl.KlantData = ..DataService.GeefKlantData(HaefeleDEPersonality.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: vhDeploy/Deploy20191028xHaefeleDEPersonalityAanmaken.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20191028xHaefeleDEPersonalityAanmaken.cls.xml	(revision 0)
+++ vhDeploy/Deploy20191028xHaefeleDEPersonalityAanmaken.cls.xml	(revision 58718)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20191028xHaefeleDEPersonalityAanmaken">
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="PersonalityID">
+<Type>%String</Type>
+<Default>33</Default>
+</Parameter>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Aanmaken van Personality voor Haefele DE (ID=33)</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Do ##class(DOM.common.impl.PersonalityCreator).%New().StelInNieuwePersonality(	..#PersonalityID, 
+																					##class(DOM.common.HaefeleDEPersonality).%ClassName($$$True), 
+																					##class(DOM.VKP.enu.Klant).HaefeleDuitsland()																					
+																				 )
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: BL/Legacy/FactuurMailAfzenderBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- BL/Legacy/FactuurMailAfzenderBepaler.cls.xml	(.../FactuurMailAfzenderBepaler.cls.xml)	(revision 58528)
+++ BL/Legacy/FactuurMailAfzenderBepaler.cls.xml	(.../FactuurMailAfzenderBepaler.cls.xml)	(revision 58718)
@@ -97,6 +97,10 @@
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml
===================================================================
diff -u -r41626 -r58718
--- APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml	(.../LoginParametersNaarSessieConverter.cls.xml)	(revision 41626)
+++ APPS/EC/impl/WebshopSessieGenerator/LoginParametersNaarSessieConverter.cls.xml	(.../LoginParametersNaarSessieConverter.cls.xml)	(revision 58718)
@@ -65,6 +65,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..WebshopSessie = ##class(APPS.EC.impl.HaefeleNLWebshopSessie).%New(..LoginParameters.GebruikerID)
+	Do ..BewaarKlant(HaefeleDEPersonality,..GeefKlantData())
+	Do ..WebshopSessie.ZetKlant(..LoginParameters.KlantID,..LoginParameters.KlantNaam)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 58528)
+++ APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 58718)
@@ -96,6 +96,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, HaefeleDEPersonality)
+	
+	Do ..ValideerKlantId(..KlantDataDto.ID, HaefeleDEPersonality)
+	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml
===================================================================
diff -u -r56932 -r58718
--- WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 56932)
+++ WSimpl/EC/Unishop/OrderConfirmation/Service.cls.xml	(.../Service.cls.xml)	(revision 58718)
@@ -170,7 +170,7 @@
 	#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()) && (LeverDatum = HuidigeDatum) {
+	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) {
 		Do VanHoeckeOfferte.ZetLeverDatum(..BepaalLeverDatum(VanHoeckeOfferte.GeefWensLeverDatum(),LeverDatum))
 	} Else {
 		Do VanHoeckeOfferte.ZetLeverDatum(LeverDatum)
Index: cspBasis/TBX/enu/Verwerker.cls.xml
===================================================================
diff -u -r29059 -r58718
--- cspBasis/TBX/enu/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 29059)
+++ cspBasis/TBX/enu/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58718)
@@ -7,11 +7,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;SFS;LMC;MBHO;HFLB;VHEPN;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM</Default>
+<Default>;SFS;LMC;MBHO;HFLB;VHEPN;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;HFLD</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;VHEPN;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck</Default>
+<Default>;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;VHEPN;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;HaefeleDuitsland</Default>
 </Parameter>
 
 <Method name="SFS">
@@ -77,6 +77,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleDuitsland">
+<ClassMethod>1</ClassMethod>
+<ReturnType>cspBasis.TBX.enu.Verwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).HaefeleDuitsland()
+]]></Implementation>
+</Method>
+
 <Method name="VanRaemdonck">
 <ClassMethod>1</ClassMethod>
 <ReturnType>cspBasis.TBX.enu.Verwerker</ReturnType>
Index: DOM/VKP/enu/Klant/Verwerker.cls.xml
===================================================================
diff -u -r58528 -r58718
--- DOM/VKP/enu/Klant/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58528)
+++ DOM/VKP/enu/Klant/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58718)
@@ -70,6 +70,8 @@
 		Do ..VerwerkGroupNivelles()
 	} ElseIf Klant = "K||4875" {
 		Do ..VerwerkHaefeleBelgie()
+	} ElseIf Klant = "K||32672" {
+		Do ..VerwerkHaefeleDuitsland()
 	} ElseIf Klant = "K||2671" {
 		Do ..VerwerkHaefeleNederland()
 	} ElseIf Klant = "K||19454" {
@@ -369,6 +371,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDuitsland">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNederland">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 58528)
+++ vhTest/Mock/WSimpl/Unishop/Login/ParameterBepaler.cls.xml	(.../ParameterBepaler.cls.xml)	(revision 58718)
@@ -106,6 +106,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
Index: CHUI/VKP/OrderIngave/OrderSluiterv01.cls.xml
===================================================================
diff -u -r48028 -r58718
--- CHUI/VKP/OrderIngave/OrderSluiterv01.cls.xml	(.../OrderSluiterv01.cls.xml)	(revision 48028)
+++ CHUI/VKP/OrderIngave/OrderSluiterv01.cls.xml	(.../OrderSluiterv01.cls.xml)	(revision 58718)
@@ -130,8 +130,9 @@
 <Method name="KiesHaalbareLeverdatums">
 <FormalSpec>ORDNr:%String,KLNr:%String,OrderNode1:%String</FormalSpec>
 <Implementation><![CDATA[
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
  	Set KlantID = ..LegacyPartijAPI.GeefKlantPartijID(KLNr)
- 	Set IsKlantMetIntegratieVrijgaveInHandelErp = ( (KlantID = ##class(DOM.VKP.enu.Klant).HaefeleBelgie()) || (KlantID = ##class(DOM.VKP.enu.Klant).HaefeleNederland())) 
+ 	Set IsKlantMetIntegratieVrijgaveInHandelErp = ( (KlantID = Klant.HaefeleBelgie) || (KlantID = Klant.HaefeleNederland)|| (KlantID = Klant.HaefeleDuitsland) ) 
  	If IsKlantMetIntegratieVrijgaveInHandelErp {
 	 	Set Oorsprong = $P(OrderNode1,"\",53)
 	 	If (##class(BL.Flow.Offerte.enu.Oorsprong).UniShop() = Oorsprong) {
Index: BL/FOP/Proxy/enu/HoofdingType.cls.xml
===================================================================
diff -u -r57691 -r58718
--- BL/FOP/Proxy/enu/HoofdingType.cls.xml	(.../HoofdingType.cls.xml)	(revision 57691)
+++ BL/FOP/Proxy/enu/HoofdingType.cls.xml	(.../HoofdingType.cls.xml)	(revision 58718)
@@ -44,6 +44,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HaefeleDE">
+<ClassMethod>1</ClassMethod>
+<ReturnType>BL.FOP.Proxy.enu.HoofdingType</ReturnType>
+<Implementation><![CDATA[	Quit "HAEFELEDE"
+]]></Implementation>
+</Method>
+
 <Method name="Noteborn">
 <ClassMethod>1</ClassMethod>
 <ReturnType>BL.FOP.Proxy.enu.HoofdingType</ReturnType>
Index: vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 58528)
+++ vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 58718)
@@ -37,6 +37,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkPierard">
 <FormalSpec>PierardPersonality:DOM.common.PierardPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml
===================================================================
diff -u -r53222 -r58718
--- vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 53222)
+++ vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 58718)
@@ -49,6 +49,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Helemaal lege ketting, met HafeleDE als FallBackKlantId">
+<Implementation><![CDATA[
+	#dim Ketting As %String = ""
+	
+	Do $$$AssertEquals(..VoerUit(Ketting, ##class(DOM.VKP.enu.Klant).HaefeleDuitsland()).GeefID(), ##class(DOM.common.enu.Personality).HaefeleDE())
+]]></Implementation>
+</Method>
+
 <Method name="Test: Ketting met 1 items (bv Van Hoecke)">
 <Implementation><![CDATA[
 	#dim Ketting As %String = "((1, ""K||7833"", 255025))"
Index: DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml
===================================================================
diff -u -r58528 -r58718
--- DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml	(.../VanHoeckeOfAnderePersonalityVisitor.cls.xml)	(revision 58528)
+++ DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml	(.../VanHoeckeOfAnderePersonalityVisitor.cls.xml)	(revision 58718)
@@ -38,6 +38,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwerkAnderePersonality(HaefeleDEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..VerwerkAnderePersonality(DestilPersonality)
Index: vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 58528)
+++ vhTest/Mock/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 58718)
@@ -106,6 +106,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
Index: APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml
===================================================================
diff -u -r44518 -r58718
--- APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml	(.../OfferteKlantDataBepaler.cls.xml)	(revision 44518)
+++ APPS/VKP/impl/OfferteKlantDataBepaler.cls.xml	(.../OfferteKlantDataBepaler.cls.xml)	(revision 58718)
@@ -53,6 +53,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..StelInDummyKlantData()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkVanRaemdonck">
 <FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInDummyKlantData()
Index: APPS/EC/impl/HaefeleDEWebshopSessie.cls.xml
===================================================================
diff -u
--- APPS/EC/impl/HaefeleDEWebshopSessie.cls.xml	(revision 0)
+++ APPS/EC/impl/HaefeleDEWebshopSessie.cls.xml	(revision 58718)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EC.impl.HaefeleDEWebshopSessie">
+<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).HaefeleDE()
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: cspBasis/TBX/enu/Verwerker/AutoComplete.cls.xml
===================================================================
diff -u
--- cspBasis/TBX/enu/Verwerker/AutoComplete.cls.xml	(revision 0)
+++ cspBasis/TBX/enu/Verwerker/AutoComplete.cls.xml	(revision 58718)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="cspBasis.TBX.enu.Verwerker.AutoComplete">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie Eigenschapn moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<ClassType>serial</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SerialObject</Super>
+
+<Property name="Destil">
+<Type>%String</Type>
+<InitialExpression>"HELMY"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="Dupont">
+<Type>%String</Type>
+<InitialExpression>"DUPO"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="HaefeleBelgie">
+<Type>%String</Type>
+<InitialExpression>"HFLB"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="HaefeleDuitsland">
+<Type>%String</Type>
+<InitialExpression>"HFLD"</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="Hein">
+<Type>%String</Type>
+<InitialExpression>"HEIN"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="Kisch">
+<Type>%String</Type>
+<InitialExpression>"KISCH"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="MeubelBeslagHolland">
+<Type>%String</Type>
+<InitialExpression>"MBHO"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="OptimaPack">
+<Type>%String</Type>
+<InitialExpression>"LMC"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="SFS">
+<Type>%String</Type>
+<InitialExpression>"SFS"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="VHEPN">
+<Type>%String</Type>
+<InitialExpression>"VHEPN"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="VanRaemdonck">
+<Type>%String</Type>
+<InitialExpression>"RAEM"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r44518 -r58718
--- vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 44518)
+++ vhTest/Mock/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 58718)
@@ -39,6 +39,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
Index: PRGACNTs.inc.rou
===================================================================
diff -u -r58528 -r58718
--- PRGACNTs.inc.rou	(.../PRGACNTs.inc.rou)	(revision 58528)
+++ PRGACNTs.inc.rou	(.../PRGACNTs.inc.rou)	(revision 58718)
@@ -128,8 +128,9 @@
 	#define YachtSupplierKey           "J5DY*g,Lf){$Y<PW"
 	#define DSGroupKey     		       "N]bmn~3mRA3eP2S)"
 	#define DeBisschopKey         	   "NF]sTC4zWUU+2u2."
-	#define DeceuninckDeforceKey       	   "P#K]F8z<q7buWL&,"
+	#define DeceuninckDeforceKey       "P#K]F8z<q7buWL&,"
 	#define PierardKey           	   "8}FHe](}gTp?]xsB"
+	#define HafeleDEKey				   "xUvS\g]\h'#{5H\L"
 	
 	; Toegang voor OptimaFIX page : beperkt via controle op IP-adres 
 	;   !!! Te compileren in routines :           
Index: DOM/common/PersonalityUnishopVisitor.cls.xml
===================================================================
diff -u -r44518 -r58718
--- DOM/common/PersonalityUnishopVisitor.cls.xml	(.../PersonalityUnishopVisitor.cls.xml)	(revision 44518)
+++ DOM/common/PersonalityUnishopVisitor.cls.xml	(.../PersonalityUnishopVisitor.cls.xml)	(revision 58718)
@@ -22,6 +22,11 @@
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<Abstract>1</Abstract>
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkDestil">
 <Abstract>1</Abstract>
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
Index: DOM/common/impl/GebruikerAPIimpl.cls.xml
===================================================================
diff -u -r58528 -r58718
--- DOM/common/impl/GebruikerAPIimpl.cls.xml	(.../GebruikerAPIimpl.cls.xml)	(revision 58528)
+++ DOM/common/impl/GebruikerAPIimpl.cls.xml	(.../GebruikerAPIimpl.cls.xml)	(revision 58718)
@@ -114,6 +114,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..StelInDummyGebruiker()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..StelInDummyGebruiker()
Index: vhTest/Mock/DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r53222 -r58718
--- vhTest/Mock/DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 53222)
+++ vhTest/Mock/DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 58718)
@@ -8,6 +8,13 @@
 <Super>DOM.VKP.impl.EindPersonalityBepaler,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefEindPersonality">
 <FormalSpec>OorsprongKettingString:%String,FallBackKlantId:%String=""</FormalSpec>
 <ReturnType>DOM.common.Personality</ReturnType>
Index: APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r44518 -r58718
--- APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 44518)
+++ APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 58718)
@@ -61,6 +61,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..ToonExceptie(HaefeleDEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..ToonExceptie(KischPersonality)
Index: vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 58528)
+++ vhTest/Mock/APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 58718)
@@ -106,6 +106,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
Index: DOM/common/enu/Personality/Verwerker.cls.xml
===================================================================
diff -u -r58528 -r58718
--- DOM/common/enu/Personality/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58528)
+++ DOM/common/enu/Personality/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58718)
@@ -42,6 +42,8 @@
 		Do ..VerwerkGalimberti()
 	} ElseIf Personality = "7" {
 		Do ..VerwerkHaefeleBE()
+	} ElseIf Personality = "33" {
+		Do ..VerwerkHaefeleDE()
 	} ElseIf Personality = "12" {
 		Do ..VerwerkHaefeleNL()
 	} ElseIf Personality = "11" {
@@ -169,6 +171,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: vhTest/Mock/APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r56004 -r58718
--- vhTest/Mock/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 56004)
+++ vhTest/Mock/APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 58718)
@@ -34,12 +34,48 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkBeslagteknikk">
+<FormalSpec>BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkBeslagteknikk",BeslagteknikkPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkBiemarBois">
+<FormalSpec>BiemarBoisPersonality:DOM.common.BiemarBoisPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkBiemarBois",BiemarBoisPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkCampeTonny">
+<FormalSpec>CampeTonnyPersonality:DOM.common.CampeTonnyPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkCampeTonny",CampeTonnyPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDSGroup">
+<FormalSpec>DSGroupPersonality:DOM.common.DSGroupPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkDSGroup",DSGroupPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDaro">
 <FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkDaro",DaroPersonality)
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkDeBisschop">
+<FormalSpec>DeBisschopPersonality:DOM.common.DeBisschopPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkDeBisschop",DeBisschopPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDeceuninckDeforce">
+<FormalSpec>DeceuninckDeforcePersonality:DOM.common.DeceuninckDeforcePersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkDeceuninckDeforce",DeceuninckDeforcePersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkDestil",DestilPersonality)
@@ -58,6 +94,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkFurnifit">
+<FormalSpec>FurnifitPersonality:DOM.common.FurnifitPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkFurnifit",FurnifitPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkGalimberti">
 <FormalSpec>GalimbertiPersonality:DOM.common.GalimbertiPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkGalimberti",GalimbertiPersonality)
@@ -70,6 +112,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
@@ -82,6 +130,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkJBarth">
+<FormalSpec>JBarthPersonality:DOM.common.JBarthPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkJBarth",JBarthPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkKisch",KischPersonality)
@@ -100,6 +154,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkPierard">
+<FormalSpec>PierardPersonality:DOM.common.PierardPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkPierard",PierardPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkRini">
+<FormalSpec>RiniPersonality:DOM.common.RiniPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkRini",RiniPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkSFS">
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkSFS",SFSPersonality)
@@ -130,6 +196,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkYachtSupplier">
+<FormalSpec>YachtSupplierPersonality:DOM.common.YachtSupplierPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkYachtSupplier",YachtSupplierPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkZweygart">
 <FormalSpec>ZweygartPersonality:DOM.common.ZweygartPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkZweygart",ZweygartPersonality)
Index: DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 58528)
+++ DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 58718)
@@ -73,6 +73,10 @@
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+</Method>
+
 <Method name="VerwerkHein">
 <FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: DOM/common/impl/PersonalityService.cls.xml
===================================================================
diff -u -r58529 -r58718
--- DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 58529)
+++ DOM/common/impl/PersonalityService.cls.xml	(.../PersonalityService.cls.xml)	(revision 58718)
@@ -107,6 +107,7 @@
 	Quit:(PersonalityID = Personality.Hein) $$$True
 	Quit:(PersonalityID = Personality.Seefelder) $$$True
 	Quit:(PersonalityID = Personality.HaefeleNL) $$$True
+	Quit:(PersonalityID = Personality.HaefeleDE) $$$True
 	Quit:(PersonalityID = Personality.Zweygart) $$$True
 	Quit:(PersonalityID = Personality.JBarth) $$$True
 	Quit:(PersonalityID = Personality.BiemarBois) $$$True
Index: vhTest/Integratie/TestBase.cls.xml
===================================================================
diff -u -r44518 -r58718
--- vhTest/Integratie/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 44518)
+++ vhTest/Integratie/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 58718)
@@ -46,6 +46,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="UpdateHaefeleDEKlantData">
+<Final>1</Final>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,KlantNaam:%String,Taal:DOM.enu.Taal=##class(DOM.enu.Taal).Duits()</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.HaefeleDEPersonality).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: vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml
===================================================================
diff -u -r56421 -r58718
--- vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 56421)
+++ vhTest/Fake/APPS/EC/impl/WebshopSessieFactory.cls.xml	(.../WebshopSessieFactory.cls.xml)	(revision 58718)
@@ -19,6 +19,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 58528)
+++ APPS/EC/Winkelkar/WinkelkarService/impl/PrijsBerekeningPrijsBepaler.cls.xml	(.../PrijsBerekeningPrijsBepaler.cls.xml)	(revision 58718)
@@ -126,6 +126,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	#dim LeverancierData As DOM.common.LeverancierPersonalityData = HaefeleDEPersonality.GeefLeverancierData()
+	Set ..AankoopPrijs = ..GeefVerkoopPrijs(..PersonalityRepo.GeefViaID(LeverancierData.PersonalityId),LeverancierData.EigenKlantId)
+	Set ..VerkoopPrijs = ..GeefLijstPrijsInclKorting(HaefeleDEPersonality,..Winkelkar.GeefKlantID())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[
Index: vhUnitTest/APPS/VKP/Korting/impl/KortingService/StelInKortingen/DummyKortingParser.cls.xml
===================================================================
diff -u -r53486 -r58718
--- vhUnitTest/APPS/VKP/Korting/impl/KortingService/StelInKortingen/DummyKortingParser.cls.xml	(.../DummyKortingParser.cls.xml)	(revision 53486)
+++ vhUnitTest/APPS/VKP/Korting/impl/KortingService/StelInKortingen/DummyKortingParser.cls.xml	(.../DummyKortingParser.cls.xml)	(revision 58718)
@@ -11,6 +11,7 @@
 	Do CustomerInfo.Customer.Insert(..GeefCustomerBE("BE2000001", 10.1, 30.3, 5.55))
 	Do CustomerInfo.Customer.Insert(..GeefCustomerBE("BE2000002", 10.1, 30.3, 5.55))
 	Do CustomerInfo.Customer.Insert(..GeefCustomerNL("NL2000001", 10.1))
+	Do CustomerInfo.Customer.Insert(..GeefCustomerDE("DE2000001", 10.1))
 	Quit CustomerInfo
 ]]></Implementation>
 </Method>
@@ -40,6 +41,18 @@
 	Quit Customer
 ]]></Implementation>
 </Method>
+
+<Method name="GeefCustomerDE">
+<FormalSpec>ID:%String,TBXKorting:%Numeric</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.VKP.Korting.xml.Customer</ReturnType>
+<Implementation><![CDATA[
+	Set Customer = ##class(APPS.VKP.Korting.xml.Customer).%New()
+	Set Customer.id = ID
+	Do Customer.Reduction.SetAt(TBXKorting,"TBX")
+	Quit Customer
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 58528)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder.cls.xml	(.../BesteldeOfferteMelder.cls.xml)	(revision 58718)
@@ -193,6 +193,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</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: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml	(.../ResultaatBepalerNietOpgegevenGebruiker.cls.xml)	(revision 58528)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml	(.../ResultaatBepalerNietOpgegevenGebruiker.cls.xml)	(revision 58718)
@@ -45,6 +45,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDuitsland">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..VerwachteGebruikerID = "hfleDE_1000_1"
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <Private>1</Private>
 <Implementation><![CDATA[	Set ..VerwachteGebruikerID = "kisch_1000_1"
Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u -r58667 -r58718
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 58667)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 58718)
@@ -371,8 +371,10 @@
 
 <Method name="TestGeefProductLijnen voor KVIK limiteert aantal palletten via EWPAL situatie waar ewpal één terechte pallet teruggeeft en het is die uit EWPAL">
 <Implementation><![CDATA[
+	#dim PalletID as %String = "00422806"
+	Do ##class(Tools.Wlip).%New(207).String("###############################")
 	Do ..MaakBon(1234,"25868")
-	Do ..ZetEWPALOp("00422806")
+	Do ..ZetEWPALOp(PalletID)
 	Do ..VerwijderBestaandeReservaties()
 	Do ..UglyPickingService.StartBon(1234)
 	
@@ -381,11 +383,12 @@
 	Do $$$AssertEquals(ProductLijnen.Lijst.Count(), 1, "Er is 1 productlijn te picken")
 	
 	#Dim ProductLijn As APPS.MAG.UGLYPicking.dto.ProductLijn = ProductLijnen.Lijst.GetAt(1)
-	Do $$$AssertEquals(ProductLijn.PalletID,"00422806","De palletid is juist")
+	Do $$$AssertEquals(ProductLijn.PalletID,PalletID,"De palletid is juist")
 		
 	Do ..UglyPickingService.StopHuidigeBon()
 	Do ..VerwijderBon(1234)
 	Do ..KuisEWPALOp()
+	Do ##class(Tools.Wlip).%New(207).String("###############################")
 ]]></Implementation>
 </Method>
 
@@ -452,6 +455,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="AssertEWMSData">
+<Implementation><![CDATA[
+	Do ##class(EWMS.Locations).BezetLocation($lb("4","9","6","6","6"),"UT000001")
+	Do ##class(EWMS.Locations).BezetLocation($lb("4","9","6","6","6"),"UT000002")
+	Do ##class(EWMS.Locations).BezetLocation($lb("4","9","6","6","6"),"UT000003")
+]]></Implementation>
+</Method>
+
 <Method name="VerwijderBestaandeReservaties">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
Index: APPS/EC/impl/VerzendWijzeBepaler.cls.xml
===================================================================
diff -u -r56635 -r58718
--- APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 56635)
+++ APPS/EC/impl/VerzendWijzeBepaler.cls.xml	(.../VerzendWijzeBepaler.cls.xml)	(revision 58718)
@@ -75,6 +75,10 @@
 				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).HaefeleDE(){
+				Set KlantID = ##class(DOM.VKP.enu.Klant).HaefeleDuitsland()
+				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).Dupont() {
 					If ($$$Not($IsObject(LeverAdres)) || $$$HasLength(LeverAdres.GeefID()) || (Winkelkar.ExterneId = "")) {
 						Set VerzendWijze = ..GeefVerzendWijzeVanKlantID(##class(DOM.VKP.enu.Klant).DuPont())
Index: DOM/common/HaefeleDEPersonality.cls.xml
===================================================================
diff -u
--- DOM/common/HaefeleDEPersonality.cls.xml	(revision 0)
+++ DOM/common/HaefeleDEPersonality.cls.xml	(revision 58718)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.common.HaefeleDEPersonality">
+<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).HaefeleDE())
+]]></Implementation>
+</Method>
+
+<Method name="Accept">
+<FormalSpec>Visitor:DOM.common.PersonalityVisitor</FormalSpec>
+<Implementation><![CDATA[	Do Visitor.VerwerkHaefeleDE($this)
+]]></Implementation>
+</Method>
+
+<Method name="GeefTaal">
+<ReturnType>DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.enu.Taal).Duits()
+]]></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 DE"
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrefix">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit "hfleDE_"
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 58528)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 58718)
@@ -74,6 +74,7 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).DeBisschop())
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).DeceuninckDeforce())
 	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Pierard())
+	Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleDE())
 
 	Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Hein())
 	Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Seefelder())
Index: vhUnitTest/DOM/VKP/impl/DataM/DataMBonAbstract/IsRechtstreeksTeLeveren/Test.cls.xml
===================================================================
diff -u -r57019 -r58718
--- vhUnitTest/DOM/VKP/impl/DataM/DataMBonAbstract/IsRechtstreeksTeLeveren/Test.cls.xml	(.../Test.cls.xml)	(revision 57019)
+++ vhUnitTest/DOM/VKP/impl/DataM/DataMBonAbstract/IsRechtstreeksTeLeveren/Test.cls.xml	(.../Test.cls.xml)	(revision 58718)
@@ -42,6 +42,23 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Hafele Duitsland -&gt; altijd rechtstreeks">
+<Implementation><![CDATA[
+	#dim KlantNummer As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).HaefeleDuitsland())
+	
+	Set $P(^KU1(..#Uitlevering,"F"),"\",1) = KlantNummer
+	
+	Set $P(^KUL(KlantNummer,"F",..#Uitlevering,3),"\",29) = ""
+	
+	Set DataMBonAbstract = ##class(DOM.VKP.impl.DataM.DataMBon).%New(..#Uitlevering)
+	
+	Do $$$AssertTrue(DataMBonAbstract.IsRechtstreeksTeLeveren())
+	
+	K ^KUL(KlantNummer,"F",..#Uitlevering,1)
+	K ^KU1(..#Uitlevering,"F")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Dupont -&gt; rechtstreeks indien geen AxLocationId ingevuld (adhoc)">
 <Implementation><![CDATA[
 	#dim KlantNummer As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).DuPont())
Index: vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 58528)
+++ vhTest/Fake/WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 58718)
@@ -19,6 +19,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkBeslagteknikk">
 <FormalSpec>BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml
===================================================================
diff -u -r44504 -r58718
--- APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml	(.../DomeinVerwerkerBepaler.cls.xml)	(revision 44504)
+++ APPS/EC/impl/DomeinVerwerkerBepaler.cls.xml	(.../DomeinVerwerkerBepaler.cls.xml)	(revision 58718)
@@ -47,6 +47,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleDuitsland()
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkDestil">
 <FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[	Set ..DomeinVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).Destil()
Index: WSimpl/Unishop/Login/ParametersHaefeleDE.cls.xml
===================================================================
diff -u
--- WSimpl/Unishop/Login/ParametersHaefeleDE.cls.xml	(revision 0)
+++ WSimpl/Unishop/Login/ParametersHaefeleDE.cls.xml	(revision 58718)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.Unishop.Login.ParametersHaefeleDE">
+<Super>WSimpl.Unishop.Login.Parameters</Super>
+
+<Property name="KlantNaam">
+<Type>%String</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 58528)
+++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 58718)
@@ -56,6 +56,7 @@
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Noteborn())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Daro())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleNL())
+	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleDE())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).BeslagDesign())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Demo())
 	Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Galimberti())
Index: WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 58528)
+++ WSimpl/Vhisie4/SettingsManager/WebshopVerwerkerBepaler.cls.xml	(.../WebshopVerwerkerBepaler.cls.xml)	(revision 58718)
@@ -47,6 +47,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	Set ..WebshopVerwerker = ##class(APPS.EC.enu.WebShopVerwerker).HaefeleDuitsland()
+]]></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/UniShopVerwerker.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/EC/enu/UniShopVerwerker.cls.xml	(.../UniShopVerwerker.cls.xml)	(revision 58528)
+++ APPS/EC/enu/UniShopVerwerker.cls.xml	(.../UniShopVerwerker.cls.xml)	(revision 58718)
@@ -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</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</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</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</Default>
 </Parameter>
 
 <Method name="SFS">
@@ -195,6 +195,13 @@
 <Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).Pierard()
 ]]></Implementation>
 </Method>
+
+<Method name="HaefeleDuitsland">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.EC.enu.UniShopVerwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).HaefeleDuitsland()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r53222 -r58718
--- DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 53222)
+++ DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 58718)
@@ -32,6 +32,9 @@
 			If (FallBackKlantId = ##class(DOM.VKP.enu.Klant).HaefeleNederland()) {
 				Set Personality = ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).HaefeleNL())
 			}
+			If (FallBackKlantId = ##class(DOM.VKP.enu.Klant).HaefeleDuitsland()) {
+				Set Personality = ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).HaefeleDE())
+			}	
 		}
 	} Else {
 		Try {	
Index: APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 58528)
+++ APPS/EC/enu/UniShopVerwerker/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 58718)
@@ -100,6 +100,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleDuitsland">
+<Type>%String</Type>
+<InitialExpression>"HFLD"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleNederland">
 <Type>%String</Type>
 <InitialExpression>"HFLE"</InitialExpression>
Index: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml	(.../LeverbonHoofdingBepaler.cls.xml)	(revision 58528)
+++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml	(.../LeverbonHoofdingBepaler.cls.xml)	(revision 58718)
@@ -154,6 +154,37 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleDE()
+	
+	Set ..LeverbonHoofding.ColLeftWidth = "40mm"
+    Set ..LeverbonHoofding.ColRightWidth = "73mm"
+    
+	#dim URL As %String = ""
+	
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(HaefeleDEPersonality.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 Nederland BV"
+    Set ..LeverbonHoofding.STRAATNRBUS = "Nagelpoelweg 30"    
+    Set ..LeverbonHoofding.WOONPLAATS = "Apeldoorn"
+    Set ..LeverbonHoofding.POSTCODE = "7333 NZ"
+	Set ..LeverbonHoofding.TELEFOON = "+31 (0)55 - 5384600"	
+	Set ..LeverbonHoofding.EMAIL = "Info@hafele.nl"
+	Set ..LeverbonHoofding.T1 = "BTW: NL008044211B01"
+	Set ..LeverbonHoofding.T2 = "KVK: 08044079"
+	Set ..LeverbonHoofding.T3 = "Rabobank: IBAN NL12RABO0393150151 BIC: RABONL2U"
+	Set ..LeverbonHoofding.T4 = "Deutsche Bank: IBAN NL74DEUT0531622495 BIC: DEUTNL2N"
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml
===================================================================
diff -u -r57691 -r58718
--- BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 57691)
+++ BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 58718)
@@ -16,6 +16,8 @@
 		Do ..VerwerkCustom()
 	} ElseIf HoofdingType = "DUPONT" {
 		Do ..VerwerkDupont()
+	} ElseIf HoofdingType = "HAEFELEDE" {
+		Do ..VerwerkHaefeleDE()
 	} ElseIf HoofdingType = "HAEFELENL" {
 		Do ..VerwerkHaefeleNL()
 	} ElseIf HoofdingType = "HALUX" {
@@ -47,6 +49,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: DOM/common/enu/Personality/AutoComplete.cls.xml
===================================================================
diff -u -r58528 -r58718
--- DOM/common/enu/Personality/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 58528)
+++ DOM/common/enu/Personality/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 58718)
@@ -114,6 +114,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="HaefeleDE">
+<Type>%String</Type>
+<InitialExpression>"33"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="HaefeleNL">
 <Type>%String</Type>
 <InitialExpression>"12"</InitialExpression>
Index: vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 58528)
+++ vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 58718)
@@ -112,6 +112,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleDE",HaefeleDEPersonality)
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkHaefeleNL">
 <FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml
===================================================================
diff -u -r55349 -r58718
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 55349)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 58718)
@@ -270,8 +270,9 @@
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
 	#dim IsVersie002Compliant As %Boolean = $$$False
-	If (##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID() , ##class(DOM.common.enu.Personality).HaefeleBE(), ##class(DOM.common.enu.Personality).HaefeleNL(), ##class(DOM.common.enu.Personality).Daro(),##class(DOM.common.enu.Personality).Galimberti() )) {
+	If (##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID() , Personality.HaefeleBE, Personality.HaefeleNL,Personality.HaefeleDE, Personality.Daro,Personality.Galimberti )) {
 		Set IsVersie002Compliant = $$$True
 	}
 	Quit IsVersie002Compliant
Index: vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 58528)
+++ vhTest/Fake/DOM/VKP/impl/HandelToegelatenLadetypesBepaler.cls.xml	(.../HandelToegelatenLadetypesBepaler.cls.xml)	(revision 58718)
@@ -19,6 +19,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkBeslagteknikk">
 <FormalSpec>BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml
===================================================================
diff -u -r58528 -r58718
--- vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 58528)
+++ vhTest/Fake/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 58718)
@@ -19,6 +19,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkBeslagteknikk">
 <FormalSpec>BeslagteknikkPersonality:DOM.common.BeslagteknikkPersonality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml
===================================================================
diff -u -r58528 -r58718
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 58528)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/MailVerzender/Handel.cls.xml	(.../Handel.cls.xml)	(revision 58718)
@@ -270,6 +270,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleDE">
+<FormalSpec>HaefeleDEPersonality:DOM.common.HaefeleDEPersonality</FormalSpec>
+<Implementation><![CDATA[	Do ..Mail.VoegToeOntvanger("jwi@vanhoecke.be")
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkSeefelder">
 <FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
 <Implementation><![CDATA[	Do ..Mail.VoegToeOntvanger("christian.zierer@seefelder.net")
Index: BL/Flow/Proxy/pxLevering.cls.xml
===================================================================
diff -u -r56676 -r58718
--- BL/Flow/Proxy/pxLevering.cls.xml	(.../pxLevering.cls.xml)	(revision 56676)
+++ BL/Flow/Proxy/pxLevering.cls.xml	(.../pxLevering.cls.xml)	(revision 58718)
@@ -302,6 +302,9 @@
 #define KLRec(%node)   ^KKL(^KK1(KLNr),%node)
 #define VerzendwijzeGLS "DI1" 
 
+	Set HoofdingType = ##class(BL.FOP.Proxy.enu.HoofdingType.AutoComplete).%New()
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+
 	#dim D As %String = "\"
 	Set:(FactSoort="") FactSoort="F"
 	#dim KLNr As %Integer = $P(^KU1(BONNr,"F"),"\",1)
@@ -331,15 +334,12 @@
 	
 	#dim HeeftEigenHoofding As %Boolean = $$$False
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefHeinNaarEindklant()) {
-		Set HeeftEigenHoofding = ((AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleNL()) || 
-								(AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Noteborn()) || 
-								(AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Hein()))
+		Set HeeftEigenHoofding = ##class(TECH.StringUtils).Equals(AfzenderHoofdingDto.HeaderType, HoofdingType.HaefeleNL,HoofdingType.HaefeleDE, HoofdingType.Noteborn,HoofdingType.Hein)
 	} Else {
-		Set HeeftEigenHoofding = ((AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleNL()) || 
-								(AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Noteborn()))
+		Set HeeftEigenHoofding = ##class(TECH.StringUtils).Equals(AfzenderHoofdingDto.HeaderType, HoofdingType.HaefeleNL,HoofdingType.HaefeleDE,HoofdingType.Noteborn)
 	}
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefDuPontNaarEindklant()){
-		Set HeeftEigenHoofding = HeeftEigenHoofding || (AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Dupont())
+		Set HeeftEigenHoofding = HeeftEigenHoofding || (AfzenderHoofdingDto.HeaderType = HoofdingType.Dupont)
 	}
 	
 	#dim IsOrgalux As %Boolean = ..DocIsOrgalux(BONNr)	
@@ -456,7 +456,7 @@
 	Set ..CheckDigitLevNr=$$CalcCDigit6^vhRtn2(BONNr)
 	Set ..BarCodeBONNr=BONNr
 	
-	If AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleNL() {
+	If AfzenderHoofdingDto.HeaderType = HoofdingType.HaefeleNL {
 		Set ..LEVERINGSNR=""
 		Set ..CheckDigitLevNr=""
 	}
@@ -482,7 +482,7 @@
 	Set ..AfzenderHoofding = AfzenderHoofdingDto.AfzenderHoofding
 	Set ..HeaderType = AfzenderHoofdingDto.HeaderType
 	
-	If ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Noteborn() {
+	If ..HeaderType = HoofdingType.Noteborn {
 		Set ..KlantTelefoon = $P(^KUL(KLNr,FactSoort,BONNr,3),"\",13)
 		If ..KlantTelefoon = "" {
 			Set ..KlantTelefoon=$P($$$KLRec(0),"\",13)	
@@ -491,19 +491,19 @@
 		#dim Partij As DOM.PARTIJ.Partij = ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij(KlantID)
 		#dim TaalVV As DOM.enu.Taal = Partij.GeefTaal()
 		Do ..VoegToeVerkoopsvoorwaarden(Oorsprong,TaalVV)
-		Set ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Custom()
-	} ElseIf ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleNL(){
+		Set ..HeaderType = HoofdingType.Custom
+	} ElseIf ..HeaderType = HoofdingType.HaefeleNL{
 		Set ..KlantTelefoon = ""
 		Set ..BTWNR = ""
-		Set ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Custom()
-	} ElseIf ((##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefHeinNaarEindklant()) && (..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Hein())) {
+		Set ..HeaderType = HoofdingType.Custom
+	} ElseIf ((##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefHeinNaarEindklant()) && (..HeaderType = HoofdingType.Hein)) {
 		Set ..KlantTelefoon = ""
 		Set ..BTWNR = ""
-		Set ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Custom()
-	} ElseIf ((##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefDuPontNaarEindklant()) && (..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Dupont())) {
+		Set ..HeaderType = HoofdingType.Custom
+	} ElseIf ((##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefDuPontNaarEindklant()) && (..HeaderType = HoofdingType.Dupont)) {
 		Set ..KlantTelefoon = ""
 		Set ..BTWNR = ""
-		Set ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Custom()
+		Set ..HeaderType = HoofdingType.Custom
 	} Else {
 		Set ..KlantTelefoon=$P($$$KLRec(0),"\",13)
 		Set ..CheckSumBon= "" ;CheckSumBon
@@ -525,7 +525,7 @@
 	Set KLRec5=$$$KLRec(5)
 	For I=3:1:5 Do:($L($P(KLRec5,"\",I))) ..Opmerkingen.Insert($P(KLRec5,"\",I))
 	
-	if ((KlantID = ##class(DOM.VKP.enu.Klant).HaefeleBelgie()) || (KlantID = ##class(DOM.VKP.enu.Klant).HaefeleNederland()) || (KlantID = ##class(DOM.VKP.enu.Klant).IHCHolland()) ) {
+	if ((KlantID = Klant.HaefeleBelgie) || (KlantID = Klant.HaefeleNederland) || (KlantID = Klant.HaefeleDuitsland)|| (KlantID = Klant.IHCHolland) ) {
 		#Dim DragerIDs as %ArrayOfDataTypes
 		Set DragerIDs = ..GeefDragerIDsVanBon(MogelijkeDragersVoorKlant,.DragerLookup)
 		if DragerIDs.Count(){