Index: BL/PPS/TBX/sub/pxLabelPallet.cls.xml
===================================================================
diff -u -r1074 -r2023
--- BL/PPS/TBX/sub/pxLabelPallet.cls.xml	(.../pxLabelPallet.cls.xml)	(revision 1074)
+++ BL/PPS/TBX/sub/pxLabelPallet.cls.xml	(.../pxLabelPallet.cls.xml)	(revision 2023)
@@ -35,22 +35,16 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="LogoImg">
+<Property name="Logo">
 <Description>
-3 : logo van SFS</Description>
+3 : logo</Description>
 <Type>%String</Type>
 </Property>
 
-<Property name="LogoImg1">
-<Description>
-4 : logo van Vanhoecke</Description>
-<Type>%String</Type>
-</Property>
-
 <Method name="WriteRow">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Write ..Barcode,*9,..BarcodeTxt,*9,..LogoImg,*9,..LogoImg1
+	Write ..Barcode,*9,..BarcodeTxt,*9,..Logo
 	Write $C(13,10)
 	Quit $$$OK
 ]]></Implementation>
Index: vhDeploy/JCL/Deploy20110908x1012.cls.xml
===================================================================
diff -u
--- vhDeploy/JCL/Deploy20110908x1012.cls.xml	(revision 0)
+++ vhDeploy/JCL/Deploy20110908x1012.cls.xml	(revision 2023)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.JCL.Deploy20110908x1012">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default>Opzetten TBXLean Printitems</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	set ^RES("HATBXLEAN","PI","PRINTKAST","D","Y")="20`Probox overdoos"
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/PM/Maatwerk/TBX/Probox/Calculator.cls.xml
===================================================================
diff -u -r1627 -r2023
--- APPS/PM/Maatwerk/TBX/Probox/Calculator.cls.xml	(.../Calculator.cls.xml)	(revision 1627)
+++ APPS/PM/Maatwerk/TBX/Probox/Calculator.cls.xml	(.../Calculator.cls.xml)	(revision 2023)
@@ -142,7 +142,9 @@
 	}
 	
 	If OppervlakteAandeel="" {
-		$$$ThrowError($$$errInvalidInput,"Ongeldige waarde voor berekening van OppervlakteAandeel; input params "_$$$LCVT($LB(LadeVariant,IsBinnenlade,LadeDiepte,LadeHoogte))_".")
+		set Message = "Ongeldige waarde voor berekening van OppervlakteAandeel; input params "_$$$LCVT($LB("LadeVariant : "_LadeVariant,"IsBinnenlade : "_IsBinnenlade,"LadeDiepte : "_LadeDiepte,"LadeHoogte :"_LadeHoogte))_"."
+		set Exception = ##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).InvalidInput(),Message)
+		Do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
 
 	Quit OppervlakteAandeel
@@ -187,6 +189,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefVolumeAandeelViaLade">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Lade:DOM.PM.TBXProduct.TBXLade</FormalSpec>
+<Implementation><![CDATA[
+	set IsBinnenlade = (Lade.GeefLadeType()=##class(DOM.PM.enu.TBXLadeType).BinnenLade())
+	Quit ..GeefVolumeAandeel(Lade.GeefVariant(),IsBinnenlade,Lade.GeefLadeDiepte(),Lade.GeefRugHoogte(),Lade.GeefBodemBreedte())
+]]></Implementation>
+</Method>
+
 <Method name="GeefVerpakkingHoogte">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>LadeVariant:DOM.PM.enu.LadeVariant,IsBinnenlade:%Boolean,LadeHoogte:%String</FormalSpec>
Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u -r1909 -r2023
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1909)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 2023)
@@ -15,8 +15,10 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
-	Set %TECHContextRuntimeContext = ##class(vhUnitTest.APPS.MAG.UGLYPicking.RuntimeContextMock).%New()
- 	Quit $$$OK
+	
+	set sc= ..VerwijderBestaandeReservaties()
+	if '$$$ISERR(sc) Set %TECHContextRuntimeContext = ##class(vhUnitTest.APPS.MAG.UGLYPicking.RuntimeContextMock).%New()
+ 	Quit sc
 ]]></Implementation>
 </Method>
 
@@ -133,13 +135,13 @@
 	
 	do $$$AssertEquals(dtoPallet.GrootVerpakking.AantalInVerpakking,10,"Controle AantalInVerpakking")
 	do $$$AssertEquals(dtoPallet.GrootVerpakking.AantalTePicken,4,"Controle aantal te picken")
-	do $$$AssertEquals(dtoPallet.GrootVerpakking.AantalResterend,(1000-45)\10,"Controle aantal resterend")
+	do $$$AssertEquals(dtoPallet.GrootVerpakking.AantalResterend,96,"Controle aantal resterend")
 	do $$$AssertEquals(dtoPallet.NormaalVerpakking.AantalInVerpakking,0,"Controle AantalInVerpakking")
 	do $$$AssertEquals(dtoPallet.NormaalVerpakking.AantalTePicken,0,"Controle aantal te picken")
 	do $$$AssertEquals(dtoPallet.NormaalVerpakking.AantalResterend,0,"Controle aantal resterend")
 	do $$$AssertEquals(dtoPallet.StukVerpakking.AantalInVerpakking,1,"Controle AantalInVerpakking")
 	do $$$AssertEquals(dtoPallet.StukVerpakking.AantalTePicken,5,"Controle aantal te picken")
-	do $$$AssertEquals(dtoPallet.StukVerpakking.AantalResterend,5,"Controle aantal resterend")
+	do $$$AssertEquals(dtoPallet.StukVerpakking.AantalResterend,4,"Controle aantal resterend")
 	
 	Do Service.StopHuidigeBon()
 	Do ..VerwijderBon(999998)
@@ -264,7 +266,7 @@
 	do PalletReservatie.ProductSetObjectId(1001)
 	set PalletReservatie.Sectie = "UT-SECTIE"
 	set PalletReservatie.AantalTePicken = 45
-	set PalletReservatie.AantalOpPallet = 1000
+	set PalletReservatie.AantalOpPallet = 1009
 	do PalletReservatie.%Save()
 ]]></Implementation>
 </Method>
@@ -380,6 +382,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwijderBestaandeReservaties">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+
+	set rsPalletReservatie = ##class(%ResultSet).%New("")
+	set sc = rsPalletReservatie.Prepare("DELETE FROM Flow_OrderWMS.PalletReservatie")
+	if 'sc { 
+		set sc = rsPalletReservatie.Execute()
+	}
+	quit sc
+]]></Implementation>
+</Method>
+
 <Method name="VerwijderBon">
 <FormalSpec>ID:%Integer</FormalSpec>
 <ReturnType>%Status</ReturnType>
Index: CHUI/PPS/TBX/LeanBatch.cls.xml
===================================================================
diff -u -r1867 -r2023
--- CHUI/PPS/TBX/LeanBatch.cls.xml	(.../LeanBatch.cls.xml)	(revision 1867)
+++ CHUI/PPS/TBX/LeanBatch.cls.xml	(.../LeanBatch.cls.xml)	(revision 2023)
@@ -405,7 +405,7 @@
 <Implementation><![CDATA[
 	Set BevatSFS = 0
 	Set ToeleveringIterator = ..HaluxBatch.GeefToeleveringIterator()
-	While (ToeleveringIterator.HasNext())
+	While (ToeleveringIterator.HasNext()&&('BevatSFS))
 	{
 		Set Toelevering = ToeleveringIterator.Next()
 		Set Order = Toelevering.GeefOrder()
@@ -579,18 +579,19 @@
 	Set PrintLijst = ##class(BL.PPS.TBX.PrintLijstInfo).GeefPrintLijstInfo(..HaluxBatch.GeefBatchID()).PrintLijst
 	Set TePrintenEtiketten = ..NogTePrintenEtiketten(PrintLijst)
 	If BatchType="+" Do ; ProPlus - Keller
-	. Set Opties="Z;E;F;D;B;P;G;X;A"_$S(..TipOnFreesStatus(PrintLijst)'="N":";U",1:"")_$S(..SpoelSifonFreesStatus(PrintLijst)'="N":";W",1:"")
+	. Set Opties="Z;E;F;D;B;P;G;X;A;Y"_$S(..TipOnFreesStatus(PrintLijst)'="N":";U",1:"")_$S(..SpoelSifonFreesStatus(PrintLijst)'="N":";W",1:"")
 	Else  If BatchType="A" Do ; Kast
 	. If TePrintenEtiketten '= "" Do
 	. . Set Opties=TePrintenEtiketten
-	. Else  Set Opties="Z;E;F;O;R;D;M;L;K;X;I"_$S(..ChkCommissie():";C",1:"")_$S(..ChkBodems():";B",1:"")_";G"
+	. Else  Set Opties="Z;E;F;O;R;D;M;L;K;X;I;Y"_$S(..ChkCommissie():";C",1:"")_$S(..ChkBodems():";B",1:"")_";G"
 	Else  Do ; BatchType = "P" of "S" , pallet of stuks verpakt
 	. If TePrintenEtiketten '= "" Do
 	. . Set Opties=TePrintenEtiketten
-	. Else  Set Opties="Z;E;L;F;O;M;R;I"_$S(..BevatSFS():";P",1:"")_$S(..ChkCommissie():";C",1:"")_$S(..ChkBodems():";B",1:"")_";G"
+	. Else  Set Opties="Z;E;L;F;O;M;R;I;Y"_$S(..BevatSFS():";P",1:"")_$S(..ChkCommissie():";C",1:"")_$S(..ChkBodems():";B",1:"")_";G"
 	For i=1:1:$L(Opties,";") Do
 	. 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)=""
+	D WLIP^vhDBG(195,Opties)
 	Quit Opties
 ]]></Implementation>
 </Method>
@@ -734,16 +735,17 @@
 	. Do ..blLeanBatch.PrintV1(BatchNr,ProdGrpBatch,$TR(Opties,";",""),.Text,$G(StartNr),$G(EndNr))
 	Do:$L(Text)>2 WARN^vhTXTPOP($E(Text,2,999),"Overzicht")
 	Do:$L($G(SkippedText)) WARN^vhTXTPOP($$REPLACE^vhRtn1(SkippedText,">CR<","~"),"Producten die niet werden toegevoegd")
-	// [??]
-	#IF $$$NSpace="DEV-ADMIN1"
-	Do DISPLAY^vhScherm("HATBXLEAN",,,,"BATCHNR")
-	Do ..Fetch(.Selected)
-	Do ..ToonHeader()
-	Do ..Init()
-	Do ..Write(OldSel)
-	#ELSE 
-	Do ..Write(OldSel)
-	#ENDIF
+	
+	if ##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()="DEV" {
+		Do DISPLAY^vhScherm("HATBXLEAN",,,,"BATCHNR")
+		Do ..Fetch(.Selected)
+		Do ..ToonHeader()
+		Do ..Init()
+		Do ..Write(OldSel)
+	}
+	else {
+		Do ..Write(OldSel)
+	}
 ]]></Implementation>
 </Method>
 
Index: BL/PPS/TBX/sub/pxLabelOverdoosProbox.cls.xml
===================================================================
diff -u
--- BL/PPS/TBX/sub/pxLabelOverdoosProbox.cls.xml	(revision 0)
+++ BL/PPS/TBX/sub/pxLabelOverdoosProbox.cls.xml	(revision 2023)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="BL.PPS.TBX.sub.pxLabelOverdoosProbox">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>BL.PPS.TBX.sub.pxLabelKlant</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="PalletBarcode">
+<Type>%String</Type>
+</Property>
+
+<Property name="PalletBarcodeTxt">
+<Type>%String</Type>
+</Property>
+
+<Method name="WriteRow">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	#define TAB 	$char(9)
+	#define CRLF 	$char(13,10)
+	
+	write ..LogoImg,$$$TAB
+	write ..KlantNaam,$$$TAB
+	
+	write ..PalletBarcodeTxt,$$$TAB
+	write ..PalletBarcode,$$$TAB
+	
+	write ..OrderRef,$$$TAB
+	write ..ORDNr,$$$TAB
+	
+	write $$$CRLF
+	quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: BL/PPS/TBX/enu/PalletEtiketType.cls.xml
===================================================================
diff -u
--- BL/PPS/TBX/enu/PalletEtiketType.cls.xml	(revision 0)
+++ BL/PPS/TBX/enu/PalletEtiketType.cls.xml	(revision 2023)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="BL.PPS.TBX.enu.PalletEtiketType">
+<ClassType>datatype</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Enumeration</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="VALUELIST">
+<Default>,SFS,TBX,TBP</Default>
+</Parameter>
+
+<Method name="SFS">
+<ClassMethod>1</ClassMethod>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit "SFS"
+]]></Implementation>
+</Method>
+
+<Method name="Tandembox">
+<ClassMethod>1</ClassMethod>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit "TBX"
+]]></Implementation>
+</Method>
+
+<Method name="Probox">
+<ClassMethod>1</ClassMethod>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit "TBP"
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: BL/PPS/TBX/DocsV1.cls.xml
===================================================================
diff -u -r1867 -r2023
--- BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 1867)
+++ BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 2023)
@@ -105,7 +105,7 @@
 <Implementation><![CDATA[
 	/*  VRIJE LETTERS, GELIEVE TE UPDATEN BIJ GEBRUIK
 	/
-	/	H Y
+	/	H
 	/
 	*/
 	Set Opties=$G(Opties,"ELZOFKMRT")
@@ -123,10 +123,12 @@
 	Do:Opties["T" ..EtikettenTipon(StartNr,EndNr)
 	Do:Opties["N" ..EtikettenSifon(StartNr,EndNr)
 	Do:Opties["Q" ..EtikettenSpoelbak(StartNr,EndNr)
+	Do:Opties["Y" ..ProboxOverdoosEtiket()
 	Do:Opties["C" ..EtikettenCommissie()
 	Do:Opties["G" ..GlasSnijLijst()
 	Do:Opties["I" ..RelingInkortenLijst(),..DwarsverdelingLijst()
 	
+	
 	// Controleer voor errors op de frees indien etiketten voor tipons, sifons of spoelbakken zijn afgedrukt
 	If ((Opties["U") || (Opties["W"))
 	{
@@ -1318,23 +1320,29 @@
 <FormalSpec>oQ</FormalSpec>
 <Implementation><![CDATA[
  	Set pxLabel=##class(BL.PPS.TBX.sub.pxLabelKlant).%New()
+	Set pxLabel.Layout=..LabelKlantLayout
  	
- 	Do General(oQ.KlantGetObjectId(),oQ.TOENr,oQ.TLUNr,oQ.BatchID,pxLabel)	
- 	Do Product(oQ.ProductGetObjectId(),$S($isObject(oQ.WPVerpak):oQ.WPVerpak.VHossID(),1:""),pxLabel)
+ 	Do ..KlantEtiketOneAlgemeen(oQ.KlantGetObjectId(),oQ.TOENr,oQ.TLUNr,oQ.BatchID,pxLabel)	
+ 	If oQ.Status="PB" Set pxLabel.Opmerking="|"  ; er wordt een streep toegevoegd aan de rechterkant van het etiket
+ 	Do ..KlantEtiketOneProduct(oQ.ProductGetObjectId(),$S($isObject(oQ.WPVerpak):oQ.WPVerpak.VHossID(),1:""),pxLabel)
  	
-	Set pxLabel.Device=..LabelKlantDevice
-	Set pxLabel.Layout=..LabelKlantLayout
+ 	Set pxLabel.Device=..LabelKlantDevice
 	
 	Quit pxLabel
-	
-General(KLNr,TOENr,TLUNr,BatchID,pxLabel)
+]]></Implementation>
+</Method>
+
+<Method name="KlantEtiketOneAlgemeen">
+<FormalSpec>KLNr:%String,TOENr:%String,TLUNr:%String,BatchID:%String,pxLabel:BL.PPS.TBX.sub.pxLabelKlant</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
 	Set TLNr=$G(^TO("IU",TOENr,TLUNr),"*")
 	Set ORDNr=$P($G(^KTO($$$LevHalux,TOENr,TLNr)),"\",27) ; KOMLink
 	Set OLNr=$P($G(^KTO($$$LevHalux,TOENr,TLNr)),"\",28) ; KOMLink
-	Set pxLabel.OrderRef=$$OrderRef(KLNr,ORDNr,OLNr)
+	Set pxLabel.OrderRef=..KlantEtiketOneOrderRef(KLNr,ORDNr,OLNr)
  	Set ProjectRef=$S('OLNr:"",1:$P($G(^KOD(KLNr,"F",ORDNr,OLNr)),"\",5))
  	Set:$L(ProjectRef) pxLabel.OrderRef=ProjectRef ; Projectreferentie is belangrijker dan de orderreferentie
- 	Do AdresOrder(ORDNr,KLNr,pxLabel)
+ 	Do ..KlantEtiketOneAdresOrder(ORDNr,KLNr,pxLabel)
  	If (KLNr=7833)||(KLNr=6279) Set pxLabel.KlantNaamBig=$$UPTRIMAN^vhRtn1(pxLabel.OrderRef) ; Voor Hein en Optima
  	
 	 ; Indien contract dan leverweek van toelevering
@@ -1355,10 +1363,14 @@
 	Set pxLabel.ORDNr=ORDNr
 	Set pxLabel.TOENr=TOENr
 	Set pxLabel.BatchID=BatchID
-	If oQ.Status="PB" Set pxLabel.Opmerking="|"  ; er wordt een streep toegevoegd aan de rechterkant van het etiket
 	Quit
-	
-AdresOrder(ORDNr,KLNr,pxLabel) 
+]]></Implementation>
+</Method>
+
+<Method name="KlantEtiketOneAdresOrder">
+<FormalSpec>ORDNr:%String,KLNr:%String,pxLabel:BL.PPS.TBX.sub.pxLabelKlant</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
  
 	Set Adres=""
 	Set:KLNr&&ORDNr Adres=$G(^KOD(KLNr,"F",ORDNr,3))
@@ -1375,17 +1387,35 @@
 	Set pxLabel.PostCode=$S($E($P(Adres,"\",6),1,2)="NL":"NL",$P(Adres,"\",6)?4N:"",1:$P(Adres,"\",6))
 	Set pxLabel.Gemeente=$E($P(Adres,"\",7),1,18)
 	Quit
-	
-OrderRef(KLNr,ORDNr,OLNr) ; Referentie opzoeken in leveringsbon indien order reeds op bon gezet
+]]></Implementation>
+</Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+// Referentie opzoeken in leveringsbon indien order reeds op bon gezet
+
+]]></Content>
+</UDLText>
+
+<Method name="KlantEtiketOneOrderRef">
+<FormalSpec>KLNr,ORDNr,OLNr</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
 	Quit:'ORDNr "VOORRAAD"
 	Set OrdRef=""
 	If KLNr,ORDNr,OLNr Set OrdRef=$P($G(^KOD(KLNr,"F",ORDNr,OLNr)),"\",19) ; Klantcomm. ref
 	If KLNr,ORDNr,OrdRef="" Set OrdRef=$P($G(^KOD(KLNr,"F",ORDNr,1)),"\",3) ; rderref
 	If $E(OrdRef,1,3)="EDI" Set $E(OrdRef,1,3)="",OrdRef=$TR(OrdRef," ","")
 	If (OrdRef?1.2N1"."1.2N1"."2N1" ".E)||(OrdRef?1.2N1"/"1.2N1"/"2N1" ".E)||(OrdRef?1.2N1"-"1.2N1"-"2N1" ".E) Set OrdRef=$P(OrdRef," ",2,99) 
 	Quit OrdRef
- 
-Product(PRNr,VHossID,pxLabel)
+]]></Implementation>
+</Method>
+
+<Method name="KlantEtiketOneProduct">
+<FormalSpec>PRNr,VHossID,pxLabel</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
  	Set pxLabel.BreedteCorpus=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"CB")) ; Corpus breedte
 	Set pxLabel.Diepte=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"LD")) ; Ladediepte
 	Set pxLabel.WandDikte=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"WD")) ; Wanddikte
@@ -1420,12 +1450,10 @@
 	Set BevatSFS = 0
 	Set Batch = ##class(APPS.Halux.common.BatchService).%New().GeefBatch(..BatchID)
 	Set ToeleveringIterator = Batch.GeefToeleveringIterator()
-	While (ToeleveringIterator.HasNext())
-	{
+	While ((ToeleveringIterator.HasNext())&&('BevatSFS)) {
 		Set Toelevering = ToeleveringIterator.Next()
 		Set Order = Toelevering.GeefOrder()
-		If ($IsObject(Order))
-		{
+		If ($IsObject(Order)) {	
 			Set BevatSFS = (Order.GeefKlantNr() = $$$KlantSFS)
 		}
 	}
@@ -1440,7 +1468,75 @@
 
 <Method name="PalletEtiketten">
 <Implementation><![CDATA[
-	If '..BevatSFS() Do ..PalletEtikettenNietSFS() Quit
+	If '..BevatSFS() {	
+		Do ..PalletEtikettenNietSFS() 
+	}
+	Else { 	
+		Do ..PalletEtikettenSFS() 
+	}
+	
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="ProboxOverdoosEtiket">
+<Implementation><![CDATA[
+	set itToeleveringen = ..Batch.GeefToeleveringIterator()
+	while itToeleveringen.HasNext() {
+		set Toelevering = itToeleveringen.Next()
+	    set Aantal = ..BepaalProboxAantal(Toelevering) 
+	      // aantal etiketten wordt misbruikt om al dat niet te moeten printen
+		if Aantal > 0  { 
+			do ..ProboxEtiket(Toelevering)				
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ProboxEtiket">
+<FormalSpec>Toelevering</FormalSpec>
+<Implementation><![CDATA[
+ 	Set blLabelPrinter=##class(BL.Sys.LabelPrinter).%New()
+ 	set pxLabel = ##class(BL.PPS.TBX.sub.pxLabelOverdoosProbox).%New()
+ 	set pxLabel.Layout = "OverdoosProbox5x10"
+ 	Set pxLabel.Device=..LabelKlantDevice
+ 	
+ 	set Klant = Toelevering.GeefOrder().GeefKlant()
+ 	
+ 	set PalletID = ..GeefNieuwPalletID(##class(BL.PPS.TBX.enu.PalletEtiketType).Probox())
+ 	set pxLabel.PalletBarcode = PalletID
+ 	set pxLabel.PalletBarcodeTxt = ..FormatteerPalletID(PalletID)
+ 	
+ 	set pxLabel.Aantal = ..BepaalProboxAantal(Toelevering)
+
+ 	do blLabelPrinter.PrintDirect2Bartender(pxLabel)
+ 	
+ 	quit
+]]></Implementation>
+</Method>
+
+<Method name="BepaalProboxAantal">
+<FormalSpec>Toelevering:DOM.LEV.Toelevering</FormalSpec>
+<Implementation><![CDATA[
+	set VolumeAandeel = 0
+	
+	set itToeleveringLijn = Toelevering.GeefTypeToeleveringLijnIterator(##class(DOM.LEV.enu.ToeleveringLijnType).Product())
+	while itToeleveringLijn.HasNext() {
+		set Lijn = itToeleveringLijn.Next()
+		set Product = Lijn.GeefProduct()
+		set Verpakking = Product.GeefVerpakking()
+		if ( Verpakking = ( ##class(DOM.PM.enu.TBXVerpakking).ProboxMetOnderdelen() ) || (Verpakking = ##class(DOM.PM.enu.TBXVerpakking).ProboxZonderOnderdelen())) {
+			set VolumeAandeel = VolumeAandeel + ##class(APPS.PM.Maatwerk.TBX.Probox.Calculator).GeefVolumeAandeelViaLade(Product)
+		}
+	}
+	set AantalEtiketten = ##class(TECH.Math).Ceil(VolumeAandeel)
+	
+	quit AantalEtiketten
+]]></Implementation>
+</Method>
+
+<Method name="PalletEtikettenSFS">
+<Implementation><![CDATA[
 	Set blLabelPrinter=##class(BL.Sys.LabelPrinter).%New()
 
 	Set rs=##class(%ResultSet).%New("BL.PPS.TBX.Sequencer:GetSequence")
@@ -1452,45 +1548,20 @@
 	. Set Count=Count+1
 	; etiket per theoretisch pallet
 	For Count2=1:1:((Count+..#MaxLadePerPallet-1)\..#MaxLadePerPallet) Do
-	. Set pxLabel=..PalletEtiketOne()
+	. Set pxLabel=..PalletEtiketOne(##class(BL.PPS.TBX.enu.PalletEtiketType).SFS())
 	. Quit:'$isObject(pxLabel)
 	. Do blLabelPrinter.Add(pxLabel)
 
 	Do blLabelPrinter.Print2Bartender()
-]]></Implementation>
-</Method>
-
-<Method name="PalletEtiketOne">
-<FormalSpec>Type:%String</FormalSpec>
-<Implementation><![CDATA[
-	If '$D(Type) Set Type="SFS"
- 	Set pxLabel=##class(BL.PPS.TBX.sub.pxLabelPallet).%New()
-  	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("BL.PPS.TBX.DocsV1_LogPrintLabelsIpvTePrinten"))
-  	{
- 		Set pxLabel.Device="\\fop\test3"
-  	}
-  	Else
-  	{
-	  	Set pxLabel.Device=..LabelDevice
-  	}
-	Set pxLabel.Layout=..#LabelPalletTemplate
-	If Type="SFS" Do
-	. Set pxLabel.LogoImg="logo\logo SFS Unimarket 12486.jpg"
-	Else  Set pxLabel.LogoImg1="logo\logo vhzwart.jpg"
 	
-	Set LocId=$I(^RES("EWPAL","CNT","TBX"))
-	If LocId>999999 Set LocId=1,^RES("EWPAL","CNT","TBX")=LocId
-	Set pxLabel.Barcode=$S(Type="SFS":"SFS",1:"TBX")_$TR($J(LocId,5)," ","0")
-	Set pxLabel.BarcodeTxt=$E(pxLabel.Barcode,1,4)_" "_$E(pxLabel.Barcode,5,8)
-	Quit pxLabel
+	Quit
 ]]></Implementation>
 </Method>
 
 <Method name="PalletEtikettenNietSFS">
 <Description>
 Afdrukken van etiketten die niet voor SFS zijn</Description>
 <Implementation><![CDATA[
- 
 	Set blLabelPrinter=##class(BL.Sys.LabelPrinter).%New()
 	Set rs=##class(%ResultSet).%New()
 	Do rs.Prepare("Select TOENr, Count(*) As Aantal from PPS.TBX_Queue where (BatchID="_..BatchID_") and (Status<>'PB') group by TOENr")
@@ -1502,13 +1573,83 @@
 	For  Set TOENr=$O(AantalLijnen(TOENr)) Quit:TOENr=""  Do
 	. Set Aantal=$S(AantalLijnen(TOENr)#6=0:AantalLijnen(TOENr)\6,1:AantalLijnen(TOENr)\6+1)
     . For i=1:1:Aantal Do 
-    . . Set pxLabel=..PalletEtiketOne("TBX")
+    . . Set pxLabel=..PalletEtiketOne(##class(BL.PPS.TBX.enu.PalletEtiketType).Tandembox())
     . . Quit:'$isObject(pxLabel)
 	. . Do blLabelPrinter.Add(pxLabel)
 	Do blLabelPrinter.Print2Bartender()
+	
+	Quit
 ]]></Implementation>
 </Method>
 
+<Method name="PalletEtiketOne">
+<FormalSpec>Type:BL.PPS.TBX.enu.PalletEtiketType="SFS"</FormalSpec>
+<Implementation><![CDATA[
+	
+	if '##class(BL.PPS.TBX.enu.PalletEtiketType).IsValidDT(Type) {
+		set Execption = ##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).InvalidInput(),Type _" is geen geldig PalletEtiketType")
+		Do ##class(TECH.ExceptionHandler).Throw(Exception)	
+	}
+	
+ 	Set pxLabel=##class(BL.PPS.TBX.sub.pxLabelPallet).%New()
+  	
+  	Set pxLabel.Device=..LabelDevice
+	Set pxLabel.Layout=..#LabelPalletTemplate
+	
+	set pxLabel.Logo = ..GeefPalletEtiketLogo(Type)
+
+	Set PalletID = ..GeefNieuwPalletID(Type)
+
+	Set pxLabel.Barcode = PalletID
+	Set pxLabel.BarcodeTxt= ..FormatteerPalletID(PalletID)
+
+	Quit pxLabel
+]]></Implementation>
+</Method>
+
+<Method name="GeefPalletEtiketLogo">
+<FormalSpec>Type:BL.PPS.TBX.enu.PalletEtiketType</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If Type = ##class(BL.PPS.TBX.enu.PalletEtiketType).SFS() { 
+		set Logo="logo\logo SFS Unimarket 12486.jpg" 
+	}
+	else  { 
+		set Logo="logo\logo vhzwart.jpg" 
+	}
+	
+	quit Logo
+]]></Implementation>
+</Method>
+
+<Method name="FormatteerPalletID">
+<FormalSpec>PalletID:%String</FormalSpec>
+<Implementation><![CDATA[	quit $extract(PalletID,1,4)_" "_$extract(PalletID,5,8) ; formatering "AAAA AAAA"
+]]></Implementation>
+</Method>
+
+<Method name="GeefNieuwPalletID">
+<FormalSpec>Type:BL.PPS.TBX.enu.PalletEtiketType</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#define LengteBarcode 8
+	
+	Lock +^RES("EWPAL","CNT","TBX")
+	
+	Set PalletID=$increment(^RES("EWPAL","CNT","TBX"))
+	If PalletID>999999 Set PalletID=1,^RES("EWPAL","CNT","TBX")=PalletID
+	
+	Lock -^RES("EWPAL","CNT","TBX")
+	
+	set LenType = $length(Type)
+	set PalletID = Type_$translate($justify(PalletID,$$$LengteBarcode-LenType)," ","0") ; 0-justify tot 8 lang
+	
+	Quit PalletID
+]]></Implementation>
+</Method>
+
 <Method name="CommissieRef">
 <FormalSpec>KLNr,BONNr</FormalSpec>
 <Private>1</Private>