Index: BL/PPS/TBX/sub/pxLabelV1.cls.xml
===================================================================
diff -u -r3660 -r3664
--- BL/PPS/TBX/sub/pxLabelV1.cls.xml	(.../pxLabelV1.cls.xml)	(revision 3660)
+++ BL/PPS/TBX/sub/pxLabelV1.cls.xml	(.../pxLabelV1.cls.xml)	(revision 3664)
@@ -125,6 +125,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="TiponCountAfter">
+<Description>
+Count of tipons needed after this label</Description>
+<InitialExpression>0</InitialExpression>
+<Private>1</Private>
+</Property>
+
 <Property name="Spoelbak">
 <Type>%Boolean</Type>
 <InitialExpression>0</InitialExpression>
@@ -147,9 +154,14 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="ToonNakomendeTipons">
+<Type>%Boolean</Type>
+</Property>
+
 <Method name="WriteRow">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	If (..TiponCountAfter>0)&&..ToonNakomendeTipons { Set ..Opm1 = "Eindig met "_..TiponCountAfter_" TIP-ONs"_$S($L(..Opm1)>0:","_..Opm1,1:"") }
 	;TBXPROD ;BATCHID`$E($G(C("TOENR")),4,6)`DOSNR`VOLGNR`QTY`KB`$G(C("LD"))-24`BreedteB`KR`RH`RHnet`BreedteR`BOR`KL`ZW`LD`$G(C("IB"))`OPM`PICT`BM`VHOSS
 	Write ..BatchID,*9,..TOENr,*9,..DOSNr,*9,..VolgNr,*9,..Qty,*9,..KB,*9,..BodemDiepte,*9,..BreedteB,*9,..RugInfo,*9,..RWHInfo,*9,..KL,*9,..ZW,*9,..LD,*9,..IB,*9,..Opm1,*9,..Picture,*9,..VHossID
 	Write *9
@@ -178,5 +190,17 @@
 <Implementation><![CDATA[	Set ..TiponCount = count
 ]]></Implementation>
 </Method>
+
+<Method name="SetTiponCountAfter">
+<FormalSpec>count:%Integer</FormalSpec>
+<Implementation><![CDATA[	Set ..TiponCountAfter = count
+]]></Implementation>
+</Method>
+
+<Method name="GetTiponCountAfter">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit ..TiponCountAfter
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: BL/PPS/TBX/DocsV1.cls.xml
===================================================================
diff -u -r3660 -r3664
--- BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 3660)
+++ BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 3664)
@@ -561,8 +561,8 @@
 	Do:..HogePrioriteit blLabelPrinter.ZetHogePrioriteit()
 	Set rs=##class(%ResultSet).%New("BL.PPS.TBX.Sequencer:GetSequence")
 	Set sc=rs.Execute(..BatchID)
+	Set VorigLabel = ##class(BL.PPS.TBX.sub.pxLabelV1).%New() // Dummy plaatsen
 	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")
@@ -571,10 +571,13 @@
 	. Quit:'$isObject(pxLabel)
 	. Set pxLabel.VolgNr = VolgNr
 	. If proc.Process(.pxLabel) Do
+	. . Set pxLabel.ToonNakomendeTipons = 1 // Zorgen dat het laatste label de nakomende tipons toont
+	. . Set VorigLabel.ToonNakomendeTipons = 0
 	. . If $D(StartNr) Quit:VolgNr<StartNr
 	. . If $D(EndNr) Quit:VolgNr>EndNr
 	. . Do blLabelPrinter.Add(pxLabel)
-	Do:proc.PostProcess(blLabelPrinter) blLabelPrinter.Print2Bartender()
+	. . Set VorigLabel = pxLabel
+	Do:proc.PostProcess() blLabelPrinter.Print2Bartender()
 	Set ..blLabelPrinter=blLabelPrinter
 ]]></Implementation>
 </Method>
Index: BL/PPS/TBX/SpoelbakLabelProcessor.cls.xml
===================================================================
diff -u -r1074 -r3664
--- BL/PPS/TBX/SpoelbakLabelProcessor.cls.xml	(.../SpoelbakLabelProcessor.cls.xml)	(revision 1074)
+++ BL/PPS/TBX/SpoelbakLabelProcessor.cls.xml	(.../SpoelbakLabelProcessor.cls.xml)	(revision 3664)
@@ -39,7 +39,6 @@
 </Method>
 
 <Method name="PostProcess">
-<FormalSpec>labelprinter:BL.Sys.LabelPrinter</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit 1
 ]]></Implementation>
Index: vhUnitTest/BL/PPS/TBX/TestTipon.cls.xml
===================================================================
diff -u -r1074 -r3664
--- vhUnitTest/BL/PPS/TBX/TestTipon.cls.xml	(.../TestTipon.cls.xml)	(revision 1074)
+++ vhUnitTest/BL/PPS/TBX/TestTipon.cls.xml	(.../TestTipon.cls.xml)	(revision 3664)
@@ -23,8 +23,8 @@
 		Do:TestClassZ.Process(.pxLabel) LabelPrinterMockZ.Add(pxLabel)
 		Do:TestClassT.Process(.pxLabel) LabelPrinterMockT.Add(pxLabel)
 	}
-	Do:TestClassZ.PostProcess(LabelPrinterMockZ) LabelPrinterMockZ.Print2Bartender(1)
-	Do:TestClassT.PostProcess(LabelPrinterMockT) LabelPrinterMockT.Print2Bartender(1)
+	Do:TestClassZ.PostProcess() LabelPrinterMockZ.Print2Bartender(1)
+	Do:TestClassT.PostProcess() LabelPrinterMockT.Print2Bartender(1)
 	
 	// Asserts for "zaaglijst"
 	Do $$$AssertEquals(LabelPrinterMockZ.Printed, 1, "Z Printed")
@@ -60,8 +60,8 @@
 		Set:(i=4) NextLabel = pxLabel
 		Do:MultiProcessorT.Process(.pxLabel) LabelPrinterMockT.Add(pxLabel)
 	}
-	Do:TestClassZ.PostProcess(LabelPrinterMockZ) LabelPrinterMockZ.Print2Bartender(1)
-	Do:TestClassT.PostProcess(LabelPrinterMockT) LabelPrinterMockT.Print2Bartender(1)
+	Do:TestClassZ.PostProcess() LabelPrinterMockZ.Print2Bartender(1)
+	Do:TestClassT.PostProcess() LabelPrinterMockT.Print2Bartender(1)
 	
 	// Asserts for "zaaglijst"
 	Do $$$AssertEquals(LabelPrinterMockZ.Printed, 1, "Z Printed")
@@ -83,23 +83,28 @@
 	Set TestClassT = ##class(BL.PPS.TBX.TiponLabelProcessor).%New(1)
 	Set LabelPrinterMockZ = ##class(LabelPrinterMock).%New()
 	Set LabelPrinterMockT = ##class(LabelPrinterMock).%New()
-
+	
+	Set LabelList = ##class(%ListOfObjects).%New()
 	for i=1:1:4 {
 	 	Set pxLabel=##class(vhUnitTest.BL.PPS.TBX.LabelMock).%New()
 		Do pxLabel.SetTipon(0)
 		Do:(i=4) pxLabel.SetTipon(1)
 		Set pxLabel.VolgNr = i
 		Set pxLabel.BatchID = "123"
+		Do LabelList.Insert(pxLabel)
 		Do:TestClassZ.Process(.pxLabel) LabelPrinterMockZ.Add(pxLabel)
 		Do:TestClassT.Process(.pxLabel) LabelPrinterMockT.Add(pxLabel)
 	}
-	Do:TestClassZ.PostProcess(LabelPrinterMockZ) LabelPrinterMockZ.Print2Bartender(1)
-	Do:TestClassT.PostProcess(LabelPrinterMockT) LabelPrinterMockT.Print2Bartender(1)
+	Do:TestClassZ.PostProcess() LabelPrinterMockZ.Print2Bartender(1)
+	Do:TestClassT.PostProcess() LabelPrinterMockT.Print2Bartender(1)
 	
 	// Asserts for "zaaglijst"
 	Do $$$AssertEquals(LabelPrinterMockZ.Printed, 1, "Z Printed")
-	Do $$$AssertEquals(LabelPrinterMockZ.Count, 4, "Z # labels added to printer")
-	Do $$$AssertEquals(LabelPrinterMockZ.LastSeqNr, "", "Z Last label sequence number")
+	Do $$$AssertEquals(LabelPrinterMockZ.Count, 3, "Z # labels added to printer")
+	Do $$$AssertEquals(LabelPrinterMockZ.LastSeqNr, 3, "Z Last label sequence number")
+	Do $$$AssertEquals(LabelList.GetAt(1).GetTiponCountAfter(),0,"Er zijn geen tipons achter")
+	Do $$$AssertEquals(LabelList.GetAt(2).GetTiponCountAfter(),0,"Er zijn geen tipons achter")
+	Do $$$AssertEquals(LabelList.GetAt(3).GetTiponCountAfter(),1,"Er is 1 tipon achter")
 	// Asserts for tipon list
 	Do $$$AssertEquals(LabelPrinterMockT.Printed, 1, "T Printed")
 	Do $$$AssertEquals(LabelPrinterMockT.Count, 1, "T # labels added to printer")
Index: BL/PPS/TBX/MultiProcessorOF.cls.xml
===================================================================
diff -u -r1074 -r3664
--- BL/PPS/TBX/MultiProcessorOF.cls.xml	(.../MultiProcessorOF.cls.xml)	(revision 1074)
+++ BL/PPS/TBX/MultiProcessorOF.cls.xml	(.../MultiProcessorOF.cls.xml)	(revision 3664)
@@ -25,14 +25,13 @@
 </Method>
 
 <Method name="PostProcess">
-<FormalSpec>labelprinter:BL.Sys.LabelPrinter</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set Result=0
 	Set Iterator = ##class(TECH.ListIterator).%New(..Processoren)
 	While (Iterator.HasNext())
 	{
-		Set Result = Result || Iterator.Next().PostProcess(labelprinter)
+		Set Result = Result || Iterator.Next().PostProcess()
 	}
 	Quit Result
 ]]></Implementation>
Index: BL/PPS/TBX/SifonLabelProcessor.cls.xml
===================================================================
diff -u -r1074 -r3664
--- BL/PPS/TBX/SifonLabelProcessor.cls.xml	(.../SifonLabelProcessor.cls.xml)	(revision 1074)
+++ BL/PPS/TBX/SifonLabelProcessor.cls.xml	(.../SifonLabelProcessor.cls.xml)	(revision 3664)
@@ -39,7 +39,6 @@
 </Method>
 
 <Method name="PostProcess">
-<FormalSpec>labelprinter:BL.Sys.LabelPrinter</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit 1
 ]]></Implementation>
Index: BL/PPS/TBX/TiponLabelProcessor.cls.xml
===================================================================
diff -u -r1074 -r3664
--- BL/PPS/TBX/TiponLabelProcessor.cls.xml	(.../TiponLabelProcessor.cls.xml)	(revision 1074)
+++ BL/PPS/TBX/TiponLabelProcessor.cls.xml	(.../TiponLabelProcessor.cls.xml)	(revision 3664)
@@ -37,13 +37,19 @@
 <Private>1</Private>
 </Property>
 
+<Property name="LaatsteNietTiponLabel">
+<Type>BL.PPS.TBX.sub.pxLabelV1</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>tipon:%Boolean</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..Tipon = tipon
 	Set ..TiponCount = 0
 	Set ..BatchID = ""
+	Set ..LaatsteNietTiponLabel = ##class(BL.PPS.TBX.sub.pxLabelV1).%New() // Dummy aanmaken
 	Quit 1
 ]]></Implementation>
 </Method>
@@ -78,23 +84,12 @@
 </Method>
 
 <Method name="PostProcess">
-<FormalSpec>labelprinter:BL.Sys.LabelPrinter</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	// If there are remaining tipons at the end and we are printing non-tipon labels,
 	// we print a dummy label just to indicate that there were tipons
 	if ('..Tipon && ..TiponCount > 0) {
-		Set pxDummyLabel=##class(BL.PPS.TBX.sub.pxLabelV1).%New()
-		Set pxDummyLabel.Opm1 = "Eindig batch met tipon"
-		Do pxDummyLabel.SetTiponCount(..TiponCount)
-		// Use the batch id that we remembered from the previous label (if any)
-		// Invariant: if ..TiponCount > 0 then there is always a previous label so
-		// the batch id should always have a correct value at this point
-		Set pxDummyLabel.BatchID = ..BatchID
-		Set pxDummyLabel.Device=..Device
-		Set pxDummyLabel.Layout=..Layout
-		;Do pxDummyLabel.WriteRow()
-		Do labelprinter.Add(pxDummyLabel)
+		Do ..LaatsteNietTiponLabel.SetTiponCountAfter(..TiponCount)
 	}
 	// Go ahead with printing
 	Quit 1
@@ -126,6 +121,7 @@
 		// It's a non-tipon label, so add an indication of intermediate tipons (if any)
 		Do label.SetTiponCount(..TiponCount) // Note: TiponCount can be zero
 		Set ..TiponCount = 0
+		Set ..LaatsteNietTiponLabel = label
 		// Make sure we print the label
 		Quit 1
 	  }
Index: BL/PPS/TBX/MultiProcessorEN.cls.xml
===================================================================
diff -u -r1074 -r3664
--- BL/PPS/TBX/MultiProcessorEN.cls.xml	(.../MultiProcessorEN.cls.xml)	(revision 1074)
+++ BL/PPS/TBX/MultiProcessorEN.cls.xml	(.../MultiProcessorEN.cls.xml)	(revision 3664)
@@ -31,14 +31,13 @@
 </Method>
 
 <Method name="PostProcess">
-<FormalSpec>labelprinter:BL.Sys.LabelPrinter</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set Result = 1
 	Set Iterator = ##class(TECH.ListIterator).%New(..Processoren)
 	While (Iterator.HasNext() && Result)
 	{
-		Set Result = Result && Iterator.Next().PostProcess(labelprinter)
+		Set Result = Result && Iterator.Next().PostProcess()
 	}
 	Quit Result
 ]]></Implementation>
Index: BL/PPS/TBX/MultiProcessor.cls.xml
===================================================================
diff -u -r1074 -r3664
--- BL/PPS/TBX/MultiProcessor.cls.xml	(.../MultiProcessor.cls.xml)	(revision 1074)
+++ BL/PPS/TBX/MultiProcessor.cls.xml	(.../MultiProcessor.cls.xml)	(revision 3664)
@@ -19,7 +19,6 @@
 
 <Method name="PostProcess">
 <Abstract>1</Abstract>
-<FormalSpec>labelprinter:BL.Sys.LabelPrinter</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 </Method>
 </Class>
Index: BL/PPS/TBX/LabelProcessor.cls.xml
===================================================================
diff -u -r1074 -r3664
--- BL/PPS/TBX/LabelProcessor.cls.xml	(.../LabelProcessor.cls.xml)	(revision 1074)
+++ BL/PPS/TBX/LabelProcessor.cls.xml	(.../LabelProcessor.cls.xml)	(revision 3664)
@@ -34,7 +34,6 @@
 </UDLText>
 
 <Method name="PostProcess">
-<FormalSpec>labelprinter:BL.Sys.LabelPrinter</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit 1
 ]]></Implementation>