Index: vhTest/Fake/APPS/TRANSP/GLS/GLSv1/impl/EtiketPrinter.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/TRANSP/GLS/GLSv1/impl/EtiketPrinter.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/TRANSP/GLS/GLSv1/impl/EtiketPrinter.cls.xml	(revision 40757)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter">
+<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>APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter</Super>
+
+<Method name="AddEtiket">
+<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="GeefEtiket">
+<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</FormalSpec>
+<ReturnType>BL.Sys.pxLabel</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="PrintEtiket">
+<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="PrintEtiketen">
+<FormalSpec>Responses:%ListOfObjects,Computernaam:%String,LabelPrinterID:%String</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="PrintEtiketten">
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/GLS/impl/EtiketService.cls.xml
===================================================================
diff -u -r40755 -r40757
--- APPS/TRANSP/GLS/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 40755)
+++ APPS/TRANSP/GLS/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 40757)
@@ -8,14 +8,20 @@
 <Private>1</Private>
 </Property>
 
+<Property name="EtiketPrinter">
+<Type>APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>TransportAPI:APPS.TRANSP.TransportAPI</FormalSpec>
+<FormalSpec>TransportAPI:APPS.TRANSP.TransportAPI,EtiketPrinter:APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..TransportAPI = $$$Inject(TransportAPI,##class(DOM.DomeinContext).Instance().GeefTransportAPI())
+	Set ..EtiketPrinter = $$$Inject(EtiketPrinter,##class(APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -25,32 +31,19 @@
 <Implementation><![CDATA[
 	#dim Computernaam As %String = $Piece(##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam(),".",1)
 	Set Computernaam = ##class(TECH.StringUtils).ToUpper(Computernaam)
-	#dim LabelPrinter As APPS.common.Print.LabelPrinter = ##class(APPS.ApplicatieContext).Instance().GeefPrintAPI().GeefLabelPrinter("TRANSP_DI1",Computernaam)
 	
-	
+	Set Responses = ##class(%ListOfObjects).%New()
 	#dim DistributeurDataIDs As %ListOfDataTypes = Levering.GeefDistributeurDataIDs()
 	Set DistributeurDataIDIt = ##class(TECH.ListIterator).%New(DistributeurDataIDs)
 	While DistributeurDataIDIt.HasNext()
 	{
 		#Dim DistributeurDataID as %String = DistributeurDataIDIt.Next()
 		#dim DistributeurData As APPS.TRANSP.GLS.data.VerzendData = ..TransportAPI.GeefDistributeurData(DistributeurDataID)
-		#dim Response As APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response = DistributeurData.Response
-		#Dim Etiket as BL.Sys.pxLabel = ..GeefGLSEtiket(Response)
-		Do LabelPrinter.AddLabel(Etiket)
+		Do Responses.Insert(DistributeurData.Response)
 	}
-	Do LabelPrinter.PrintLabels()
+	Do ..EtiketPrinter.PrintEtiketten(Responses,Computernaam,"TRANSP_DI1")
 ]]></Implementation>
 </Method>
-
-<Method name="GeefGLSEtiket">
-<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</FormalSpec>
-<ReturnType>BL.Sys.pxLabel</ReturnType>
-<Implementation><![CDATA[
-	Set EtiketBouwerResponseVisitor = ##class(APPS.TRANSP.GLS.GLSv1.impl.EtiketBouwerResponseVisitor).%New()
-	Do Response.Accept(EtiketBouwerResponseVisitor)
-	Quit EtiketBouwerResponseVisitor.GeefEtiket()
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/TRANSP/GLS/GLSv1/impl/EtiketPrinter.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/TRANSP/GLS/GLSv1/impl/EtiketPrinter.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/TRANSP/GLS/GLSv1/impl/EtiketPrinter.cls.xml	(revision 40757)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter">
+<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
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefEtiket">
+<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</FormalSpec>
+<ReturnType>BL.Sys.pxLabel</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefEtiket",Response)
+]]></Implementation>
+</Method>
+
+<Method name="PrintEtiket">
+<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response,Computernaam:%String,LabelPrinterID:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("PrintEtiket",Response,Computernaam,LabelPrinterID)
+]]></Implementation>
+</Method>
+
+<Method name="PrintEtiketten">
+<FormalSpec>Responses:%ListOfObjects,Computernaam:%String,LabelPrinterID:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("PrintEtiketten",Responses,Computernaam,LabelPrinterID)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/GLS/GLSv1/impl/EtiketPrinter.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/GLS/GLSv1/impl/EtiketPrinter.cls.xml	(revision 0)
+++ APPS/TRANSP/GLS/GLSv1/impl/EtiketPrinter.cls.xml	(revision 40757)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter">
+<Super>TECH.Mockable</Super>
+
+<Property name="Computernaam">
+<Type>%String</Type>
+</Property>
+
+<Property name="LabelPrinterID">
+<Type>%String</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Computernaam:%String,LabelPrinterID:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="PrintEtiket">
+<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response,Computernaam:%String,LabelPrinterID:%String</FormalSpec>
+<Implementation><![CDATA[
+	#Dim LabelPrinter as APPS.common.Print.LabelPrinter
+	Set LabelPrinter = ##class(APPS.ApplicatieContext).Instance().GeefPrintAPI().GeefLabelPrinter(LabelPrinterID,Computernaam)
+	Do LabelPrinter.PrintLabel(..GeefEtiket(Response))
+]]></Implementation>
+</Method>
+
+<Method name="PrintEtiketten">
+<FormalSpec>Responses:%ListOfObjects,Computernaam:%String,LabelPrinterID:%String</FormalSpec>
+<Implementation><![CDATA[
+	#Dim LabelPrinter as APPS.common.Print.LabelPrinter
+	Set LabelPrinter = ##class(APPS.ApplicatieContext).Instance().GeefPrintAPI().GeefLabelPrinter(LabelPrinterID,Computernaam)
+	set ResponseIterator = ##class(TECH.ListIterator).%New(Responses)
+	While ResponseIterator.HasNext(){
+		Do LabelPrinter.AddLabel(..GeefEtiket(ResponseIterator.Next()))		
+	}
+	Do LabelPrinter.PrintLabels()
+]]></Implementation>
+</Method>
+
+<Method name="GeefEtiket">
+<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</FormalSpec>
+<ReturnType>BL.Sys.pxLabel</ReturnType>
+<Implementation><![CDATA[
+	Set EtiketBouwerResponseVisitor = ##class(APPS.TRANSP.GLS.GLSv1.impl.EtiketBouwerResponseVisitor).%New()
+	Do Response.Accept(EtiketBouwerResponseVisitor)
+	Quit EtiketBouwerResponseVisitor.GeefEtiket()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/APPS/TRANSP/GLS/impl/EtiketService.cls.xml
===================================================================
diff -u -r40755 -r40757
--- vhTest/Mock/APPS/TRANSP/GLS/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 40755)
+++ vhTest/Mock/APPS/TRANSP/GLS/impl/EtiketService.cls.xml	(.../EtiketService.cls.xml)	(revision 40757)
@@ -9,13 +9,6 @@
 <Super>APPS.TRANSP.GLS.impl.EtiketService,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
-<Method name="GeefGLSEtiket">
-<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</FormalSpec>
-<ReturnType>BL.Sys.pxLabel</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefGLSEtiket",Response)
-]]></Implementation>
-</Method>
-
 <Method name="PrintEtikettenVoorLevering">
 <FormalSpec>Levering:DOM.TRANSP.Levering</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("PrintEtikettenVoorLevering",Levering)