Index: CHUI/PPS/TBX/LeanBatch.cls.xml
===================================================================
diff -u -r2050 -r2100
--- CHUI/PPS/TBX/LeanBatch.cls.xml	(.../LeanBatch.cls.xml)	(revision 2050)
+++ CHUI/PPS/TBX/LeanBatch.cls.xml	(.../LeanBatch.cls.xml)	(revision 2100)
@@ -553,19 +553,18 @@
 </Method>
 
 <Method name="ProboxOverdoosEtiketStatus">
-<FormalSpec>PrintLijst:%List,Fase:BL.PPS.TBX.enu.PrintStatus</FormalSpec>
+<FormalSpec>PrintLijst:%List</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (Fase'>##class(BL.PPS.TBX.enu.PrintFase).Voorbereiding()) Quit ##class(BL.PPS.TBX.enu.PrintStatus).NietPrinten()
 	If $LF(PrintLijst,"Y") Quit ##class(BL.PPS.TBX.enu.PrintStatus).Geprint()
 	If '$LF(PrintLijst,"Y") Quit ##class(BL.PPS.TBX.enu.PrintStatus).Printen()
 ]]></Implementation>
 </Method>
 
 <Method name="NogTePrintenEtiketten">
-<FormalSpec>PrintLijst:%List,Fase:%String=1</FormalSpec>
+<FormalSpec>PrintLijst:%List</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%String</ReturnType>
@@ -576,7 +575,6 @@
 	If (..TipOnPrintStatus(PrintLijst) = ##class(BL.PPS.TBX.enu.PrintStatus).Printen()) Set Opties=Opties_";T"
 	If (..TipOnFreesStatus(PrintLijst) = ##class(BL.PPS.TBX.enu.PrintStatus).Printen()) Set Opties=Opties_";U"
 	If (..SpoelSifonFreesStatus(PrintLijst) = ##class(BL.PPS.TBX.enu.PrintStatus).Printen()) Set Opties=Opties_";W"
-	if (..ProboxOverdoosEtiketStatus(PrintLijst,Fase) = ##class(BL.PPS.TBX.enu.PrintStatus).Printen()) Set Opties=Opties_";Y"
 	Quit $Extract(Opties,2,$Length(Opties))
 ]]></Implementation>
 </Method>
@@ -592,7 +590,7 @@
 	Set PrintLijstInfo = ##class(BL.PPS.TBX.PrintLijstInfo).GeefPrintLijstInfo(..HaluxBatch.GeefBatchID())
 	Set PrintLijst = PrintLijstInfo.PrintLijst
 	Set Fase = PrintLijstInfo.Fase
-	Set TePrintenEtiketten = ..NogTePrintenEtiketten(PrintLijst,Fase)
+	Set TePrintenEtiketten = ..NogTePrintenEtiketten(PrintLijst)
 	
 	If BatchType=##class(APPS.Halux.common.enu.ProductieGroep).Plus() { ; ProPlus - Keller
 		Set Opties="Z;E;F;D;B;P;G;X;A"_
@@ -618,14 +616,15 @@
 		 		$select(..BevatSFS():";P",1:"")_
 		 		$select(..ChkCommissie():";C",1:"")_
 		 		$select(..ChkBodems():";B",1:"")
+		 		
+		 	if BatchType=##class(APPS.Halux.common.enu.ProductieGroep).Probox() {
+				set Opties = Opties_$select(..ProboxOverdoosEtiketStatus(PrintLijst)'=##class(BL.PPS.TBX.enu.PrintStatus).NietPrinten():";Y",1:"")
+			
+	}
+		
 	 	}
 	}
 	
-	if BatchType=##class(APPS.Halux.common.enu.ProductieGroep).Probox() {
-			set Opties = Opties_$select(..ProboxOverdoosEtiketStatus(PrintLijst,Fase)'=##class(BL.PPS.TBX.enu.PrintStatus).NietPrinten():";Y",1:"")
-			
-	}
-	
 	For i=1:1:$L(Opties,";") {
 		If $LF(PrintLijst,$Piece(Opties,";",i)) Set $Piece(Opties,";",i)=""
 		If $Piece(Opties,";",i)="P"&($LF(PrintLijst,"PE")!$LF(PrintLijst,"PA")) Set $Piece(Opties,";",i)=""