Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/UnishopWinkelkarConverter/Converter/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/UnishopWinkelkarConverter/Converter/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarExport/UnishopWinkelkarConverter/Converter/Test.cls.xml	(revision 48749)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Vhisie4.Winkelkar.WinkelkarExport.UnishopWinkelkarConverter.Converter.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: KlantId&apos;s worden geconverteerd naar een voor Van Hoecke gekende KlantId">
+<Implementation><![CDATA[
+	#dim RandomKlantId As %String = "RandomKlantId"
+	#dim RandomPersonalityId As %String = "RandomPersonalityId"
+	#dim Personality As %String = "Personality"
+	#dim KlantId As %String = "KlantId"
+	#dim OfferteDummy As APPS.EC.dto.Offerte = ..GeefOfferte(RandomKlantId, RandomPersonalityId)
+	
+	#dim KlantIdConverterMock As vhTest.Mock.WSimpl.Vhisie4.KlantIdConverter = ##class(vhTest.Mock.WSimpl.Vhisie4.KlantIdConverter).%New()
+	Do KlantIdConverterMock.VerwachtMethodCall("ConvertToVanHoecke", RandomKlantId, RandomPersonalityId).DanReturn(KlantId)
+	
+	#dim PersonalityRepositoryMock As vhTest.Mock.DOM.common.impl.PersonalityRepository = ##class(vhTest.Mock.DOM.common.impl.PersonalityRepository).%New()
+	Do PersonalityRepositoryMock.VerwachtMethodCall("GeefViaID", RandomPersonalityId).DanReturn(Personality)
+	
+	#dim PersonalityServiceMock As vhTest.Mock.DOM.common.PersonalityService = ##class(vhTest.Mock.DOM.common.PersonalityService).%New()
+	Do PersonalityServiceMock.VerwachtMethodCall("GeefKlantCodeViaKlantId", Personality, KlantId).DanDoeNiks()
+	
+	#dim Converter As WSimpl.Vhisie4.Winkelkar.WinkelkarExport.UnishopWinkelkarConverter.Converter = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarExport.UnishopWinkelkarConverter.Converter).%New(KlantIdConverterMock, PersonalityRepositoryMock, PersonalityServiceMock)
+	
+	Do Converter.Convert(OfferteDummy)
+	
+	Do PersonalityServiceMock.Verifieer()
+	Do KlantIdConverterMock.Verifieer()
+	Do PersonalityRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefOfferte">
+<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EC.dto.Offerte</ReturnType>
+<Implementation><![CDATA[
+	#dim Offerte As APPS.EC.dto.Offerte	=  ##class(APPS.EC.dto.Offerte).%New()
+	
+	Set Offerte.Winkelkar = ..GeefWinkelkar(KlantId, PersonalityId)
+	Set Offerte.Hoofding = ..GeefHoofding()
+	Set Offerte.VerzendingMogelijkheid = ##class(APPS.EC.dto.OfferteVerzendingMogelijkheid).%New()
+	
+	Quit Offerte
+]]></Implementation>
+</Method>
+
+<Method name="GeefWinkelkar">
+<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EC.Winkelkar.dto.Winkelkar</ReturnType>
+<Implementation><![CDATA[
+	#dim Winkelkar As APPS.EC.Winkelkar.dto.Winkelkar = ##class(APPS.EC.Winkelkar.dto.Winkelkar).%New()
+	
+	Set Winkelkar.KlantID = KlantId
+	Set Winkelkar.Klant = ##class(DOM.common.dto.VanHoeckeKlantData).%New()
+	Set Winkelkar.Klant.ID = KlantId
+	Set Winkelkar.Personality = ##class(DOM.common.dto.PersonalityData).%New()
+	Set Winkelkar.Personality.ID = PersonalityId
+	
+	Quit Winkelkar
+]]></Implementation>
+</Method>
+
+<Method name="GeefHoofding">
+<Private>1</Private>
+<ReturnType>APPS.EC.dto.Hoofding</ReturnType>
+<Implementation><![CDATA[
+	#dim Hoofding As APPS.EC.dto.Hoofding = ##class(APPS.EC.dto.Hoofding).%New()
+	
+	Set Hoofding.LeveringDetail.Adres = ##class(APPS.common.dto.Adres).%New()
+	
+	Quit Hoofding
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Vhisie4/Winkelkar/WinkelkarExport/UnishopWinkelkarConverter/Converter.cls.xml
===================================================================
diff -u -r46853 -r48749
--- WSimpl/Vhisie4/Winkelkar/WinkelkarExport/UnishopWinkelkarConverter/Converter.cls.xml	(.../Converter.cls.xml)	(revision 46853)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarExport/UnishopWinkelkarConverter/Converter.cls.xml	(.../Converter.cls.xml)	(revision 48749)
@@ -13,7 +13,7 @@
 <Private>1</Private>
 </Property>
 
-<Property name="PersonalityRepo">
+<Property name="PersonalityRepository">
 <Type>DOM.common.impl.PersonalityRepository</Type>
 <Private>1</Private>
 </Property>
@@ -23,31 +23,41 @@
 <Private>1</Private>
 </Property>
 
+<Property name="KlantIdConverter">
+<Type>WSimpl.Vhisie4.KlantIdConverter</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
+<FormalSpec>KlantIdConverter:WSimpl.Vhisie4.KlantIdConverter="",PersonalityRepository:DOM.common.impl.PersonalityRepository="",PersonalityService:DOM.common.impl.PersonalityService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..WinkelkarUtils = ##class(APPS.EC.Winkelkar.impl.WinkelkarUtils).%New()
-	set ..WinkelkarLijnConverter = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarLijnConverter).%New()
-	Set ..PersonalityRepo = ##class(DOM.common.impl.PersonalityRepository).%New()
-	Set ..PersonalityService = ##class(DOM.common.impl.PersonalityService).%New()
+	Set ..KlantIdConverter = $$$Inject(KlantIdConverter, ##class(WSimpl.Vhisie4.KlantIdConverter).%New())
+	Set ..WinkelkarUtils = ##class(APPS.EC.Winkelkar.impl.WinkelkarUtils).%New()
+	Set ..WinkelkarLijnConverter = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarLijnConverter).%New()
+	Set ..PersonalityRepository = $$$Inject(PersonalityRepository, ##class(DOM.common.impl.PersonalityRepository).%New())
+	Set ..PersonalityService = $$$Inject(PersonalityService, ##class(DOM.common.impl.PersonalityService).%New())
 
-	quit $$$OK
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Convert">
 <FormalSpec>Offerte:APPS.EC.dto.Offerte</FormalSpec>
 <ReturnType>WS.Vhisie4.WinkelkarExport.dto.Winkelkar</ReturnType>
 <Implementation><![CDATA[
+	Set Offerte.Winkelkar.KlantID = ..KlantIdConverter.ConvertToVanHoecke(Offerte.Winkelkar.KlantID, Offerte.Winkelkar.Personality.ID)
+	Set Offerte.Winkelkar.Klant.ID = ..KlantIdConverter.ConvertToVanHoecke(Offerte.Winkelkar.Klant.ID, Offerte.Winkelkar.Personality.ID)
+	
 	Set Winkelkar = ##class(WS.Vhisie4.WinkelkarExport.dto.Winkelkar).%New()
 	
 	Set Winkelkar.Id = Offerte.OfferteID
 	Set Winkelkar.Datum = Offerte.Hoofding.BestelDatum
-	Set Winkelkar.KlantId = ..PersonalityService.GeefKlantCodeViaKlantId(..PersonalityRepo.GeefViaID(Offerte.Winkelkar.Personality.ID),Offerte.Winkelkar.KlantID)
-	set Winkelkar.Referentie = Offerte.Hoofding.Referentie.OrderReferentie
+	Set Winkelkar.KlantId = ..PersonalityService.GeefKlantCodeViaKlantId(..PersonalityRepository.GeefViaID(Offerte.Winkelkar.Personality.ID), Offerte.Winkelkar.KlantID)
+	Set Winkelkar.Referentie = Offerte.Hoofding.Referentie.OrderReferentie
 	Set Winkelkar.Status = Offerte.Status
 	Set Winkelkar.PersonalityId = Offerte.Winkelkar.Personality.ID
 
@@ -61,6 +71,7 @@
 		set GeconverteerdeLijn.Id = Lijn.LijnID
 		Do Winkelkar.Lijnen.Insert(GeconverteerdeLijn)
  	}
+ 	
  	Quit Winkelkar
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/WSimpl/Vhisie4/KlantIdConverter.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WSimpl/Vhisie4/KlantIdConverter.cls.xml	(revision 0)
+++ vhTest/Mock/WSimpl/Vhisie4/KlantIdConverter.cls.xml	(revision 48749)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WSimpl.Vhisie4.KlantIdConverter">
+<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</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.Vhisie4.KlantIdConverter,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="ConvertToAx">
+<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ConvertToAx",KlantId,PersonalityId)
+]]></Implementation>
+</Method>
+
+<Method name="ConvertToVanHoecke">
+<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ConvertToVanHoecke",KlantId,PersonalityId)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/WSimpl/Vhisie4/KlantIdConverter.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WSimpl/Vhisie4/KlantIdConverter.cls.xml	(revision 0)
+++ vhTest/Fake/WSimpl/Vhisie4/KlantIdConverter.cls.xml	(revision 48749)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WSimpl.Vhisie4.KlantIdConverter">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+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>WSimpl.Vhisie4.KlantIdConverter</Super>
+
+<Method name="ConvertToAx">
+<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="ConvertToVanHoecke">
+<FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>