Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/Test.cls.xml
===================================================================
diff -u -r53152 -r53267
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/Test.cls.xml	(.../Test.cls.xml)	(revision 53152)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/BestelWinkelkar/Test.cls.xml	(.../Test.cls.xml)	(revision 53267)
@@ -56,10 +56,9 @@
 <Method name="Test: BestelWinkelkar bestelt offerte en zet GekozenVerzendmogelijkheid met de juiste waarden">
 <Implementation><![CDATA[
 	#dim VerwachteHoofding As APPS.EC.dto.Hoofding = ##class(vhTest.Utils.APPS.EC.dto.Hoofding).StandaardHoofding()
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefVhisieEmailadressenNaarAx()) {
-		Set VerwachteHoofding.EmailAdresBesteller = "EmailAdresBesteller@vanhoecke.be"
-		Set VerwachteHoofding.EmailAdresBevestiging = "EmailAdresBevestiging@vanhoecke.be"
-	}
+	Set VerwachteHoofding.EmailAdresBesteller = "EmailAdresBesteller@vanhoecke.be"
+	Set VerwachteHoofding.EmailAdresBevestiging = "EmailAdresBevestiging@vanhoecke.be"
+	
 	#dim KlantPartijId As %String = "KlantPartijId"
 	#dim RandomOfferteId As %String = "RandomOfferteId"
 	
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml
===================================================================
diff -u -r53151 -r53267
--- vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml	(.../Test.cls.xml)	(revision 53151)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml	(.../Test.cls.xml)	(revision 53267)
@@ -29,10 +29,8 @@
 	do $$$AssertEquals(OrderHeader.SalesIdAX,"AXSalesId")
 	do $$$AssertEquals(OrderHeader.class,"entity")
 	do $$$AssertEquals(OrderHeader.MessageId,"MessageId")
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefVhisieEmailadressenNaarAx()) {
-		do $$$AssertEquals(OrderHeader.OrderedByEmail,"EmailAdresBesteller@vanhoecke.be")
-		do $$$AssertEquals(OrderHeader.SalesConfirmEmail,"EmailAdresBevestiging@vanhoecke.be")
-	}
+	do $$$AssertEquals(OrderHeader.OrderedByEmail,"EmailAdresBesteller@vanhoecke.be")
+	do $$$AssertEquals(OrderHeader.SalesConfirmEmail,"EmailAdresBevestiging@vanhoecke.be")
 	
 	Do $$$AssertEquals(OrderHeader.SalesOriginId,"")
 	Do $$$AssertEquals(OrderHeader.RefSalesOriginId,"EDINummer")
Index: vhTestFiles/UnitTests/AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder/Test/TestBelgischLeverAdres/Result.xml
===================================================================
diff -u -r53151 -r53267
--- vhTestFiles/UnitTests/AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder/Test/TestBelgischLeverAdres/Result.xml	(.../Result.xml)	(revision 53151)
+++ vhTestFiles/UnitTests/AXimpl.Dynamics.SalesOrderOut.Converter.OrderHoofdingConverteerder/Test/TestBelgischLeverAdres/Result.xml	(.../Result.xml)	(revision 53267)
@@ -14,7 +14,9 @@
   <LocationId>AXLeveradresId</LocationId>
   <MessageId>MessageId</MessageId>
   <MultiPersonalityLinkContainer>OorsprongKetting</MultiPersonalityLinkContainer>
+  <OrderedByEmail>EmailAdresBesteller@vanhoecke.be</OrderedByEmail>
   <PurchOrderFormNum>OrderReferentie</PurchOrderFormNum>
   <RefSalesOriginId>EDINummer</RefSalesOriginId>
+  <SalesConfirmEmail>EmailAdresBevestiging@vanhoecke.be</SalesConfirmEmail>
   <SalesIdAX>AXSalesId</SalesIdAX>
 </AxdEntity_OrderHeader>
\ No newline at end of file
Index: vhDeploy/D20181004xProjectSettingsxEmailAdresBevestigingEnBestellerVanVhisieNaarAx.cls.xml
===================================================================
diff -u
--- vhDeploy/D20181004xProjectSettingsxEmailAdresBevestigingEnBestellerVanVhisieNaarAx.cls.xml	(revision 0)
+++ vhDeploy/D20181004xProjectSettingsxEmailAdresBevestigingEnBestellerVanVhisieNaarAx.cls.xml	(revision 53267)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.D20181004xProjectSettingsxEmailAdresBevestigingEnBestellerVanVhisieNaarAx">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Projectsettings voor het doorsturen van de via Vhisie4 verkregen emailadressen bij BestelWinkelkar door te sturen naar AX via VHIP504 Order2Ax</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	If (($$$Server = "CACHE01") || ($$$Server = "CACHEACCEPT2010") || ($$$Server = "CACHETEST2010")) {
+		Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("DOM.common.ProjectSettingsAPI_IsActiefVhisieEmailadressenNaarAx", $$$False)
+	} Else {
+		Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("DOM.common.ProjectSettingsAPI_IsActiefVhisieEmailadressenNaarAx", $$$True)
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>