Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml
===================================================================
diff -u -r48500 -r48508
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml	(.../Helper.cls.xml)	(revision 48500)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml	(.../Helper.cls.xml)	(revision 48508)
@@ -45,19 +45,6 @@
 	}
 ]]></Implementation>
 </Method>
-
-<Method name="GeefVanHoeckeKlantId">
-<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") && (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke())) {
-		//Set KlantId = +KlantId
-		Set KlantId = ##class(AXimpl.AxToAdminUtils).ConvertCustomerID(KlantId)
-	}
-	
-	Quit KlantId
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Fake/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml
===================================================================
diff -u -r48500 -r48508
--- vhTest/Fake/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml	(.../Helper.cls.xml)	(revision 48500)
+++ vhTest/Fake/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml	(.../Helper.cls.xml)	(revision 48508)
@@ -13,13 +13,6 @@
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
-
-<Method name="GeefVanHoeckeKlantId">
-<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ""
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: WS/Vhisie4/Winkelkar/WinkelkarService.cls.xml
===================================================================
diff -u -r48500 -r48508
--- WS/Vhisie4/Winkelkar/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 48500)
+++ WS/Vhisie4/Winkelkar/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 48508)
@@ -101,7 +101,7 @@
 <FormalSpec>MaakWinkelkarRequest:WS.Vhisie4.Winkelkar.MaakWinkelkarRequest</FormalSpec>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set MaakWinkelkarRequest.Header.KlantId = ..KlantIdConverter.Convert(MaakWinkelkarRequest.Header.KlantId, MaakWinkelkarRequest.Header.PersonalityId)
+	Set MaakWinkelkarRequest.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(MaakWinkelkarRequest.Header.KlantId, MaakWinkelkarRequest.Header.PersonalityId)
 	
 	Do ..HeaderValidator.ValidateHeader(MaakWinkelkarRequest.Header)
 	Do ..SessionManager.RegisterSession(MaakWinkelkarRequest.Header)
@@ -126,8 +126,8 @@
 <ReturnType>WS.Vhisie4.Winkelkar.BereidVoorBestellingResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set BereidVoorBestellingRequest.Header.KlantId = ..KlantIdConverter.Convert(BereidVoorBestellingRequest.Header.KlantId, BereidVoorBestellingRequest.Header.PersonalityId)
-	Set BereidVoorBestellingRequest.Winkelkar.KlantId = ..KlantIdConverter.Convert(BereidVoorBestellingRequest.Winkelkar.KlantId, BereidVoorBestellingRequest.Header.PersonalityId)
+	Set BereidVoorBestellingRequest.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(BereidVoorBestellingRequest.Header.KlantId, BereidVoorBestellingRequest.Header.PersonalityId)
+	Set BereidVoorBestellingRequest.Winkelkar.KlantId = ..KlantIdConverter.ConvertToVanHoecke(BereidVoorBestellingRequest.Winkelkar.KlantId, BereidVoorBestellingRequest.Header.PersonalityId)
 	
 	Do ..HeaderValidator.ValidateHeader(BereidVoorBestellingRequest.Header)
 	Do ..SessionManager.RegisterSession(BereidVoorBestellingRequest.Header)
@@ -148,8 +148,8 @@
 <ReturnType>WS.Vhisie4.Winkelkar.BestelWinkelkarResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set BestelWinkelkarRequest.Header.KlantId = ..KlantIdConverter.Convert(BestelWinkelkarRequest.Header.KlantId, BestelWinkelkarRequest.Header.PersonalityId)
-	Set BestelWinkelkarRequest.Winkelkar.KlantId = ..KlantIdConverter.Convert(BestelWinkelkarRequest.Winkelkar.KlantId, BestelWinkelkarRequest.Header.PersonalityId)	
+	Set BestelWinkelkarRequest.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(BestelWinkelkarRequest.Header.KlantId, BestelWinkelkarRequest.Header.PersonalityId)
+	Set BestelWinkelkarRequest.Winkelkar.KlantId = ..KlantIdConverter.ConvertToVanHoecke(BestelWinkelkarRequest.Winkelkar.KlantId, BestelWinkelkarRequest.Header.PersonalityId)	
 	
 	Do ..HeaderValidator.ValidateHeader(BestelWinkelkarRequest.Header)
 	Do ..SessionManager.RegisterSession(BestelWinkelkarRequest.Header)
@@ -161,7 +161,7 @@
 <FormalSpec>VerwijderWinkelkarRequest:WS.Vhisie4.Winkelkar.VerwijderWinkelkarRequest</FormalSpec>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set VerwijderWinkelkarRequest.Header.KlantId = ..KlantIdConverter.Convert(VerwijderWinkelkarRequest.Header.KlantId, VerwijderWinkelkarRequest.Header.PersonalityId)
+	Set VerwijderWinkelkarRequest.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(VerwijderWinkelkarRequest.Header.KlantId, VerwijderWinkelkarRequest.Header.PersonalityId)
 	
 	Do ..HeaderValidator.ValidateHeader(VerwijderWinkelkarRequest.Header)
 	Do ..SessionManager.RegisterSession(VerwijderWinkelkarRequest.Header)
@@ -186,8 +186,8 @@
 <Implementation><![CDATA[
 	Set %request.GatewayTimeout = 300
 	
-	Set HerberekenMaatwerkRequest.Header.KlantId = ..KlantIdConverter.Convert(HerberekenMaatwerkRequest.Header.KlantId, HerberekenMaatwerkRequest.Header.PersonalityId)
-	Set HerberekenMaatwerkRequest.Winkelkar.KlantId = ..KlantIdConverter.Convert(HerberekenMaatwerkRequest.Winkelkar.KlantId, HerberekenMaatwerkRequest.Header.PersonalityId)
+	Set HerberekenMaatwerkRequest.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(HerberekenMaatwerkRequest.Header.KlantId, HerberekenMaatwerkRequest.Header.PersonalityId)
+	Set HerberekenMaatwerkRequest.Winkelkar.KlantId = ..KlantIdConverter.ConvertToVanHoecke(HerberekenMaatwerkRequest.Winkelkar.KlantId, HerberekenMaatwerkRequest.Header.PersonalityId)
 	
 	Do ..HeaderValidator.ValidateHeader(HerberekenMaatwerkRequest.Header)
 	Do ..SessionManager.RegisterSession(HerberekenMaatwerkRequest.Header)
@@ -209,7 +209,7 @@
 <ReturnType>WS.Vhisie4.Winkelkar.BewaarMaatwerkLijnResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set BewaarMaatwerkLijnRequest.Header.KlantId = ..KlantIdConverter.Convert(BewaarMaatwerkLijnRequest.Header.KlantId, BewaarMaatwerkLijnRequest.Header.PersonalityId)
+	Set BewaarMaatwerkLijnRequest.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(BewaarMaatwerkLijnRequest.Header.KlantId, BewaarMaatwerkLijnRequest.Header.PersonalityId)
 	
 	Do ..HeaderValidator.ValidateHeader(BewaarMaatwerkLijnRequest.Header)
 	Do ..SessionManager.RegisterSession(BewaarMaatwerkLijnRequest.Header)
@@ -221,7 +221,7 @@
 <FormalSpec>BewaarProductLijnRequest:WS.Vhisie4.Winkelkar.BewaarProductLijnRequest</FormalSpec>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set BewaarProductLijnRequest.Header.KlantId = ..KlantIdConverter.Convert(BewaarProductLijnRequest.Header.KlantId, BewaarProductLijnRequest.Header.PersonalityId)
+	Set BewaarProductLijnRequest.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(BewaarProductLijnRequest.Header.KlantId, BewaarProductLijnRequest.Header.PersonalityId)
 	
 	Do ..HeaderValidator.ValidateHeader(BewaarProductLijnRequest.Header)
 	Do ..SessionManager.RegisterSession(BewaarProductLijnRequest.Header)
@@ -244,7 +244,7 @@
 <FormalSpec>VerwijderLijnRequest:WS.Vhisie4.Winkelkar.VerwijderLijnRequest</FormalSpec>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set VerwijderLijnRequest.Header.KlantId = ..KlantIdConverter.Convert(VerwijderLijnRequest.Header.KlantId, VerwijderLijnRequest.Header.PersonalityId)
+	Set VerwijderLijnRequest.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(VerwijderLijnRequest.Header.KlantId, VerwijderLijnRequest.Header.PersonalityId)
 	
 	Do ..HeaderValidator.ValidateHeader(VerwijderLijnRequest.Header)
 	Do ..SessionManager.RegisterSession(VerwijderLijnRequest.Header)
@@ -257,7 +257,7 @@
 <FormalSpec>MaakOrderVanOfferteRequest:WS.Vhisie4.Winkelkar.MaakOrderVanOfferteRequest</FormalSpec>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set MaakOrderVanOfferteRequest.Header.KlantId = ..KlantIdConverter.Convert(MaakOrderVanOfferteRequest.Header.KlantId, MaakOrderVanOfferteRequest.Header.PersonalityId)
+	Set MaakOrderVanOfferteRequest.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(MaakOrderVanOfferteRequest.Header.KlantId, MaakOrderVanOfferteRequest.Header.PersonalityId)
 	
 	Do ..HeaderValidator.ValidateHeader(MaakOrderVanOfferteRequest.Header)
 	Do ..SessionManager.RegisterSession(MaakOrderVanOfferteRequest.Header)
@@ -271,7 +271,7 @@
 <ReturnType>WS.Vhisie4.Winkelkar.SynchroniseerResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set SynchroniseerRequest.Header.KlantId = ..KlantIdConverter.Convert(SynchroniseerRequest.Header.KlantId, SynchroniseerRequest.Header.PersonalityId)
+	Set SynchroniseerRequest.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(SynchroniseerRequest.Header.KlantId, SynchroniseerRequest.Header.PersonalityId)
 	
 	Do ..HeaderValidator.ValidateHeader(SynchroniseerRequest.Header)
 	Do ..SessionManager.RegisterSession(SynchroniseerRequest.Header)
@@ -285,7 +285,7 @@
 <FormalSpec>StartVerpakkingBerekeningRequest:WS.Vhisie4.Winkelkar.StartVerpakkingBerekeningRequest</FormalSpec>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Set StartVerpakkingBerekeningRequest.Header.KlantId = ..KlantIdConverter.Convert(StartVerpakkingBerekeningRequest.Header.KlantId, StartVerpakkingBerekeningRequest.Header.PersonalityId)
+	Set StartVerpakkingBerekeningRequest.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(StartVerpakkingBerekeningRequest.Header.KlantId, StartVerpakkingBerekeningRequest.Header.PersonalityId)
 	
 	Do ..HeaderValidator.ValidateHeader(StartVerpakkingBerekeningRequest.Header)
 	Do ..SessionManager.RegisterSession(StartVerpakkingBerekeningRequest.Header)
Index: vhUnitTest/WSimpl/Vhisie4/KlantIdConverter.cls.xml
===================================================================
diff -u -r48500 -r48508
--- vhUnitTest/WSimpl/Vhisie4/KlantIdConverter.cls.xml	(.../KlantIdConverter.cls.xml)	(revision 48500)
+++ vhUnitTest/WSimpl/Vhisie4/KlantIdConverter.cls.xml	(.../KlantIdConverter.cls.xml)	(revision 48508)
@@ -3,20 +3,80 @@
 <Class name="vhUnitTest.WSimpl.Vhisie4.KlantIdConverter">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: WinkelkarServiceHelper wordt opgeroepen">
+<Property name="OrigineleConfigSetting">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KlantIdConverter">
+<Type>WSimpl.Vhisie4.KlantIdConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="VanHoeckePersonality">
+<Type>DOM.common.enu.Personality</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="NietVanHoeckePersonality">
+<Type>DOM.common.enu.Personality</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
-	#dim AxKlantId As %String = "AxKlantId"
-	#dim VanHoeckePersonalityId As %String = "VanHoeckePersonalityId"
+	Do ##super()
+
+	Set ..OrigineleConfigSetting = ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A")
+	Set ..KlantIdConverter = ##class(WSimpl.Vhisie4.KlantIdConverter).%New()
+	Set ..VanHoeckePersonality = ##class(DOM.common.enu.Personality).VanHoecke()
+	Set ..NietVanHoeckePersonality = ##class(DOM.common.enu.Personality).SFS()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Do ##super()
 	
-	#dim WinkelkarServiceHelperMock As vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New()
-	Do WinkelkarServiceHelperMock.VerwachtMethodCall("GeefVanHoeckeKlantId", AxKlantId, VanHoeckePersonalityId).DanReturn("VanHoeckeKlantId")
-	
-	#dim KlantIdConverter As WSimpl.Vhisie4.KlantIdConverter = ##class(WSimpl.Vhisie4.KlantIdConverter).%New(WinkelkarServiceHelperMock)
-	Do KlantIdConverter.Convert(AxKlantId, VanHoeckePersonalityId)
-	
-	Do WinkelkarServiceHelperMock.Verifieer()
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("KlantIdAx2A", ..OrigineleConfigSetting)
 ]]></Implementation>
 </Method>
+
+<Method name="Test: ConvertToVanHoecke converteert in modus 2A een AX KlantId naar een Van Hoecke KlantId">
+<Implementation><![CDATA[
+	Do ..AssertVanHoeckeKlantId($$$False, "00123", ..VanHoeckePersonality, "00123")
+	Do ..AssertVanHoeckeKlantId($$$True, "00123", ..VanHoeckePersonality, "123")
+	Do ..AssertVanHoeckeKlantId($$$False, "00123", ..NietVanHoeckePersonality, "00123")
+	Do ..AssertVanHoeckeKlantId($$$True, "00123", ..NietVanHoeckePersonality, "00123")
+]]></Implementation>
+</Method>
+
+<Method name="Test: ConvertToAx converteert in modus 2A een Van Hoecke KlantId naar een AX KlantId">
+<Implementation><![CDATA[
+	Do ..AssertAxKlantId($$$False, "K||123", ..VanHoeckePersonality, "K||123")
+	Do ..AssertAxKlantId($$$True, "K||123", ..VanHoeckePersonality, "00123")
+	Do ..AssertAxKlantId($$$False, "K||123", ..NietVanHoeckePersonality, "K||123")
+	Do ..AssertAxKlantId($$$True, "K||123", ..NietVanHoeckePersonality, "K||123")
+]]></Implementation>
+</Method>
+
+<Method name="AssertVanHoeckeKlantId">
+<FormalSpec>ConfigFlag:%Boolean,KlantId:%String,PersonalityId:%String,VerwachteKlantId:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("KlantIdAx2A", ConfigFlag)
+	Do $$$AssertEquals(..KlantIdConverter.ConvertToVanHoecke(KlantId, PersonalityId), VerwachteKlantId)
+]]></Implementation>
+</Method>
+
+<Method name="AssertAxKlantId">
+<FormalSpec>ConfigFlag:%Boolean,KlantId:%String,PersonalityId:%String,VerwachteKlantId:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("KlantIdAx2A", ConfigFlag)
+	Do $$$AssertEquals(..KlantIdConverter.ConvertToAx(KlantId, PersonalityId), VerwachteKlantId)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml
===================================================================
diff -u -r39647 -r48508
--- WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml	(.../KlantDocumentService.cls.xml)	(revision 39647)
+++ WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml	(.../KlantDocumentService.cls.xml)	(revision 48508)
@@ -32,14 +32,21 @@
 <Private>1</Private>
 </Property>
 
+<Property name="KlantIdConverter">
+<Type>WSimpl.Vhisie4.KlantIdConverter</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..HeaderValidator = ##class(WSimpl.Vhisie4.HeaderValidator).%New()
+	Set ..HeaderValidator = ##class(WSimpl.Vhisie4.HeaderValidator).%New()
 	Set ..SessionManager = ##class(WSimpl.Vhisie4.SessionManager).%New()
+	Set ..KlantIdConverter = ##class(WSimpl.Vhisie4.KlantIdConverter).%New()
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -57,10 +64,15 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefVerkoopHistoriekResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	
 	Do ..HeaderValidator.ValidateHeader(Request.Header)
 	Do ..SessionManager.RegisterSession(Request.Header)
-	Set bl = ##class(AX.Uitgaand.EC.Data.impl.HistoriekOphalen).%New(Request)
-	Quit bl.GeefResponse()
+	
+	#dim Response As WS.Vhisie4.KlantDocument.GeefVerkoopHistoriekResponse = ##class(AX.Uitgaand.EC.Data.impl.HistoriekOphalen).%New(Request).GeefResponse()
+	Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response.KlantId)
+	
+	Quit Response
 ]]></Implementation>
 </Method>
 
@@ -78,10 +90,15 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefOrdersResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	
 	Do ..HeaderValidator.ValidateHeader(Request.Header)
 	Do ..SessionManager.RegisterSession(Request.Header)
-	Set bl=##class(AX.Uitgaand.EC.Data.impl.OrdersOphalen).%New(Request)
-	Quit bl.GeefResponse()
+	
+	#dim Response As WS.Vhisie4.KlantDocument.GeefOrdersResponse = ##class(AX.Uitgaand.EC.Data.impl.OrdersOphalen).%New(Request).GeefResponse()
+	Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response.KlantId)
+	
+	Quit Response
 ]]></Implementation>
 </Method>
 
@@ -98,10 +115,15 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefFacturenResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	
 	Do ..HeaderValidator.ValidateHeader(Request.Header)
 	Do ..SessionManager.RegisterSession(Request.Header)
-	Set bl=##class(AX.Uitgaand.EC.Data.impl.FacturenOphalen).%New(Request)
-	Quit bl.GeefResponse()
+	
+	#dim Response As WS.Vhisie4.KlantDocument.GeefFacturenResponse = ##class(AX.Uitgaand.EC.Data.impl.FacturenOphalen).%New(Request).GeefResponse()
+	Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response.KlantId)
+	
+	Quit Response
 ]]></Implementation>
 </Method>
 
@@ -117,10 +139,15 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefOffertesResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	
 	Do ..HeaderValidator.ValidateHeader(Request.Header)
 	Do ..SessionManager.RegisterSession(Request.Header)
-	Set bl=##class(AX.Uitgaand.EC.Data.impl.OffertesOphalen).%New(Request)
-	Quit bl.GeefResponse()
+	
+	#dim Response As WS.Vhisie4.KlantDocument.GeefOffertesResponse = ##class(AX.Uitgaand.EC.Data.impl.OffertesOphalen).%New(Request).GeefResponse()
+	Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response.KlantId)
+	
+	Quit Response
 ]]></Implementation>
 </Method>
 
@@ -137,10 +164,15 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefLeveringenResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	
 	Do ..HeaderValidator.ValidateHeader(Request.Header)
 	Do ..SessionManager.RegisterSession(Request.Header)
-	Set bl=##class(AX.Uitgaand.EC.Data.impl.LeveringenOphalen).%New(Request)
-	Quit bl.GeefResponse()
+	
+	#dim Response As WS.Vhisie4.KlantDocument.GeefLeveringenResponse = ##class(AX.Uitgaand.EC.Data.impl.LeveringenOphalen).%New(Request).GeefResponse()
+	Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response)
+	
+	Quit Response
 ]]></Implementation>
 </Method>
 
@@ -149,10 +181,15 @@
 <ReturnType>WS.Vhisie4.KlantDocument.GeefDocumentResponse</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	Set Request.Header.KlantId = ..KlantIdConverter.ConvertToVanHoecke(Request.Header.KlantId)
+	
 	Do ..HeaderValidator.ValidateHeader(Request.Header)
 	Do ..SessionManager.RegisterSession(Request.Header)
-	Set bl=##class(AX.Uitgaand.EC.Data.impl.DocumentOphalen).%New(Request)
-	quit bl.GeefResponse()
+	
+	#dim Response As WS.Vhisie4.KlantDocument.GeefDocumentResponse = ##class(AX.Uitgaand.EC.Data.impl.DocumentOphalen).%New(Request).GeefResponse()
+	Set Response.KlantId = ..KlantIdConverter.ConvertToAx(Response)
+	
+	Quit Response
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/Vhisie4/KlantIdConverter.cls.xml
===================================================================
diff -u -r48500 -r48508
--- WSimpl/Vhisie4/KlantIdConverter.cls.xml	(.../KlantIdConverter.cls.xml)	(revision 48500)
+++ WSimpl/Vhisie4/KlantIdConverter.cls.xml	(.../KlantIdConverter.cls.xml)	(revision 48508)
@@ -3,28 +3,27 @@
 <Class name="WSimpl.Vhisie4.KlantIdConverter">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="WinkelkarServiceHelper">
-<Type>WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<FormalSpec>WinkelkarServiceHelper:WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper=""</FormalSpec>
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
+<Method name="ConvertToVanHoecke">
+<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set ..WinkelkarServiceHelper = $$$Inject(WinkelkarServiceHelper, ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New())
+	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") && (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke())) {
+		Set KlantId = +KlantId
+	}
 	
-	Quit $$$OK
+	Quit KlantId
 ]]></Implementation>
 </Method>
 
-<Method name="Convert">
+<Method name="ConvertToAx">
 <FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..WinkelkarServiceHelper.GeefVanHoeckeKlantId(KlantId, PersonalityId)
+<Implementation><![CDATA[
+	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") && (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke())) {
+		Set KlantId = ##class(TECH.StringUtils).AlignRight($Extract(KlantId, 4, *), 0, 5)
+	}
+	
+	Quit KlantId
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Mock/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml
===================================================================
diff -u -r48500 -r48508
--- vhTest/Mock/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml	(.../Helper.cls.xml)	(revision 48500)
+++ vhTest/Mock/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml	(.../Helper.cls.xml)	(revision 48508)
@@ -14,13 +14,6 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKlantPartijID",KlantId,PersonalityId)
 ]]></Implementation>
 </Method>
-
-<Method name="GeefVanHoeckeKlantId">
-<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefVanHoeckeKlantId",KlantId,PersonalityId)
-]]></Implementation>
-</Method>
 </Class>
 
 
FishEye: Tag 48508 refers to a dead (removed) revision in file `vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper/GeefVanHoeckeKlantId/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?