Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/UnishopBesteller/PlaatsBestelling/Test.cls.xml
===================================================================
diff -u -r40113 -r40114
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/UnishopBesteller/PlaatsBestelling/Test.cls.xml	(.../Test.cls.xml)	(revision 40113)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/UnishopBesteller/PlaatsBestelling/Test.cls.xml	(.../Test.cls.xml)	(revision 40114)
@@ -15,11 +15,12 @@
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID,"").DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(1)
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("WisOfferte","OfferteID").ExactAantalKeer(0)
-	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefID").DanReturn("OfferteID")
 	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Do OfferteServiceMock.IndienMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
+	Do OfferteServiceMock.IndienMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteMock)
 	Do OfferteServiceMock.IndienMethodCall("VoegToeProduct").DanDoeNiks()
-	Do OfferteServiceMock.IndienMethodCall("VoegToeMaatwerk",OfferteStub,"","","","").DanDoeNiks()
+	Do OfferteServiceMock.IndienMethodCall("VoegToeMaatwerk",OfferteMock,"","","","").DanDoeNiks()
 	Set ProductConverterStub = ##class(vhTest.Mock.APPS.EDI.common.impl.ProductConverter).%New()
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
 
@@ -74,9 +75,10 @@
 	Set Aanvraag.Order.Lijnen = Orderlijnen
 	
 	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceMock.IndienMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
-	Do OfferteServiceMock.IndienMethodCall("VoegToeMaatwerk",OfferteStub,"","","","").ExactAantalKeer(2)
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefID").DanReturn("OfferteID")
+	Do OfferteServiceMock.IndienMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteMock)
+	Do OfferteServiceMock.IndienMethodCall("VoegToeMaatwerk",OfferteMock,"","","","").ExactAantalKeer(2)
 		
 	Set FalendeBestelService = ##class(vhUnitTest.APPS.EDI.Bestel.impl.BestelService.PlaatsBestelling.FalendeBestelService).%New(ExterneVerkoopServiceMock,,OfferteServiceMock,,DummyHoofdingDto)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = FalendeBestelService.MaakOfferte(Aanvraag)
@@ -108,9 +110,10 @@
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
 	
 	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
-	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,"","","","").ExactAantalKeer(1)
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefID").DanReturn("OfferteID")
+	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteMock)
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteMock,"","","","").ExactAantalKeer(1)
 	
 	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock,,DummyHoofdingDto)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
@@ -141,9 +144,10 @@
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
 	
 	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
-	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,"","","","").ExactAantalKeer(1)
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefID").DanReturn("OfferteID")
+	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteMock)
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteMock,"","","","").ExactAantalKeer(1)
 	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock,,DummyHoofdingDto)
 	
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
@@ -171,9 +175,10 @@
 	Do ProductConverterStub.IndienMethodCall("Convert",Aanvraag.Order.Lijnen.GetAt(1).Product,$$$ElkeWaarde).DanReturn($$$NULLOREF)
 	
 	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
-	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,"","","","").ExactAantalKeer(1)
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefID").DanReturn("OfferteID")
+	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteMock)
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteMock,"","","","").ExactAantalKeer(1)
 	
 	Set WinkelkarStub = ##class(DOM.EC.Winkelkar.Winkelkar).%New("WinkelkarID")
 	Set VroegsteLeverdatumBepalerMock = ##class(vhTest.Mock.APPS.EC.impl.VroegsteLeverdatumBepaler).%New()
@@ -209,9 +214,10 @@
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
 	
 	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
-	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,"","","","").ExactAantalKeer(2)
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefID").DanReturn("OfferteID")
+	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteMock)
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteMock,"","","","").ExactAantalKeer(2)
 	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock,,DummyHoofdingDto)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
 	
@@ -237,8 +243,9 @@
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
 	
 	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,"","","","").ExactAantalKeer(0)
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefID").DanReturn("OfferteID")
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteMock,"","","","").ExactAantalKeer(0)
 	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock,,DummyHoofdingDto)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
 	
@@ -265,8 +272,9 @@
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
 	
 	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	#dim OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,"","","","").ExactAantalKeer(0)
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefID").DanReturn("OfferteID")
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteMock,"","","","").ExactAantalKeer(0)
 	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock,,DummyHoofdingDto)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
 	
@@ -294,9 +302,10 @@
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
 	
 	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	#dim OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
-	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,"","","","").ExactAantalKeer(1)
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefID").DanReturn("OfferteID")
+	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteMock)
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteMock,"","","","").ExactAantalKeer(1)
 	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock,,DummyHoofdingDto)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
 	
@@ -326,9 +335,10 @@
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
 	
 	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
-	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,"","","","").ExactAantalKeer(3)
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefID").DanReturn("OfferteID")
+	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteMock)
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteMock,"","","","").ExactAantalKeer(3)
 	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock,,DummyHoofdingDto)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
 	
@@ -535,9 +545,10 @@
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanException($$$DummyException)
 	
 	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceMock.IndienMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
-	Do OfferteServiceMock.IndienMethodCall("VoegToeMaatwerk",OfferteStub,"","","","").ExactAantalKeer(2)
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefID").DanReturn("OfferteID")
+	Do OfferteServiceMock.IndienMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteMock)
+	Do OfferteServiceMock.IndienMethodCall("VoegToeMaatwerk",OfferteMock,"","","","").ExactAantalKeer(2)
 	
 	#dim UnishopBesteller As APPS.EDI.Bestel.impl.BestelService.UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock,ProductConverterStub,OfferteServiceMock,,DummyHoofdingDto)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
@@ -601,18 +612,17 @@
 
 <Method name="Test: een niet-validerende lijn mag niet geconverteerd worden">
 <Implementation><![CDATA[
-	
-
 	Set DummyHoofdingDto = ##class(APPS.EC.dto.Hoofding).%New()
 	Set ExterneVerkoopServiceMock = ##class(vhTest.Mock.APPS.EC.Verkoop.ExterneVerkoopService).%New()
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("MaakOfferte",..#KlantID,..#PersonalityID,"").DanReturn(##class(APPS.EC.dto.OfferteIDEnWinkelkarID).%New("OfferteID","WinkelkarID"))
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("ZetOfferteHoofding","OfferteID",DummyHoofdingDto).ExactAantalKeer(1)
 	Do ExterneVerkoopServiceMock.VerwachtMethodCall("WisOfferte","OfferteID").ExactAantalKeer(1)
-	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteMock.IndienMethodCall("GeefID").DanReturn("OfferteID")
 	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Do OfferteServiceMock.IndienMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
+	Do OfferteServiceMock.IndienMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteMock)
 	Do OfferteServiceMock.IndienMethodCall("VoegToeProduct").DanDoeNiks()
-	Do OfferteServiceMock.IndienMethodCall("VoegToeMaatwerk",OfferteStub,"","","").DanDoeNiks()
+	Do OfferteServiceMock.IndienMethodCall("VoegToeMaatwerk",OfferteMock,"","","").DanDoeNiks()
 	Set ProductConverterStub = ##class(vhTest.Mock.APPS.EDI.common.impl.ProductConverter).%New()
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
 	
Index: APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml
===================================================================
diff -u -r40113 -r40114
--- APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml	(.../UnishopBesteller.cls.xml)	(revision 40113)
+++ APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml	(.../UnishopBesteller.cls.xml)	(revision 40114)
@@ -102,14 +102,14 @@
 		
 		try {
 			Do ..ZetHoofding(OfferteDto,Aanvraag.Order,Aanvraag.Header.PersonalityID)
-			Do ..VoegToeLijnen(OfferteDto.OfferteID,Aanvraag.Order)
+			Do ..VoegToeLijnen(Offerte.GeefID(),Aanvraag.Order)
 			
 			Do ..ZetLeveringInformatie(Aanvraag, OfferteDto)
 			
-			Set Resultaat = ##class(APPS.EDI.Bestel.BestelService.PlaatsBestelling.Resultaat).%New(OfferteDto.OfferteID)
+			Set Resultaat = ##class(APPS.EDI.Bestel.BestelService.PlaatsBestelling.Resultaat).%New(Offerte.GeefID())
 		} catch {
 			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-			do ..ExterneVerkoopService.WisOfferte(OfferteDto.OfferteID)
+			do ..ExterneVerkoopService.WisOfferte(Offerte.GeefID())
 		 	set Resultaat = ##class(APPS.EDI.Bestel.BestelService.PlaatsBestelling.Resultaat).%New()
 		 	set Resultaat.Exceptie = Exception
 		}