Index: DOM/EC/Winkelkar/WinkelkarService.cls.xml
===================================================================
diff -u -r35617 -r37291
--- DOM/EC/Winkelkar/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 35617)
+++ DOM/EC/Winkelkar/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 37291)
@@ -25,6 +25,16 @@
 <ReturnType>DOM.EC.Winkelkar.Winkelkar</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
+
+<Method name="PrijsUpdaterHerbereken">
+<Abstract>1</Abstract>
+<FormalSpec>Winkelkar:DOM.EC.Winkelkar.Winkelkar</FormalSpec>
+</Method>
+
+<Method name="BewaarWinkelkar">
+<Abstract>1</Abstract>
+<FormalSpec>Winkelkar:DOM.EC.Winkelkar.Winkelkar</FormalSpec>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/APPS/VKP/OfferteService.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/VKP/OfferteService.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/VKP/OfferteService.cls.xml	(revision 37291)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.VKP.OfferteService">
+<Super>TECH.RegisteredObject,APPS.VKP.OfferteService</Super>
+
+<Method name="KoppelAanOfferteVanHandel">
+<FormalSpec>Offerte:APPS.VKP.Offerte,OfferteVanHandel:APPS.VKP.Offerte</FormalSpec>
+</Method>
+
+<Method name="GeefOfferteBewaarder">
+<ReturnType>APPS.VKP.OfferteBewaarder</ReturnType>
+<Implementation><![CDATA[	Quit ##class(vhTest.Fake.APPS.VKP.OfferteBewaarder).%New()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/EC/Winkelkar/impl/WinkelkarService.cls.xml
===================================================================
diff -u -r35617 -r37291
--- DOM/EC/Winkelkar/impl/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 35617)
+++ DOM/EC/Winkelkar/impl/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 37291)
@@ -51,6 +51,22 @@
 	Quit Winkelkar
 ]]></Implementation>
 </Method>
+
+<Method name="PrijsUpdaterHerbereken">
+<Abstract>1</Abstract>
+<FormalSpec>Winkelkar:DOM.EC.Winkelkar.Winkelkar</FormalSpec>
+<Implementation><![CDATA[
+	#dim WinkelkarPrijsUpdater As APPS.EC.impl.WinkelkarPrijsUpdater = ##class(APPS.EC.impl.WinkelkarPrijsUpdater).%New()
+	Do WinkelkarPrijsUpdater.Herbereken(Winkelkar)
+]]></Implementation>
+</Method>
+
+<Method name="BewaarWinkelkar">
+<Abstract>1</Abstract>
+<FormalSpec>Winkelkar:DOM.EC.Winkelkar.Winkelkar</FormalSpec>
+<Implementation><![CDATA[	Do Winkelkar.Save()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/VKP/OfferteService.cls.xml
===================================================================
diff -u -r37252 -r37291
--- vhTest/Mock/APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 37252)
+++ vhTest/Mock/APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 37291)
@@ -127,13 +127,6 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("VoegToeMaatwerk",Offerte,IngegevenKenmerken,Aantal,ProjectReferentie)
 ]]></Implementation>
 </Method>
-
-<Method name="VoegToeProduct">
-<FormalSpec>Offerte:APPS.VKP.Offerte,ProductID:%String,Aantal:%String,PakketReferentie:%String="",ProjectReferentie:%String=""</FormalSpec>
-<ReturnType>DOM.EC.Winkelkar.ProductLijn</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("VoegToeProduct",Offerte,ProductID,Aantal,PakketReferentie,ProjectReferentie)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Spy/APPS/EC/Verkoop/ExterneVerkoopService.cls.xml
===================================================================
diff -u
--- vhTest/Spy/APPS/EC/Verkoop/ExterneVerkoopService.cls.xml	(revision 0)
+++ vhTest/Spy/APPS/EC/Verkoop/ExterneVerkoopService.cls.xml	(revision 37291)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.EC.Verkoop.ExterneVerkoopService,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Property name="StelInStandaardLeveradresTeller">
+<Type>%Integer</Type>
+<InitialExpression>0</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Method name="StelInStandaardLeveradres">
+<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
+<Implementation><![CDATA[
+	Set ..StelInStandaardLeveradresTeller = ..StelInStandaardLeveradresTeller + 1
+	Do ##class(Tools.Wlip).%New(26).String(..StelInStandaardLeveradresTeller)
+]]></Implementation>
+</Method>
+
+<Method name="GeefStelInStandaardLeveradresTeller">
+<Implementation><![CDATA[	Quit ..StelInStandaardLeveradresTeller
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/VKP/OfferteService.cls.xml
===================================================================
diff -u -r37250 -r37291
--- APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 37250)
+++ APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 37291)
@@ -108,12 +108,6 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
-<Method name="VoegToeProduct">
-<Abstract>1</Abstract>
-<FormalSpec>Offerte:APPS.VKP.Offerte,ProductID:%String,Aantal:%String,PakketReferentie:%String="",ProjectReferentie:%String=""</FormalSpec>
-<ReturnType>DOM.EC.Winkelkar.ProductLijn</ReturnType>
-</Method>
-
 <Method name="GeefLeverAdres">
 <Abstract>1</Abstract>
 <FormalSpec>OfferteID:%String</FormalSpec>
Index: vhTest/Fake/APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/VKP/Offerte/impl/OfferteKopieerder.cls.xml	(revision 37291)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder">
+<Super>APPS.VKP.Offerte.OfferteKopieerder,TECH.RegisteredObject</Super>
+
+<Property name="Offerte">
+<Type>APPS.VKP.Offerte</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="KopieerOfferte">
+<FormalSpec>Offerte:APPS.VKP.Offerte,KlantID:DOM.VKP.VanHoeckeKlantID="",PersonalityID:DOM.common.enu.Personality=""</FormalSpec>
+<ReturnType>APPS.VKP.Offerte</ReturnType>
+<Implementation><![CDATA[
+	Set ..Offerte = Offerte
+	Set OfferteKopie = ##class(APPS.VKP.impl.Offerte).%New(Offerte.GeefKlantID(), Offerte.GeefPersonalityID())
+	Do OfferteKopie.ZetLeverAdres(Offerte.GeefLeverAdres())
+	Quit OfferteKopie
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/VKP/Offerte/impl/HandelOfferteNaarVanHoeckeOfferteConverteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r29059 -r37291
--- vhUnitTest/APPS/VKP/Offerte/impl/HandelOfferteNaarVanHoeckeOfferteConverteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/VKP/Offerte/impl/HandelOfferteNaarVanHoeckeOfferteConverteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 37291)
@@ -3,20 +3,112 @@
 <Class name="vhUnitTest.APPS.VKP.Offerte.impl.HandelOfferteNaarVanHoeckeOfferteConverteerder.Converteer.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="TestConverteerNietHandelOffertexxxExceptie">
+<Method name="Test : geeft foutmelding als de offerte geen handelofferte is">
 <Implementation><![CDATA[
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("De personality van de offerte die geconverteerd moet worden, is geen handelofferte")
-	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
 	
-	set OfferteFake = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Set OfferteFake = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
 	
-	do OfferteFake.IndienMethodCall("GeefID").DanReturn($$$DummyString)
-	do OfferteFake.IndienMethodCall("GeefPersonality").DanReturn(##class(DOM.common.VanHoeckePersonality).Instance())
+	Do OfferteFake.IndienMethodCall("GeefID").DanReturn($$$DummyString)
+	Do OfferteFake.IndienMethodCall("GeefPersonality").DanReturn(##class(DOM.common.VanHoeckePersonality).Instance())
 	
-	set Converteerder = ##class(APPS.VKP.Offerte.impl.HandelOfferteNaarVanHoeckeOfferteConverteerder).%New()
-	do Converteerder.Converteer(OfferteFake)
+	Set Converteerder = ##class(APPS.VKP.Offerte.impl.HandelOfferteNaarVanHoeckeOfferteConverteerder).%New()
+	Do Converteerder.Converteer(OfferteFake)
 ]]></Implementation>
 </Method>
+
+<Method name="Test : het handel leveradres blijft ongewijzigd als de klant een Hein personality is">
+<Implementation><![CDATA[
+	#dim OfferteFake As vhTest.Mock.APPS.VKP.Offerte = ..GeefOfferteFake(##class(DOM.common.enu.Personality).Hein())
+
+	#dim OfferteKopieerderFake As vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder = ##class(vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder).%New()
+	#dim OfferteServiceFake As vhTest.Fake.APPS.VKP.OfferteService = ##class(vhTest.Fake.APPS.VKP.OfferteService).%New()
+	#dim ExterneVerkoopServiceSpy As vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService = ##class(vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService).%New()
+
+	Set Converteerder = ##class(APPS.VKP.Offerte.impl.HandelOfferteNaarVanHoeckeOfferteConverteerder).%New(OfferteKopieerderFake, OfferteServiceFake, ExterneVerkoopServiceSpy, ..GeefCommonAPIStub(), ..GeefWinkelKarServiceMock())
+	#dim Offerte As APPS.VKP.Offerte = Converteerder.Converteer(OfferteFake)
+	
+	Do $$$AssertEquals(ExterneVerkoopServiceSpy.GeefStelInStandaardLeveradresTeller(),0)
+]]></Implementation>
+</Method>
+
+<Method name="Test : het handel leveradres wordt op standaardleveradres gezet als het geen hein personality is">
+<Implementation><![CDATA[
+	#dim OfferteFake As vhTest.Mock.APPS.VKP.Offerte = ..GeefOfferteFake(##class(DOM.common.enu.Personality).VanHoecke())
+	
+	#dim OfferteKopieerderFake As vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder = ##class(vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder).%New()
+	#dim OfferteServiceFake As vhTest.Fake.APPS.VKP.OfferteService = ##class(vhTest.Fake.APPS.VKP.OfferteService).%New()
+	#dim ExterneVerkoopServiceSpy As vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService = ##class(vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService).%New()
+	
+	Set Converteerder = ##class(APPS.VKP.Offerte.impl.HandelOfferteNaarVanHoeckeOfferteConverteerder).%New(OfferteKopieerderFake, OfferteServiceFake, ExterneVerkoopServiceSpy, ..GeefCommonAPIStub(), ..GeefWinkelKarServiceMock())
+	#dim Offerte As APPS.VKP.Offerte = Converteerder.Converteer(OfferteFake)
+	
+	Do $$$AssertEquals(ExterneVerkoopServiceSpy.GeefStelInStandaardLeveradresTeller(),1)
+]]></Implementation>
+</Method>
+
+<Method name="GeefWinkelKarServiceMock">
+<Private>1</Private>
+<ReturnType>vhTest.Mock.DOM.EC.Winkelkar.WinkelkarService</ReturnType>
+<Implementation><![CDATA[
+	#dim WinkelkarFake As vhTest.Fake.DOM.EC.Winkelkar.Winkelkar = ##class(vhTest.Fake.DOM.EC.Winkelkar.Winkelkar).%New("")
+	#dim WinkelkarServiceMock As vhTest.Mock.DOM.EC.Winkelkar.WinkelkarService = ##class(vhTest.Mock.DOM.EC.Winkelkar.WinkelkarService).%New()
+	Do WinkelkarServiceMock.IndienMethodCall("BewaarWinkelkar", $$$ElkeWaarde).DanDoeNiks()
+	Do WinkelkarServiceMock.IndienMethodCall("PrijsUpdaterHerbereken", $$$ElkeWaarde).DanDoeNiks()
+	Do WinkelkarServiceMock.IndienMethodCall("GeefWinkelkar", $$$ElkeWaarde).DanReturn(WinkelkarFake)
+	Quit WinkelkarServiceMock
+]]></Implementation>
+</Method>
+
+<Method name="GeefCommonAPIStub">
+<Private>1</Private>
+<ReturnType>vhTest.Mock.APPS.common.CommonAPI</ReturnType>
+<Implementation><![CDATA[
+	#dim KlantDataDummy As DOM.common.dto.KlantData = ##class(DOM.common.dto.KlantData).%New()	
+	Set KlantDataDummy.ID = ""
+	Set KlantDataDummy.Code = ""
+	Set KlantDataDummy.Naam = ""
+	Set KlantDataDummy.Land = ""
+	Set KlantDataDummy.Gemeente = ""
+	Set KlantDataDummy.Taal = ""
+	
+	#dim DataServiceStub As vhTest.Mock.APPS.common.DataService = ##class(vhTest.Mock.APPS.common.DataService).%New()
+	Do DataServiceStub.IndienMethodCall("GeefKlantData", $$$ElkeWaarde).DanReturn(KlantDataDummy)
+	#dim CommonAPIStub As vhTest.Mock.APPS.common.CommonAPI	= ##class(vhTest.Mock.APPS.common.CommonAPI).%New()
+	Do CommonAPIStub.IndienMethodCall("GeefDataService", $$$ElkeWaarde).DanReturn(DataServiceStub)
+	Quit CommonAPIStub
+]]></Implementation>
+</Method>
+
+<Method name="GeefOfferteFake">
+<FormalSpec>Personality:DOM.common.enu.Personality</FormalSpec>
+<Private>1</Private>
+<ReturnType>vhTest.Mock.APPS.VKP.Offerte</ReturnType>
+<Implementation><![CDATA[
+	Set OfferteFake = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteFake.IndienMethodCall("GeefID").DanReturn($$$DummyString)
+	
+	#dim PersonalityMock As vhTest.Mock.DOM.common.Personality = ##class(vhTest.Mock.DOM.common.Personality).%New()
+	Do PersonalityMock.IndienMethodCall("GeefKlantID").DanReturn($$$DummyString)
+	Do PersonalityMock.IndienMethodCall("IsHandel").DanReturn($$$True)
+	
+	Do OfferteFake.IndienMethodCall("GeefPersonalityID").DanReturn(Personality)
+	Do OfferteFake.IndienMethodCall("GeefKlantID").DanReturn($$$DummyString)
+	Do OfferteFake.IndienMethodCall("GeefPersonality").DanReturn(PersonalityMock)
+	Do OfferteFake.IndienMethodCall("GeefBestelOpmerking").DanReturn("DummyOpmerking")
+	Do OfferteFake.IndienMethodCall("GeefLeverDatum").DanReturn("")
+	Do OfferteFake.IndienMethodCall("GeefPrijsBerekeningDatum").DanReturn("")
+	Do OfferteFake.IndienMethodCall("GeefOrderID").DanReturn("DummyOrderID")
+	Do OfferteFake.IndienMethodCall("GeefWinkelkarID").DanReturn("DummyWinkelkarID")
+	
+	#dim LeverAdres As DOM.VKP.impl.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	Do LeverAdres.ZetID("DummyID")
+	Do OfferteFake.IndienMethodCall("GeefLeverAdres").DanReturn(LeverAdres)
+
+	Quit OfferteFake
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/APPS/VKP/OfferteBewaarder.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/VKP/OfferteBewaarder.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/VKP/OfferteBewaarder.cls.xml	(revision 37291)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.VKP.OfferteBewaarder">
+<Super>TECH.RegisteredObject,APPS.VKP.OfferteBewaarder</Super>
+
+<Method name="Bewaar">
+<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/DOM/EC/Winkelkar/WinkelkarService.cls.xml
===================================================================
diff -u -r35617 -r37291
--- vhTest/Mock/DOM/EC/Winkelkar/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 35617)
+++ vhTest/Mock/DOM/EC/Winkelkar/WinkelkarService.cls.xml	(.../WinkelkarService.cls.xml)	(revision 37291)
@@ -9,6 +9,12 @@
 <Super>DOM.EC.Winkelkar.WinkelkarService,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
+<Method name="BewaarWinkelkar">
+<FormalSpec>Winkelkar:DOM.EC.Winkelkar.Winkelkar</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("BewaarWinkelkar",Winkelkar)
+]]></Implementation>
+</Method>
+
 <Method name="GeefLaatstGewijzigdeMaatwerkLijn">
 <FormalSpec>WinkelkarID:%String,Familie:DOM.PM.enu.Familie,Variant:DOM.PM.enu.Variant</FormalSpec>
 <ReturnType>DOM.EC.Winkelkar.MaatwerkLijn</ReturnType>
@@ -29,6 +35,12 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefWinkelkar",WinkelkarID)
 ]]></Implementation>
 </Method>
+
+<Method name="PrijsUpdaterHerbereken">
+<FormalSpec>Winkelkar:DOM.EC.Winkelkar.Winkelkar</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("PrijsUpdaterHerbereken",Winkelkar)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/VKP/Offerte/impl/HandelOfferteNaarVanHoeckeOfferteConverteerder.cls.xml
===================================================================
diff -u -r36788 -r37291
--- APPS/VKP/Offerte/impl/HandelOfferteNaarVanHoeckeOfferteConverteerder.cls.xml	(.../HandelOfferteNaarVanHoeckeOfferteConverteerder.cls.xml)	(revision 36788)
+++ APPS/VKP/Offerte/impl/HandelOfferteNaarVanHoeckeOfferteConverteerder.cls.xml	(.../HandelOfferteNaarVanHoeckeOfferteConverteerder.cls.xml)	(revision 37291)
@@ -8,13 +8,39 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OfferteService">
+<Type>APPS.VKP.OfferteService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ExterneVerkoopService">
+<Type>APPS.EC.Verkoop.ExterneVerkoopService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="CommonAPI">
+<Type>APPS.common.CommonAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="WinkelkarService">
+<Type>DOM.EC.Winkelkar.impl.WinkelkarService</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
+<FormalSpec>OfferteKopieerder:APPS.VKP.Offerte.OfferteKopieerder,OfferteService:APPS.VKP.OfferteService,ExterneVerkoopService:APPS.EC.Verkoop.ExterneVerkoopService,CommonAPI:APPS.common.CommonAPI,WinkelkarService:DOM.EC.Winkelkar.impl.WinkelkarService</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..OfferteKopieerder = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteKopieerder()
+	Set ..OfferteKopieerder = $$$Inject(OfferteKopieerder, ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteKopieerder())
+	Set ..OfferteService = $$$Inject(OfferteService, ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
+	Set ..ExterneVerkoopService = $$$Inject(ExterneVerkoopService, ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefExterneVerkoopService())
+	Set ..CommonAPI = $$$Inject(CommonAPI, ##class(APPS.ApplicatieContext).Instance().GeefCommonAPI())
+	Set ..WinkelkarService = $$$Inject(WinkelkarService, ##class(DOM.EC.Winkelkar.impl.WinkelkarService).%New())
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -30,33 +56,32 @@
 		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
 	}
 	
-	#dim OfferteService As APPS.VKP.OfferteService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService()
-	
 	// Maak gekoppelde VanHoecke-offerte 
 	#dim VanHoeckeKlant As %String = OfferteVanHandel.GeefPersonality().GeefKlantID()
 	#dim VanHoeckeOfferte As APPS.VKP.Offerte = ..OfferteKopieerder.KopieerOfferte(OfferteVanHandel, VanHoeckeKlant, ##class(DOM.common.enu.Personality).VanHoecke())
-	Do OfferteService.KoppelAanOfferteVanHandel(VanHoeckeOfferte,OfferteVanHandel)
-	
-	// Leveradres instellen 
-	#dim ExterneVerkoopService As APPS.EC.Verkoop.ExterneVerkoopService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefExterneVerkoopService()
-	Do ExterneVerkoopService.StelInStandaardLeveradres(VanHoeckeOfferte)
+	Do ..OfferteService.KoppelAanOfferteVanHandel(VanHoeckeOfferte,OfferteVanHandel)
 
+	/// Oorspronkelijk leveradres behouden indien klant van hein (Hein personality)
+	If (OfferteVanHandel.GeefPersonalityID() '= ##class(DOM.common.enu.Personality).Hein())
+	{
+		Do ..ExterneVerkoopService.StelInStandaardLeveradres(VanHoeckeOfferte)
+	}
+
 	// DocumentReferenties aanpassen 
 	#dim DocumentReferenties As DOM.VKP.DocumentReferenties = VanHoeckeOfferte.GeefDocumentReferenties()
-	#dim DataService As APPS.common.DataService = ##class(APPS.ApplicatieContext).Instance().GeefCommonAPI().GeefDataService(OfferteVanHandel.GeefPersonalityID())
+	#dim DataService As APPS.common.DataService = ..CommonAPI.GeefDataService(OfferteVanHandel.GeefPersonalityID())
 	#dim KlantData As DOM.common.dto.KlantData = DataService.GeefKlantData(OfferteVanHandel.GeefKlantID())
 	Set DocumentReferenties.CommissieReferentie = ##class(TECH.StringUtils).Append(DocumentReferenties.CommissieReferentie, KlantData.Naam, ", ")
-
+	
 	// Winkelkar aan VH aanpassen 
-	#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ##class(DOM.EC.Winkelkar.Winkelkar).OpenId(VanHoeckeOfferte.WinkelkarID)
+	#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ..WinkelkarService.GeefWinkelkar(VanHoeckeOfferte.WinkelkarID)
 	Do Winkelkar.ZetPersonalityID(##class(DOM.common.enu.Personality).VanHoecke())
 	Do Winkelkar.ZetKlantID(OfferteVanHandel.GeefPersonality().GeefKlantID())
-	Set WinkelkarPrijsUpdater = ##class(APPS.EC.impl.WinkelkarPrijsUpdater).%New()
-	Do WinkelkarPrijsUpdater.Herbereken(Winkelkar)
-	Do Winkelkar.Save()
+	Do ..WinkelkarService.PrijsUpdaterHerbereken(Winkelkar)
+	Do ..WinkelkarService.BewaarWinkelkar(Winkelkar)
 		
 	Do VanHoeckeOfferte.PrijzenWerdenHerberekend()
-	do OfferteService.GeefOfferteBewaarder().Bewaar(VanHoeckeOfferte)
+	do ..OfferteService.GeefOfferteBewaarder().Bewaar(VanHoeckeOfferte)
 		
 	Quit VanHoeckeOfferte
 ]]></Implementation>