Index: BL/PPS/TBX/DocsV1.cls.xml
===================================================================
diff -u -r2025 -r2026
--- BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 2025)
+++ BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 2026)
@@ -123,7 +123,7 @@
 	Do:Opties["T" ..EtikettenTipon(StartNr,EndNr)
 	Do:Opties["N" ..EtikettenSifon(StartNr,EndNr)
 	Do:Opties["Q" ..EtikettenSpoelbak(StartNr,EndNr)
-	Do:Opties["Y" ..ProboxOverdoosEtiket()
+	Do:Opties["Y" ..ProboxOverdoosEtiketten()
 	Do:Opties["C" ..EtikettenCommissie()
 	Do:Opties["G" ..GlasSnijLijst()
 	Do:Opties["I" ..RelingInkortenLijst(),..DwarsverdelingLijst()
@@ -299,34 +299,6 @@
 	. Set VolgNr=$$$Prev(VolgNr)
 	Quit
 
- /* BldGVP(From, To)
-	New Rec,PRNr,GVP	
-	Set Rec=$$$GetRec(From)
-	Set PRNr=$$$GetZijPRNr(From) 
-	Set GVP=$$$PRGet($$$GrootVerpakking)
-	Set Rec=$$$GetRec(VolgNr)
-	Set $P(Rec,"\",19)="D"_PRNr
-	Set $P(Rec,"\",20)="Doos V"_GVP
-	$$$SetRec(Rec)
-	Quit
-
-TryGVP(VolgNr)
-	New PRNr,KVP,GVP,NVP,Done
-	Set PRNr=$$$GetZijPRNr(VolgNr)
-	Quit:PRNr'?4.7N ""
-	Set KVP=$$$PRGet($$$KleinVerpakking)
-	Set NVP=$$$PRGet($$$NormaleVerpakking)
-	Set GVP=$$$PRGet($$$GrootVerpakking)
-	If (KVP=1)||(NVP=1)||(GVP=1) Quit ""
-	Set Done=0
-	For  Do  Quit:Done
-	. Set GVP=GVP-1
-	. If GVP=0 Set Done=1 Quit
-	. Set VolgNr=$$$NextDone(VolgNr) Quit:Done
-	. If PRNr'=$$$GetZijPRNr(VolgNr) Set Done=1 Quit
-	If 'GVP Quit VolgNr
-	Quit ""*/
-
 BldGVP(From, To)
 	New Rec,PRNr,GVP	
 	Set Rec=$$$GetRec(From)
@@ -588,88 +560,6 @@
 </Method>
 
 <UDLText name="T">
-<Content><![CDATA[
-/*
-Method Verbruik(BatchIDs)
-{
-	Set %J=$$%J^vhRtn1()
-	Kill ^HULP(..%J)
-	Kill Sum
-	For I=1:1:$LL(BatchIDs) Do
-	. Do VerbruikSum($LG(BatchIDs,I),.Sum)
-	Do VerbruikSort(.Sum)
-	Quit:'$D(^HULP(..%J,"SUM"))
- 	Do INIT^vhLISTO("HATBXLEAN","SUM",.PLD)
- 	Set PLD(1)=$NA(^HULP(..%J,"SUM"))
-	Set PLD("HALUX")=""
-	Set PLD(5)=76
-	Set PLD(10)="Class("_..%ClassName(1)_").VerbruikCB"
-	Set PLD(11)="TBX PLAATMATERIAL"_"\"_"Batch "_$$ListToPieces^vhLib(BatchIDs,";")
-	Do PRINT^OUTPUT(.PLD,$S(..Debug:"S",1:"P"),"S","BL")
-	Quit
-}
-
-Method VerbruikSum(BatchID, Sum)
-{
-	; Sum via .Local
-	Set BatchList=$$Batch2List(BatchID)
-	For BatchSeq=1:1:$LL(BatchList) Do
-	. Kill Sort
-	. Set TOENr=$LI(BatchList,BatchSeq)
-	. Set TLNr=100
-	. For  Set TLNr=$O(^KTO($$$LevHalux,TOENr,TLNr)) Quit:TLNr=""  Do
-	. . Set PRNr=$P(^KTO($$$LevHalux,TOENr,TLNr),"\",2)
-	. . Quit:PRNr'?4.7N
-	. . Quit:$P(^KTO($$$LevHalux,TOENr,TLNr),"\",3)<1
-	. . Quit:'$$ISTBX^PRODUKT2(PRNr)
-	. . Set Qty=$P(^KTO($$$LevHalux,TOENr,TLNr),"\",3)
-	. . Set BodPRNr=$P($G(^PRBS("BS",PRNr,"PRBDHO.001")),"\",1)
-	. . If BodPRNr Do 
-	. . . Set BodDim=$P($G(^PRBS("BS",PRNr,"PRBDHO.001","D")),"\",3) ; incl uitval
-	. . . Set Sum("B",BodPRNr)=$G(Sum("B",BodPRNr))+$$TELMAGST^MRP(BodPRNr,Qty,0,BodDim)
-	. . Set RugPRNr=$P($G(^PRBS("BS",PRNr,"PRRUGHS.001")),"\",1)
-	. . If RugPRNr Do
-	. . . Set RugDim=$P($G(^PRBS("BS",PRNr,"PRRUGHS.001","D")),"\",3) ; incl uitval
-	. . . Set Sum("R",RugPRNr)=$G(Sum("R",RugPRNr))+$$TELMAGST^MRP(RugPRNr,Qty,0,RugDim)
-	Quit
-}
-
-Method VerbruikSort(Sum)
-{
-	; Sum via .Local
-	Kill Sort
-	For Node="B","R" Do
-	. Set PRNr=""
-	. For  Set PRNr=$O(Sum(Node,PRNr)) Quit:PRNr=""  Do
-	. . Set KL=$$ListToPieces^vhLib(##class(Prod.Kenmerk.DataDefinitie).Get("TB",PRNr,"Kleur"),";")
-	. . If Node ="B" Do
-	. . . Set Breedte=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TB",PRNr,"LadeDiepte"))-24
-	. . . Set Sort(Node_";"_KL_";"_$J(Breedte,3))=Node_"\"_KL_"\"_Breedte_"\"_Sum(Node,PRNr)_"\"_PRNr_"\"_$P($G(^KPR(PRNr,0)),"\")
-	. . Else  Do
-	. . . Set RH=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TB",PRNr,"RugHoogte"))
-	. . . Set RHnet=$Case(RH,"N":69,"M":84,"K":116,"B":135,"C":167,"D":199,:"")
-	. . . Set Sort(Node_";"_KL_";"_$J(RHnet,3))=Node_"\"_KL_"\"_RH_" "_$J(RHnet,3)_"\"_Sum(Node,PRNr)_"\"_PRNr_"\"_$P($G(^KPR(PRNr,0)),"\")
-	;
-	Kill ^HULP(..%J,"SUM")
-	Set Key=""
-	For  Set Key=$O(Sort(Key)) Quit:Key=""  Do
-	. Set ^HULP(..%J,"SUM",$I(^HULP(..%J,"SUM")))=Sort(Key)
-	Quit
-}
-
-ClassMethod VerbruikCB(Ref) [ ProcedureBlock = 0 ]
-{
-	New TOENr,Fmt,Rec
-	Quit:$L(Ref)=1 "" 
-	;Set Rec=@Ref
-	Set Fmt="BL\;1"
-	Quit Fmt
-}
-*/
-]]></Content>
-</UDLText>
-
-<UDLText name="T">
 <Content><![CDATA[/* Etiket Zaaglijst */
 ]]></Content>
 </UDLText>
@@ -760,7 +650,6 @@
  	Set pxLabel=##class(BL.PPS.TBX.sub.pxLabelV1).%New()
  	Set PRNr=oQ.ProductGetObjectId()
  	
- 	
  	Set (pxLabel.IB,IB)=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"IB")) ; Interne breedte
 	Set (pxLabel.RH,RH)=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"RH")) ; Rughoogte
 	Set pxLabel.LD=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"LD")) ; Ladediepte
@@ -1346,8 +1235,7 @@
  	. Set pxLabel.ProductieWeek=$TR($S('OLNr:"",1:$P($G(^KOD(KLNr,"F",ORDNr,OLNr)),"\",25)),"/","")
 
 	/// Logo: standaard van Hoecke, tenzij specifiek voor de klant een logo gedefinieerd is.
- 	Set:$G(KLNr)&&($D(^IPCom("CS","LOGO"_KLNr,0))) pxLabel.LogoImg="LOGO\"_^IPCom("CS","LOGO"_KLNr,0)
- 	Set:pxLabel.LogoImg="" pxLabel.LogoImg="LOGO\"_^IPCom("CS","LOGO"_4682,0) ; default Van Hoecke
+ 	set pxLabel.LogoImg= ..GeefEtiketLogo(KLNr)
 	
 	Set pxLabel.OrderID=ORDNr
 	Set pxLabel.ToeleveringNr = TOENr
@@ -1358,6 +1246,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefEtiketLogo">
+<FormalSpec>KlantNr:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	if $length(KlantNr) && ($data(^IPCom("CS","LOGO"_KlantNr,0))) set Logo ="LOGO\"_^IPCom("CS","LOGO"_KlantNr,0)
+ 	else  set Logo ="LOGO\"_^IPCom("CS","LOGO"_4682,0) ; default Van Hoecke
+	quit Logo
+]]></Implementation>
+</Method>
+
 <Method name="KlantEtiketOneAdresOrder">
 <FormalSpec>ORDNr:%String,KLNr:%String,pxLabel:BL.PPS.TBX.sub.pxLabelKlant</FormalSpec>
 <Private>1</Private>
@@ -1461,21 +1359,21 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ProboxOverdoosEtiket">
+<Method name="ProboxOverdoosEtiketten">
 <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)				
+			do ..ProboxOverdoosEtiket(Toelevering)				
 		}
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="ProboxEtiket">
+<Method name="ProboxOverdoosEtiket">
 <FormalSpec>Toelevering</FormalSpec>
 <Implementation><![CDATA[
  	Set blLabelPrinter=##class(BL.Sys.LabelPrinter).%New()
@@ -1486,6 +1384,8 @@
  	set Klant = Order.GeefKlant()
  	
  	set PalletID = ..GeefNieuwPalletID(##class(BL.PPS.TBX.enu.PalletEtiketType).Probox())
+ 	
+ 	set Label.Logo = ..GeefPalletEtiketLogo(##class(BL.PPS.TBX.enu.PalletEtiketType).Probox())
  	set Label.PalletBarcode = PalletID
  	set Label.PalletBarcodeTxt = ..FormatteerPalletID(PalletID)