Index: APPS/Halux/PPS/TBXZaag/impl/Werkpost.cls.xml
===================================================================
diff -u -r2821 -r2823
--- APPS/Halux/PPS/TBXZaag/impl/Werkpost.cls.xml	(.../Werkpost.cls.xml)	(revision 2821)
+++ APPS/Halux/PPS/TBXZaag/impl/Werkpost.cls.xml	(.../Werkpost.cls.xml)	(revision 2823)
@@ -106,11 +106,12 @@
 
 <Method name="PrintLabel">
 <FormalSpec>ZaagID:%Integer,Output2Lijn:APPS.Halux.PPS.TBXZaag.enu.Output2Lijn,Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
+<ReturnType>BL.Sys.LabelPrinter</ReturnType>
 <Implementation><![CDATA[
 	Set Log=..Logger.Debug("PrintLabel", "ZaagID:"_ZaagID_", Output2Lijn:"_Output2Lijn_",Device:"_Device)
 	Set ZaagOpdracht=##class(APPS.Halux.PPS.TBXZaag.Opdrachten).%OpenId(ZaagID)
 	If '$isObject(ZaagOpdracht) $$$ThrowError($$$errObjectExpected,"Zaagopdracht wrong ID:"_ZaagID)
-	Do ##class(APPS.Halux.PPS.TBXZaag.impl.EtiketHelper).AfdrukkenOpdracht(ZaagOpdracht,Output2Lijn,Device)
+	Quit ##class(APPS.Halux.PPS.TBXZaag.impl.EtiketHelper).AfdrukkenOpdracht(ZaagOpdracht,Output2Lijn,Device)
 ]]></Implementation>
 </Method>
 
Index: BL/PPS/TBX/DocsV1.cls.xml
===================================================================
diff -u -r2815 -r2823
--- BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 2815)
+++ BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 2823)
@@ -75,6 +75,11 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="blLabelPrinter">
+<Type>BL.Sys.LabelPrinter</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="LabelKlantLayout">
 <Type>%String</Type>
 </Property>
@@ -553,6 +558,7 @@
 	Set sc=rs.Execute(..BatchID)
 	Set Count=0
 	For  Quit:'rs.Next()  Do
+	
 	. Set oQ=##class(DS.PPS.TBX.Queue).%OpenId(rs.Data("ID"))
 	. Quit:oQ.Status="PB" ; sequencelijnen met status "PB" worden overgeslagen
 	. Set VolgNr=rs.Data("Sequence")
@@ -566,9 +572,16 @@
 	. . If $D(EndNr) Quit:Count>EndNr
 	. . Do blLabelPrinter.Add(pxLabel)
 	Do:proc.PostProcess(blLabelPrinter) blLabelPrinter.Print2Bartender()
+	Set ..blLabelPrinter=blLabelPrinter
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLabelPrinter">
+<ReturnType>BL.Sys.LabelPrinter</ReturnType>
+<Implementation><![CDATA[	Quit ..blLabelPrinter
+]]></Implementation>
+</Method>
+
 <Method name="EtiketOne">
 <FormalSpec>oQ</FormalSpec>
 <Implementation><![CDATA[
Index: vhUnitTest/APPS/Halux/PPS/TBXZaag/TestWerkpost.cls.xml
===================================================================
diff -u -r2817 -r2823
--- vhUnitTest/APPS/Halux/PPS/TBXZaag/TestWerkpost.cls.xml	(.../TestWerkpost.cls.xml)	(revision 2817)
+++ vhUnitTest/APPS/Halux/PPS/TBXZaag/TestWerkpost.cls.xml	(.../TestWerkpost.cls.xml)	(revision 2823)
@@ -230,7 +230,15 @@
 			{
 				/* Te testen method */
 				/* Alleen het aantal wordt getest, de eigenlijke testing van de labels zit in BL.PPS.TBX.DocsV1 */
-				Do ..iWerkpost.PrintLabel(rsOpdrachten.GetData(1),##class(APPS.Halux.PPS.TBXZaag.enu.Output2Lijn).Lijn1(),$S(OpdrachtCnt#2:##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelBackup(),1:##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelApplicator()))
+				Set blLabelPrinter= ..iWerkpost.PrintLabel(rsOpdrachten.GetData(1),##class(APPS.Halux.PPS.TBXZaag.enu.Output2Lijn).Lijn1(),$S(OpdrachtCnt#2:##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelBackup(),1:##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelApplicator()))
+				Set it=blLabelPrinter.GeefIterator()
+				Set LabelCnt=0
+				While it.HasNext()
+				{
+					Set pxLabel=it.Next()
+					Set LabelCnt=LabelCnt+1
+				}
+				Do $$$AssertEquals(LabelCnt,1,"Aantal labels "_rsOpdrachten.GetData(1))
 				Set OpdrachtCnt=OpdrachtCnt+1
 			}
 		}
Index: APPS/Halux/PPS/TBXZaag/impl/EtiketHelper.cls.xml
===================================================================
diff -u -r2820 -r2823
--- APPS/Halux/PPS/TBXZaag/impl/EtiketHelper.cls.xml	(.../EtiketHelper.cls.xml)	(revision 2820)
+++ APPS/Halux/PPS/TBXZaag/impl/EtiketHelper.cls.xml	(.../EtiketHelper.cls.xml)	(revision 2823)
@@ -32,6 +32,7 @@
 <Method name="AfdrukkenOpdracht">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ZaagOpdracht:APPS.Halux.PPS.TBXZaag.Opdrachten,Output2Lijn:APPS.Halux.PPS.TBXZaag.enu.Output2Lijn,Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
+<ReturnType>BL.Sys.LabelPrinter</ReturnType>
 <Implementation><![CDATA[
 	Set LabelPrinter=..GeefLabelPrinter(Device)
 
@@ -58,6 +59,7 @@
 	{
 		Do blPrint.Etiketten(SequenceNr, SequenceNr)
 	}
+	Quit blPrint.GeefLabelPrinter()
 ]]></Implementation>
 </Method>
 
Index: WS/Halux/PPS/TBXZaagServer.cls.xml
===================================================================
diff -u -r2821 -r2823
--- WS/Halux/PPS/TBXZaagServer.cls.xml	(.../TBXZaagServer.cls.xml)	(revision 2821)
+++ WS/Halux/PPS/TBXZaagServer.cls.xml	(.../TBXZaagServer.cls.xml)	(revision 2823)
@@ -151,7 +151,7 @@
 <Implementation><![CDATA[
 	$$$TECHErrorTrapOn
 	Do ..GeefImplementatie(SessionKey, Werkpost)
-	Do ..iWerkpost.PrintLabel(ZaagID, Output2Lijn, Device)
+	Set bl=..iWerkpost.PrintLabel(ZaagID, Output2Lijn, Device)
 ]]></Implementation>
 </Method>