Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/MaakWinkelkar/Test.cls.xml
===================================================================
diff -u -r39524 -r40862
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/MaakWinkelkar/Test.cls.xml	(.../Test.cls.xml)	(revision 39524)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/MaakWinkelkar/Test.cls.xml	(.../Test.cls.xml)	(revision 40862)
@@ -3,13 +3,15 @@
 <Class name="vhUnitTest.WSimpl.Vhisie4.Winkelkar.WinkelkarService.MaakWinkelkar.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: Maakwinkelkar met klantid K__1000 maakt winkelkar met klantpartijid K__1000 en personality vanhoecke">
+<Method name="Test: Maakwinkelkar met KlantId K||0 maakt winkelkar met klantpartijid K||0 en personality vanhoecke">
 <Implementation><![CDATA[
+	#dim DummyKlantId As %String = "K||0"
+	
 	Set VerkoopServiceMock =  ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do VerkoopServiceMock.VerwachtMethodCall("MaakOfferte","K||1000",##class(DOM.common.enu.Personality).VanHoecke(), "WinkelkarId").DanDoeNiks()
+	Do VerkoopServiceMock.VerwachtMethodCall("MaakOfferte",DummyKlantId,##class(DOM.common.enu.Personality).VanHoecke(), "WinkelkarId").DanDoeNiks()
 
 	Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
-	Do LegacyPartijAPIMock.VerwachtMethodCall("IsKlantPartijID","K||1000").DanReturn($$$True)
+	Do LegacyPartijAPIMock.VerwachtMethodCall("IsKlantPartijID",DummyKlantId).DanReturn($$$True)
 	
 	Set WinkelkarRepository = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarRepository).%New()
 	Do WinkelkarRepository.IndienMethodCall("BestaatViaID",$$$ElkeWaarde).DanReturn($$$false)
@@ -18,7 +20,7 @@
 	
 	#dim Request As WS.Vhisie4.Winkelkar.MaakWinkelkarRequest = ##class(vhTest.Utils.WS.Vhisie4.Winkelkar.MaakWinkelkarRequest).MaakWinkelkarRequest()
 	set Request.WinkelkarId = "WinkelkarId"
-	set Request.Header.KlantId = "K||1000"
+	set Request.Header.KlantId = DummyKlantId
 	
 	Do MaakWinkelkar.MaakWinkelkar(Request)
 	
@@ -27,14 +29,17 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Maakwinkelkar met klantid 1000 maakt winkelkar met klantpartijid K__1000 en personality vanhoecke">
+<Method name="Test: Maakwinkelkar met KlantId 0 maakt winkelkar met klantpartijid K__0 en personality vanhoecke">
 <Implementation><![CDATA[
+	#dim DummyKlant As %String = "0"
+	#dim DummyKlantId As %String = "K||0"
+
 	Set VerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do VerkoopServiceMock.VerwachtMethodCall("MaakOfferte","K||1000",##class(DOM.common.enu.Personality).VanHoecke(), "WinkelkarId").DanDoeNiks()
+	Do VerkoopServiceMock.VerwachtMethodCall("MaakOfferte",DummyKlantId,##class(DOM.common.enu.Personality).VanHoecke(), "WinkelkarId").DanDoeNiks()
 
 	Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
-	Do LegacyPartijAPIMock.VerwachtMethodCall("IsKlantPartijID","1000").DanReturn($$$False)
-	Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantPartijID","1000").DanReturn("K||1000")
+	Do LegacyPartijAPIMock.VerwachtMethodCall("IsKlantPartijID",DummyKlant).DanReturn($$$False)
+	Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantPartijID",DummyKlant).DanReturn(DummyKlantId)
 
 	Set WinkelkarRepository = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarRepository).%New()
 	Do WinkelkarRepository.IndienMethodCall("BestaatViaID",$$$ElkeWaarde).DanReturn($$$false)
@@ -43,7 +48,7 @@
 	
 	#dim Request As WS.Vhisie4.Winkelkar.MaakWinkelkarRequest = ##class(vhTest.Utils.WS.Vhisie4.Winkelkar.MaakWinkelkarRequest).MaakWinkelkarRequest()
 	set Request.WinkelkarId = "WinkelkarId"
-	Set Request.Header.KlantId = "1000"
+	Set Request.Header.KlantId = DummyKlant
 	
 	Do Service.MaakWinkelkar(Request)
 	
@@ -54,13 +59,14 @@
 
 <Method name="Test: Maakwinkelkar zonder vanhoecke personality maakt winkelkar met personality vanhoecke">
 <Implementation><![CDATA[
-	#dim KlantID As %String = "K||1000"
+	#dim DummyKlant As %String = "0"
+	#dim DummyKlantId As %String = "K||0"
 	
 	Set VerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
-	Do VerkoopServiceMock.VerwachtMethodCall("MaakOfferte","K||1000",##class(DOM.common.enu.Personality).VanHoecke(), "WinkelkarId").DanDoeNiks()
+	Do VerkoopServiceMock.VerwachtMethodCall("MaakOfferte",DummyKlantId,##class(DOM.common.enu.Personality).VanHoecke(), "WinkelkarId").DanDoeNiks()
 
 	Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
-	Do LegacyPartijAPIMock.VerwachtMethodCall("IsKlantPartijID",KlantID).DanReturn($$$True)
+	Do LegacyPartijAPIMock.VerwachtMethodCall("IsKlantPartijID",DummyKlantId).DanReturn($$$True)
 	
 	Set WinkelkarRepository = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarRepository).%New()
 	Do WinkelkarRepository.IndienMethodCall("BestaatViaID",$$$ElkeWaarde).DanReturn($$$false)
@@ -69,7 +75,7 @@
 	
 	#dim Request As WS.Vhisie4.Winkelkar.MaakWinkelkarRequest = ##class(vhTest.Utils.WS.Vhisie4.Winkelkar.MaakWinkelkarRequest).MaakWinkelkarRequest()
 	set Request.WinkelkarId = "WinkelkarId"
-	Set Request.Header.KlantId = KlantID
+	Set Request.Header.KlantId = DummyKlantId
 	Set Request.Header.PersonalityId = ##class(DOM.common.enu.Personality).Destil()
 	
 	Do Service.MaakWinkelkar(Request)
Index: WS/Vhisie4/RequestHeader.cls.xml
===================================================================
diff -u -r40859 -r40862
--- WS/Vhisie4/RequestHeader.cls.xml	(.../RequestHeader.cls.xml)	(revision 40859)
+++ WS/Vhisie4/RequestHeader.cls.xml	(.../RequestHeader.cls.xml)	(revision 40862)
@@ -49,6 +49,14 @@
 <Parameter name="VALUELIST" value=",N,F,E,D"/>
 </Property>
 
+<Method name="KlantIdGet">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (i%KlantId=6819)||(i%KlantId=1000) Set %GeenPrijsInVhisie4=1
+	Quit $S($Get(%GeenPrijsInVhisie4):1736,1:i%KlantId)
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <State>RequestHeaderState</State>