Index: BL/Flow/Levering/Label.cls.xml
===================================================================
diff -u -r62326 -r65848
--- BL/Flow/Levering/Label.cls.xml	(.../Label.cls.xml)	(revision 62326)
+++ BL/Flow/Levering/Label.cls.xml	(.../Label.cls.xml)	(revision 65848)
@@ -157,21 +157,25 @@
     	set Verzw=$P($P($P(xHeader,"\",7),"#")," ")
     }
     Set KLNr=..GetAfzender(..BONNr)
+    Set KlantNaam = $Piece(xAdres,"\",2)
+	If Verzw = "AFH" {
+		Set KlantNaam = $P(^KKL(^KK1(KLNr),0),"\",2)
+	}
     Set KlantAPI = ##class(DOM.DomeinContext).Instance().GeefKlantAPI()
     Set KlantOptimaPack = KlantAPI.GeefKlantOptimaPack()
     
     If KLNr="" Quit $$$ERROR($$$GeneralError,"Verkeerd bonnummer "_..BONNr_": geen data in de global.")
     Set ..pxLabelKlant=##class(BL.Flow.Levering.sub.pxKlantPallet).Create()
     If $L($TR(xAdres,"\",""))<5 Set xAdres=^KKL(^KK1(KLNr),0)
     Set ..pxLabelKlant.Logo = ..LabelLogoBepaler(KLNr)
-    Set ..pxLabelKlant.KlantNaam=$Piece(xAdres,"\",2)
+    Set ..pxLabelKlant.KlantNaam=KlantNaam
     Set ..pxLabelKlant.Toenaam=$Piece(xAdres,"\",3)
     Set ..pxLabelKlant.StraatNaamNr=$Piece(xAdres,"\",5)
     Set ..pxLabelKlant.Gemeente=$Piece(xAdres,"\",6)_" "_$Piece(xAdres,"\",7)
     Set ..pxLabelKlant.Bonnr=..BONNr
     Set ..pxLabelKlant.PalID=..PalID
     Set ..pxLabelKlant.Verzendwijze=Verzw_$S($$ISORGAL^FLOW("L",..BONNr):"+",1:"")
-    Set ..pxLabelKlant.KlantnaamBIG=$Piece(xAdres,"\",2)
+    Set ..pxLabelKlant.KlantnaamBIG=KlantNaam
     Set ..pxLabelKlant.CommRef=..CommissieRef(KLNr,..BONNr)
     Set ..pxLabelKlant.UserIDPicker = UserIDPicker
     Set ..pxLabelKlant.MagazijnID = MagazijnID