Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/Offerte002.cls.xml
===================================================================
diff -u -r61568 -r61645
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/Offerte002.cls.xml	(.../Offerte002.cls.xml)	(revision 61568)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/Offerte002.cls.xml	(.../Offerte002.cls.xml)	(revision 61645)
@@ -81,6 +81,11 @@
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
+<Property name="Vestiging">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="SUBSIDIARY"/>
+</Property>
+
 <Property name="Lijnen">
 <Type>APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteLijn002</Type>
 <Collection>list</Collection>
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Test.cls.xml
===================================================================
diff -u -r61568 -r61645
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Test.cls.xml	(.../Test.cls.xml)	(revision 61568)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Test.cls.xml	(.../Test.cls.xml)	(revision 61645)
@@ -15,6 +15,7 @@
 <Implementation><![CDATA[
 	Do ##super(aTestName)
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID("")
+	Do ##class(TECH.Config.ConfigMgr).Instance().WisSleutel("HaefeleLeveradresInHTTPPost",..#Applicatie)
 ]]></Implementation>
 </Method>
 
@@ -32,6 +33,9 @@
 	#dim KlantCode As %String = "KlantCode"
 	#dim EdiNummer As %String = "EdiNummer"
 
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("HaefeleLeveradresInHTTPPost",$$$True,..#Applicatie)
+
+
 	#dim LeverancierPersonality As DOM.common.Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(KlantPersonalityId)
 	
@@ -52,6 +56,7 @@
 	Do OfferteStub.IndienMethodCall("GeefBestelOpmerking").DanReturn(BestelOpmerking)
 	Do OfferteStub.IndienMethodCall("GeefBestelDatum").DanReturn(BestelDatum)
 	Do OfferteStub.IndienMethodCall("IsVhisie4").DanReturn($$$False)
+	Do OfferteStub.IndienMethodCall("GeefLeverAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Nederlands())
 
 	#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ##class(DOM.EC.Winkelkar.Winkelkar).%New($$$DummyInteger)
 	Do Winkelkar.ZetPersonalityID(KlantPersonalityId)
@@ -230,6 +235,8 @@
 	#dim KlantCode As %String = "KlantCode"
 	#dim EdiNummer As %String = "EdiNummer"
 
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("HaefeleLeveradresInHTTPPost",$$$True,..#Applicatie)
+
 	#dim LeverancierPersonality As DOM.common.Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(KlantPersonalityId)
 	
@@ -250,7 +257,9 @@
 	Do OfferteStub.IndienMethodCall("GeefBestelOpmerking").DanReturn(BestelOpmerking)
 	Do OfferteStub.IndienMethodCall("GeefBestelDatum").DanReturn(BestelDatum)
 	Do OfferteStub.IndienMethodCall("IsVhisie4").DanReturn($$$False)
+	Do OfferteStub.IndienMethodCall("GeefLeverAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Nederlands())
 
+
 	#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ##class(DOM.EC.Winkelkar.Winkelkar).%New($$$DummyInteger)
 	Do Winkelkar.ZetPersonalityID(KlantPersonalityId)
 	
@@ -305,10 +314,11 @@
 	Do $$$AssertEquals(OfferteDto.EindklantTotaalPrijs.Content, 200)
 	Do $$$AssertEquals(OfferteDto.Lijnen.Count(), MaatwerkLijnen.Count())
 	Do $$$AssertEquals(OfferteDto.VHKlantTotaalPrijs.Content, 100)
+	Do $$$AssertEquals(OfferteDto.Vestiging,"HNL")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Haefele BE GeefOfferteDto - MetLeverAdres - Versie002Compliant">
+<Method name="Test: Haefele DE GeefOfferteDto - MetLeverAdres - Versie002Compliant">
 <Implementation><![CDATA[
 	#dim RandomWinkelkarId As %String = "123"
 	#dim KlantPersonalityId As %String = "33" //Haefele DE
@@ -322,7 +332,7 @@
 	#dim KlantCode As %String = "KlantCode"
 	#dim EdiNummer As %String = "EdiNummer"
 
-	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("HaefeleBELeveradresInHTTPPost",$$$True,..#Applicatie)
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("HaefeleLeveradresInHTTPPost",$$$True,..#Applicatie)
 
 	#dim LeverancierPersonality As DOM.common.Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(KlantPersonalityId)
@@ -387,10 +397,13 @@
 	#dim OfferteGenerator As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator).%New(WinkelkarServiceStub, WinkelkarRepositoryStub, UrlBepalerStub, TotaalEnPrijsBerekenaarStub, KlantDataBepalerStub)
 	#dim OfferteDto As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.Offerte002 = OfferteGenerator.GeefOfferteDto(OfferteStub)	
 	
+	Do $$$AssertEquals(OfferteDto.LeverAdres.Naam,"Duits adres")
 	Do $$$AssertEquals(OfferteDto.LeverAdres.Gemeente,"LAGE")
 	Do $$$AssertEquals(OfferteDto.LeverAdres.Postcode,"32791")
 	Do $$$AssertEquals(OfferteDto.LeverAdres.LandCode,"DE")
 	Do $$$AssertEquals(OfferteDto.LeverAdres.Straat,"DIE STRASSE")
+	
+	Do $$$AssertEquals(OfferteDto.Vestiging,"HDE")
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml
===================================================================
diff -u -r61568 -r61645
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 61568)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 61645)
@@ -159,6 +159,7 @@
 <FormalSpec>Offerte:APPS.VKP.impl.Offerte</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
 	If Offerte.IsVhisie4() {
 		Set ..OfferteDto.EDINummer = Offerte.GeefExterneId()
 	} Else {
@@ -175,11 +176,15 @@
 	Set ..OfferteDto.VHKlantTotaalPrijs = ..GeefPrijsObject(..TotaalEnPrijsBerekendResultaat.GeefVHKlantTotaalPrijs(), ..TotaalEnPrijsBerekendResultaat.GeefMuntVoorAankoopPrijs())
 	Set ..OfferteDto.TotaalAantalProducten = ..TotaalEnPrijsBerekendResultaat.GeefTotaalAantalProducten()
 	If (..IsVersie002Compliant()){
-		If ..Winkelkar.GeefPersonalityID() = ##class(DOM.common.enu.Personality).HaefeleDE() {
-			If ##class(TECH.Config.ConfigMgr).Instance().GeefBoolean("HaefeleBELeveradresInHTTPPost", $$$False){
+		If ##class(TECH.StringUtils).Equals(..Winkelkar.GeefPersonalityID(),Personality.HaefeleBE,Personality.HaefeleDE,Personality.HaefeleNL) {
+			If ##class(TECH.Config.ConfigMgr).Instance().GeefBoolean("HaefeleLeveradresInHTTPPost", $$$False){
+				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleBE) ..OfferteDto.Vestiging = "HBE"
+				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleDE) ..OfferteDto.Vestiging = "HDE"
+				Set:(..Winkelkar.GeefPersonality().GeefID()=Personality.HaefeleNL) ..OfferteDto.Vestiging = "HNL"
+				
 				Set Leveradres = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.Leveradres).%New()
 				#dim OfferteLeveradres as DOM.VKP.LeverAdres = Offerte.GeefLeverAdres()
-				
+				Set Leveradres.Naam = OfferteLeveradres.GeefNaam()
 				Set Leveradres.Gemeente = OfferteLeveradres.GeefGemeente()
 				Set Leveradres.LandCode = OfferteLeveradres.GeefLand().GeefCode()
 				Set Leveradres.Postcode = OfferteLeveradres.GeefPostcode()
Index: vhDeploy/D20200722xHttpPostLeverAdressMeesturenHaefele.cls.xml
===================================================================
diff -u
--- vhDeploy/D20200722xHttpPostLeverAdressMeesturenHaefele.cls.xml	(revision 0)
+++ vhDeploy/D20200722xHttpPostLeverAdressMeesturenHaefele.cls.xml	(revision 61645)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.D20200722xHttpPostLeverAdressMeesturenHaefele">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Projectsetting leveradres mee te geven in httppost voor ALLE Haefele MP's</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	#dim ConfigMgr as TECH.Config.ConfigMgr = ##class(TECH.Config.ConfigMgr).Instance()
+	If ConfigMgr.BestaatSleutel("HaefeleBELeveradresInHTTPPost") {
+		Do ConfigMgr.WisSleutel("HaefeleBELeveradresInHTTPPost")
+	}
+	Do ConfigMgr.ZetString("HaefeleLeveradresInHTTPPost", $$$False)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Utils/DOM/VKP/LeverAdres.cls.xml
===================================================================
diff -u -r61242 -r61645
--- vhTest/Utils/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 61242)
+++ vhTest/Utils/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 61645)
@@ -42,6 +42,7 @@
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
 <Implementation><![CDATA[
 	#dim LeverAdres As DOM.VKP.impl.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	Do LeverAdres.ZetNaam("Duits adres")
 	Do LeverAdres.ZetLandNr(1052)
 	Do LeverAdres.ZetPostcode("32791")
 	Do LeverAdres.ZetStraat("DIE STRASSE")
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/Leveradres.cls.xml
===================================================================
diff -u -r61568 -r61645
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/Leveradres.cls.xml	(.../Leveradres.cls.xml)	(revision 61568)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/Leveradres.cls.xml	(.../Leveradres.cls.xml)	(revision 61645)
@@ -3,6 +3,11 @@
 <Class name="APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.Leveradres">
 <Super>%RegisteredObject,%XML.Adaptor</Super>
 
+<Property name="Naam">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="NAME"/>
+</Property>
+
 <Property name="Straat">
 <Type>%String</Type>
 <Parameter name="XMLNAME" value="STREET"/>