Index: vhUnitTest/DOM/AKP/ToeleveringService/GeefKlant/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/AKP/ToeleveringService/GeefKlant/Test.cls.xml	(revision 0)
+++ vhUnitTest/DOM/AKP/ToeleveringService/GeefKlant/Test.cls.xml	(revision 33209)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.AKP.ToeleveringService.GeefKlant.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test">
+<Implementation><![CDATA[
+	#dim ToeleveringAPIMock As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
+	
+	#dim ToeleveringID As TECH.String = "123456"
+	#dim ToeleveringService As DOM.AKP.ToeleveringService = ##class(DOM.AKP.impl.ToeleveringService).%New()
+	
+	#dim OrderAPIMock As vhTest.Mock.DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).MockInstance()
+	
+	#dim KlantID As %String = "UT_KlantID"
+	#dim VerkoopAPIMock As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
+	#dim KlantDummy As vhTest.Dummy.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New()
+	do VerkoopAPIMock.VerwachtMethodCall("GeefKlant",KlantID).DanReturn(KlantDummy)
+		
+	#dim OrderMock As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
+	do OrderMock.VerwachtMethodCall("GeefKlantID").DanReturn(KlantID)
+	do OrderAPIMock.VerwachtMethodCall("GeefOrder",1).DanReturn(OrderMock)
+	
+	#dim ToeleveringMock As vhTest.Mock.DOM.AKP.Toelevering = ##class(vhTest.Mock.DOM.AKP.Toelevering).%New()
+	do ToeleveringMock.VerwachtMethodCall("GeefOrderID").DanReturn(1)
+		
+	do ToeleveringAPIMock.VerwachtMethodCall("GeefToelevering",ToeleveringID).DanReturn(ToeleveringMock)
+	
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ToeleveringService.GeefKlant(ToeleveringID)
+	Do $$$AssertEquals(Klant,KlantDummy)
+	
+	Do ToeleveringAPIMock.Verifieer()
+	Do ToeleveringMock.Verifieer()
+	Do OrderAPIMock.Verifieer()
+	Do OrderMock.Verifieer()
+	Do VerkoopAPIMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: BL/PPS/TBX/DocsV1.cls.xml
===================================================================
diff -u -r32897 -r33209
--- BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 32897)
+++ BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 33209)
@@ -66,6 +66,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ToeleveringService">
+<Type>DOM.AKP.ToeleveringService</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="BatchID">
 <Type>%String</Type>
 <Parameter name="TRUNCATE" value="1"/>
@@ -137,7 +142,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>LabelPrinter:BL.Sys.LabelPrinter="",BatchService:APPS.Halux.common.BatchService="",ProductieSequentieRepository:APPS.Halux.common.ProductieSequentieRepository=""</FormalSpec>
+<FormalSpec>LabelPrinter:BL.Sys.LabelPrinter="",BatchService:APPS.Halux.common.BatchService="",ProductieSequentieRepository:APPS.Halux.common.ProductieSequentieRepository="",ToeleveringService:DOM.AKP.ToeleveringService</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -146,6 +151,7 @@
 	Set ..blLabelPrinter = $$$Implementation(LabelPrinter, ##class(BL.Sys.LabelPrinter).%New())
 	Set ..BatchService = $$$Implementation(BatchService, ##class(APPS.Halux.common.impl.BatchService).%New())
 	Set ..ProductieSequentieRepository = $$$Implementation(ProductieSequentieRepository, ##class(APPS.Halux.common.impl.ProductieSequentieRepository).%New())
+	Set ..ToeleveringService = $$$Inject(ToeleveringService,##class(DOM.AKP.impl.ToeleveringService).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -1544,18 +1550,15 @@
 	
 	#dim Toelevering As DOM.AKP.Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TOENr)
 	#dim OrderID As %String = Toelevering.GeefOrderID()
-	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID)
-	#dim KlantID As DOM.VKP.VanHoeckeKlantID = Order.GeefKlantID()
-	#dim KlantNr As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(KlantID)
 	
-	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(KlantID)
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ..ToeleveringService.GeefKlant(TOENr)
 	
 	Set pxLabel=##class(BL.PPS.TBX.sub.pxCommissie).%New()
 	Set pxLabel.Device = ..#LabelPrinter
 	Set pxLabel.Layout =..#LabelExtraCommissie
-	Set:(KlantID'="K||4875")&&(KlantID'="K||2671") pxLabel.Logo = "logo\Logo VHZwart.svg"
+	Set:(Klant.GeefID()'="K||4875")&&(Klant.GeefID()'="K||2671") pxLabel.Logo = "logo\Logo VHZwart.svg"
     Set pxLabel.KlantNaam = Klant.GeefNaam()
-    Set pxLabel.CommissieRef = ..CommissieRef(KlantNr,OrderID)
+    Set pxLabel.CommissieRef = ..CommissieRef(Klant.GeefCode(),OrderID)
     Set pxLabel.OrderNr = OrderID
     Set pxLabel.TOENr = TOENr
     Set pxLabel.Aantal = Aantal
Index: vhTest/Fake/DOM/VKP/VanHoeckeKlant.cls.xml
===================================================================
diff -u -r29059 -r33209
--- vhTest/Fake/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 29059)
+++ vhTest/Fake/DOM/VKP/VanHoeckeKlant.cls.xml	(.../VanHoeckeKlant.cls.xml)	(revision 33209)
@@ -9,6 +9,29 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>KlantID:%String="K||1234"</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..ID = KlantID
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefID">
+<ReturnType>DOM.common.PartijID</ReturnType>
+<Implementation><![CDATA[	quit ..ID
+]]></Implementation>
+</Method>
+
 <Method name="GeefLeverAdressen">
 <ReturnType>DOM.VKP.LeverAdresList</ReturnType>
 <Implementation><![CDATA[	quit ..LeverAdressen
Index: DOM/AKP/ToeleveringService.cls.xml
===================================================================
diff -u -r29059 -r33209
--- DOM/AKP/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 29059)
+++ DOM/AKP/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 33209)
@@ -10,6 +10,12 @@
 <ReturnType>%ListOfDataTypes</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="DOM.PM.enu.ProductType"</ReturnTypeParams>
 </Method>
+
+<Method name="GeefKlant">
+<Abstract>1</Abstract>
+<FormalSpec>ToeleveringID:%String</FormalSpec>
+<ReturnType>DOM.VKP.VanHoeckeKlant</ReturnType>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/DOM/AKP/ToeleveringService.cls.xml
===================================================================
diff -u -r29059 -r33209
--- vhTest/Mock/DOM/AKP/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 29059)
+++ vhTest/Mock/DOM/AKP/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 33209)
@@ -8,6 +8,13 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>DOM.AKP.ToeleveringService,Tools.Mock.MockClassBase</Super>
 
+<Method name="GeefKlant">
+<FormalSpec>ToeleveringID:%String</FormalSpec>
+<ReturnType>DOM.VKP.VanHoeckeKlant</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKlant",ToeleveringID)
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductTypes">
 <FormalSpec>ToeleveringID:%String</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
Index: vhUnitTest/APPS/OV/TestOrderInstellingenService.cls.xml
===================================================================
diff -u -r29059 -r33209
--- vhUnitTest/APPS/OV/TestOrderInstellingenService.cls.xml	(.../TestOrderInstellingenService.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/OV/TestOrderInstellingenService.cls.xml	(.../TestOrderInstellingenService.cls.xml)	(revision 33209)
@@ -29,8 +29,7 @@
 		Set OrderInstellingenService = ##class(APPS.OV.impl.OrderInstellingenService).%New()
 		Set Rekening = ##class(APPS.OV.impl.data.VoorkeuzeBoekhoudkundigeRekening).%New(800000,"GeenBoekhoudkundigeRekening")
 		Do Rekening.Save()
-	}Catch Exception
-	{
+	} Catch {
 		#dim E As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do $$$AssertEquals(E.GeefOmschrijving(),"Geen correcte boekhoudkundige rekening : 800000 : GeenBoekhoudkundigeRekening","Correcte foutmelding voor niet boekhoudkundige rekening.")
 		Set FoutGeraised = 1
Index: vhUnitTest/BL/PPS/TBX/DocsV1/EtikettenCommissieOne/Test.cls.xml
===================================================================
diff -u -r32923 -r33209
--- vhUnitTest/BL/PPS/TBX/DocsV1/EtikettenCommissieOne/Test.cls.xml	(.../Test.cls.xml)	(revision 32923)
+++ vhUnitTest/BL/PPS/TBX/DocsV1/EtikettenCommissieOne/Test.cls.xml	(.../Test.cls.xml)	(revision 33209)
@@ -5,58 +5,54 @@
 
 <Method name="Test: Logo op etiket wordt gedefault naar het vanhoecke logo">
 <Implementation><![CDATA[
-	Do ..InitMocks("K||1234")
+	#dim ToeleveringId As %String = 333444
+	#dim ToeleveringService As vhTest.Mock.DOM.AKP.ToeleveringService = ..InitMocks("K||1234",ToeleveringId)
 	
-	Set DocsV1 = ##class(BL.PPS.TBX.DocsV1).%New()
-	#dim Etiket As BL.PPS.TBX.sub.pxCommissie = DocsV1.EtikettenCommissieOne(11,1,"")
+	Set DocsV1 = ##class(BL.PPS.TBX.DocsV1).%New(,,,ToeleveringService)
+	#dim Etiket As BL.PPS.TBX.sub.pxCommissie = DocsV1.EtikettenCommissieOne(ToeleveringId,1,"")
 	
 	do $$$AssertEquals(Etiket.Logo,"logo\Logo VHZwart.svg")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Haefele-NL heeft geen logo">
 <Implementation><![CDATA[
-	Do ..InitMocks(##class(DOM.VKP.enu.Klant).HaefeleNederland())
+	#dim ToeleveringId As %String = 345678
+	#dim ToeleveringService As vhTest.Mock.DOM.AKP.ToeleveringService =..InitMocks(##class(DOM.VKP.enu.Klant).HaefeleNederland(),ToeleveringId)
 	
-	set DocsV1 = ##class(BL.PPS.TBX.DocsV1).%New()
-	#dim Etiket As BL.PPS.TBX.sub.pxCommissie = DocsV1.EtikettenCommissieOne(11,1,"")
+	set DocsV1 = ##class(BL.PPS.TBX.DocsV1).%New(,,,ToeleveringService)
+	#dim Etiket As BL.PPS.TBX.sub.pxCommissie = DocsV1.EtikettenCommissieOne(ToeleveringId,1,"")
 	
 	do $$$AssertEquals(Etiket.Logo,"")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Haefele-BE heeft geen logo">
 <Implementation><![CDATA[
-	Do ..InitMocks(##class(DOM.VKP.enu.Klant).HaefeleBelgie())
+	#dim ToeleveringId As %String = 321123
+	#dim ToeleveringService As vhTest.Mock.DOM.AKP.ToeleveringService = ..InitMocks(##class(DOM.VKP.enu.Klant).HaefeleBelgie(),ToeleveringId)
 	
-	set DocsV1 = ##class(BL.PPS.TBX.DocsV1).%New()
-	#dim Etiket As BL.PPS.TBX.sub.pxCommissie = DocsV1.EtikettenCommissieOne(11,1,"")
+	set DocsV1 = ##class(BL.PPS.TBX.DocsV1).%New(,,,ToeleveringService)
+	#dim Etiket As BL.PPS.TBX.sub.pxCommissie = DocsV1.EtikettenCommissieOne(ToeleveringId,1,"")
 	
 	do $$$AssertEquals(Etiket.Logo,"")
 ]]></Implementation>
 </Method>
 
 <Method name="InitMocks">
-<FormalSpec>KlantID:%String</FormalSpec>
+<FormalSpec>KlantID:%String,ToeleveringId:%String</FormalSpec>
 <Private>1</Private>
+<ReturnType>DOM.AKP.ToeleveringService</ReturnType>
 <Implementation><![CDATA[
-	#dim ToeleveringAPIStub As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
-	#dim OrderAPIStub As vhTest.Mock.DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).MockInstance()
+	set ToeleveringStub = ##class(vhTest.Mock.DOM.AKP.Toelevering).%New()
+	do ToeleveringStub.IndienMethodCall("GeefOrderID").DanReturn(222222)
 	
-	#dim VerkoopAPIStub As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
-	#dim KlantStub As vhTest.Mock.DOM.VKP.VanHoeckeKlant = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New()
-	do KlantStub.IndienMethodCall("GeefNaam").DanReturn("EenNaam")
-	do VerkoopAPIStub.IndienMethodCall("GeefKlant",KlantID).DanReturn(KlantStub)
-		
-	#dim OrderStub As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
-	do OrderStub.IndienMethodCall("GeefKlantID").DanReturn(KlantID)
-	do OrderAPIStub.IndienMethodCall("GeefOrder",1).DanReturn(OrderStub)
+	#dim ToeleveringAPI As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
+	do ToeleveringAPI.IndienMethodCall("GeefToelevering",ToeleveringId).DanReturn(ToeleveringStub)
 	
-	#dim ToeleveringStub As vhTest.Mock.DOM.AKP.Toelevering = ##class(vhTest.Mock.DOM.AKP.Toelevering).%New()
-	
-	do ToeleveringStub.IndienMethodCall("GeefOrderID").DanReturn(1)
-		
-	do ToeleveringAPIStub.IndienMethodCall("GeefToelevering",11).DanReturn(ToeleveringStub)
+	#dim ToeleveringService As vhTest.Mock.DOM.AKP.ToeleveringService = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+	do ToeleveringService.IndienMethodCall("GeefKlant",ToeleveringId).DanReturn(##class(vhTest.Fake.DOM.VKP.VanHoeckeKlant).%New(KlantID))
+	Quit ToeleveringService
 ]]></Implementation>
 </Method>
 </Class>
Index: DOM/AKP/impl/ToeleveringService.cls.xml
===================================================================
diff -u -r29059 -r33209
--- DOM/AKP/impl/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 29059)
+++ DOM/AKP/impl/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 33209)
@@ -43,6 +43,20 @@
 <Implementation><![CDATA[	Do ..ProductTypeArray.SetAt(1,ProductType)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefKlant">
+<FormalSpec>ToeleveringID:%String</FormalSpec>
+<ReturnType>DOM.VKP.VanHoeckeKlant</ReturnType>
+<Implementation><![CDATA[
+	#dim Toelevering As DOM.AKP.Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(ToeleveringID)
+	#dim OrderID As %String = Toelevering.GeefOrderID()
+	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID)
+	#dim KlantID As DOM.VKP.VanHoeckeKlantID = Order.GeefKlantID()
+	#dim KlantNr As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(KlantID)
+	
+	Quit ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(KlantID)
+]]></Implementation>
+</Method>
 </Class>