Index: APPS/VKP/impl/OfferteDocumentReferentiesBepaler.cls.xml
===================================================================
diff -u -r32752 -r32767
--- APPS/VKP/impl/OfferteDocumentReferentiesBepaler.cls.xml	(.../OfferteDocumentReferentiesBepaler.cls.xml)	(revision 32752)
+++ APPS/VKP/impl/OfferteDocumentReferentiesBepaler.cls.xml	(.../OfferteDocumentReferentiesBepaler.cls.xml)	(revision 32767)
@@ -42,6 +42,12 @@
 	If Order.GeefOorsprong() = ##class(BL.Flow.Offerte.enu.Oorsprong).UniShop() {
 		#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(Order.GeefEDINummer())
 		Do OfferteLijst.Insert(Offerte)
+		
+		While(..OfferteService.HeeftOfferteVanVH(Offerte)) {
+			#dim GekoppeldeOfferte As APPS.VKP.Offerte = ..OfferteService.GeefOfferteVanVH(Offerte)
+			Do OfferteLijst.InsertAt(GekoppeldeOfferte,1)   ; Vooraan toevoegen, want OfferteVanVH moet uiteindelijk als eerste staan 
+			Set Offerte = GekoppeldeOfferte
+		}
 	}
 	Quit ##class(TECH.ListIterator).%New(OfferteLijst)
 ]]></Implementation>
Index: vhUnitTest/APPS/VKP/OfferteDocumentReferentiesBepaler/GeefDocumentReferenties/Test.cls.xml
===================================================================
diff -u -r32752 -r32767
--- vhUnitTest/APPS/VKP/OfferteDocumentReferentiesBepaler/GeefDocumentReferenties/Test.cls.xml	(.../Test.cls.xml)	(revision 32752)
+++ vhUnitTest/APPS/VKP/OfferteDocumentReferentiesBepaler/GeefDocumentReferenties/Test.cls.xml	(.../Test.cls.xml)	(revision 32767)
@@ -8,6 +8,11 @@
 <Default>999</Default>
 </Parameter>
 
+<Parameter name="KlantOfferteID">
+<Type>%Integer</Type>
+<Default>998</Default>
+</Parameter>
+
 <Parameter name="VanHoeckeOrderRef">
 <Type>%String</Type>
 <Default>UT_VanHoeckeOrderRef</Default>
@@ -23,11 +28,31 @@
 <Default>UT_VanHoeckeCommRef</Default>
 </Parameter>
 
+<Parameter name="KlantOfferteOrderRef">
+<Type>%String</Type>
+<Default>UT_KlantOFFOrderRef</Default>
+</Parameter>
+
+<Parameter name="KlantOfferteKlantOrderNummer">
+<Type>%String</Type>
+<Default>UT_KlantOFFKlantOrderNummer</Default>
+</Parameter>
+
+<Parameter name="KlantOfferteCommRef">
+<Type>%String</Type>
+<Default>UT_KlantOFFCommRef</Default>
+</Parameter>
+
 <Parameter name="VHKlantID">
 <Type>%String</Type>
-<Default>UT_KlantID</Default>
+<Default>UT_VHKlantID</Default>
 </Parameter>
 
+<Parameter name="KlantVanKlantID">
+<Type>%String</Type>
+<Default>UT_Klant_KlantID</Default>
+</Parameter>
+
 <Property name="VanHoeckeOfferte">
 <Type>vhTest.Mock.APPS.VKP.Offerte</Type>
 </Property>
@@ -36,11 +61,20 @@
 <Type>DOM.VKP.DocumentReferenties</Type>
 </Property>
 
+<Property name="OfferteVanKlant">
+<Type>vhTest.Mock.APPS.VKP.Offerte</Type>
+</Property>
+
+<Property name="DocRefsOfferteVanKlant">
+<Type>DOM.VKP.DocumentReferenties</Type>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(aTestName)
 	Do ..ZetMockVanHoeckeOfferte()
+	Do ..ZetMockOfferteVanKlant()
 	Do ..ZetMockOfferteService()
 ]]></Implementation>
 </Method>
@@ -62,6 +96,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestOfferteKlantVanKlant">
+<Implementation><![CDATA[
+	// Assign 
+	#dim OrderMock As DOM.VKP.Order = ..GeefOrder(##class(BL.Flow.Offerte.enu.Oorsprong).UniShop(), ..#KlantOfferteID)
+	Do ..VanHoeckeOfferte.IndienMethodCall("GeefDocumentReferenties").DanReturn(..DocRefsVanHoeckeOfferte)
+	Do ..OfferteVanKlant.IndienMethodCall("GeefDocumentReferenties").DanReturn(..DocRefsOfferteVanKlant)
+
+	#dim OfferteServiceStub As APPS.VKP.OfferteService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService()
+	Do OfferteServiceStub.IndienMethodCall("HeeftOfferteVanVH",..OfferteVanKlant).DanReturn($$$True)
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanVH",..OfferteVanKlant).DanReturn(..VanHoeckeOfferte)
+
+	
+	// Act 
+	Set OfferteDocumentReferentiesBepaler = ##class(APPS.VKP.impl.OfferteDocumentReferentiesBepaler).%New()
+	#dim List As %ListOfObjects = OfferteDocumentReferentiesBepaler.GeefDocumentReferenties(OrderMock)
+	
+	// Assert 
+	If $$$AssertEquals(List.Count(), 2) {
+		Do ..AssertDocRefsVanHoeckeOfferte(List.GetAt(1))
+		Do ..AssertDocRefsOfferteVanKlant(List.GetAt(2))
+	}
+]]></Implementation>
+</Method>
+
 <Method name="TestGeenUnishopOfferte">
 <Implementation><![CDATA[
 	#dim OrderMock As DOM.VKP.Order = ..GeefOrder(##class(BL.Flow.Offerte.enu.Oorsprong).EDIBestand(), ..#VanHoeckeOfferteID)   ; "EDI" bewust gekozen, omdat Alpnach initieel besteld via EDI, maar het Order wordt weldegelijk gecreerd vanuit de Oorsprong Unishop. 
@@ -112,6 +170,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="AssertDocRefsOfferteVanKlant">
+<FormalSpec>DocRefs:APPS.VKP.impl.OfferteDocumentReferentiesBepaler.DocumentReferenties</FormalSpec>
+<Implementation><![CDATA[
+	If $$$AssertEquals($ClassName(DocRefs),"APPS.VKP.impl.OfferteDocumentReferentiesBepaler.DocumentReferenties") {
+		Do $$$AssertEquals(DocRefs.OrderReferentie    ,..#KlantOfferteOrderRef)
+		Do $$$AssertEquals(DocRefs.KlantOrderNummer   ,..#KlantOfferteKlantOrderNummer)
+		Do $$$AssertEquals(DocRefs.CommissieReferentie,..#KlantOfferteCommRef)
+		Do $$$AssertEquals(DocRefs.KlantID,..#KlantVanKlantID)
+	}
+]]></Implementation>
+</Method>
+
 <Method name="ZetMockVanHoeckeOfferte">
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -125,12 +195,28 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetMockOfferteVanKlant">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..DocRefsOfferteVanKlant = ##class(DOM.VKP.DocumentReferenties).%New()
+	Set ..DocRefsOfferteVanKlant.OrderReferentie     = ..#KlantOfferteOrderRef
+	Set ..DocRefsOfferteVanKlant.KlantOrderNummer    = ..#KlantOfferteKlantOrderNummer
+	Set ..DocRefsOfferteVanKlant.CommissieReferentie = ..#KlantOfferteCommRef
+	
+	Set ..OfferteVanKlant = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do ..OfferteVanKlant.IndienMethodCall("GeefKlantID").DanReturn(..#KlantVanKlantID)
+]]></Implementation>
+</Method>
+
 <Method name="ZetMockOfferteService">
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim VerkoopAPIFake As vhTest.Mock.APPS.VKP.VerkoopAPI = ##class(vhTest.Mock.APPS.VKP.VerkoopAPI).MockInstance()
 	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
 	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",..#VanHoeckeOfferteID).DanReturn(..VanHoeckeOfferte)
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte",..#KlantOfferteID).DanReturn(..OfferteVanKlant)
+	Do OfferteServiceStub.IndienMethodCall("HeeftOfferteVanVH",..VanHoeckeOfferte).DanReturn($$$False)
+	Do OfferteServiceStub.IndienMethodCall("HeeftOfferteVanVH",..OfferteVanKlant).DanReturn($$$False)   ; Deze wordt later aangepast.  CODE TEST SMELL :-( 
 	Do VerkoopAPIFake.IndienMethodCall("GeefOfferteService").DanReturn(OfferteServiceStub)
 ]]></Implementation>
 </Method>