Index: vhUnitTest/BL/PPS/OL/TestInpak.cls.xml
===================================================================
diff -u -r31375 -r31379
--- vhUnitTest/BL/PPS/OL/TestInpak.cls.xml	(.../TestInpak.cls.xml)	(revision 31375)
+++ vhUnitTest/BL/PPS/OL/TestInpak.cls.xml	(.../TestInpak.cls.xml)	(revision 31379)
@@ -215,7 +215,6 @@
 	Do $$$AssertEquals(pxLabel.EindklantNaam,"")
 	Do $$$AssertEquals(pxLabel.EindklantGemeente,"")
 	Do $$$AssertEquals(pxLabel.Gemeente,"Sint Niklaas")
-	Do $$$AssertEquals(pxLabel.KlantNaam,"UNITTEST CONSUMENT")
 	Do $$$AssertEquals(pxLabel.KLNr,KlantNr)
 	Do $$$AssertEquals(pxLabel.LeverAdres1,"UNITTEST CONSUMENT")
 	Do $$$AssertEquals(pxLabel.LeverAdres2,"Industriepark 7")
Index: BL/PPS/OL/Inpak.cls.xml
===================================================================
diff -u -r31378 -r31379
--- BL/PPS/OL/Inpak.cls.xml	(.../Inpak.cls.xml)	(revision 31378)
+++ BL/PPS/OL/Inpak.cls.xml	(.../Inpak.cls.xml)	(revision 31379)
@@ -123,6 +123,12 @@
 <Transient>1</Transient>
 </Property>
 
+<Property name="VerkoopAPI">
+<Type>DOM.VKP.VerkoopAPI</Type>
+<Private>1</Private>
+<Transient>1</Transient>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
@@ -131,6 +137,7 @@
 <Implementation><![CDATA[
 	Set ..MultiCountBepaler = ##class(BL.PPS.OL.Inpak.MultiCountBepaler).%New()
 	Set ..ProductTypeAPI = ##class(DOM.DomeinContext).Instance().GeefProductTypeAPI()
+	Set ..VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -287,7 +294,7 @@
 <FormalSpec>pxInpakInfo:BL.PPS.OL.pxInpakInfo</FormalSpec>
 <Implementation><![CDATA[
 	 #dim Bon As DOM.VKP.Bon = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefBon( pxInpakInfo.BONNr )
-	 #dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant( Bon.GeefKlantID() )
+	 #dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant( Bon.GeefKlantID() )
 	 #dim EtikettenNodig As %Boolean = Klant.GeefKlantOrderInstellingen().IsExtraAfdrukVanOrgaluxEtikettenNodig()
 	 
 	 if EtikettenNodig && ( Klant.GeefID() = ##class(DOM.VKP.enu.Klant).DKGDeKeukenfabriek() ) {
@@ -748,7 +755,8 @@
 <Implementation><![CDATA[
 	; Ophalen gegevens uit leveringsbon
 	#dim pxLabel As BL.Sys.pxLabel = ##class(BL.Etiket.Doos).Create()
-	Do ..LabelDataFromBon(BONNr,pxLabel)
+	Set pxLabel.KlantNaam = ..GeefKlantNaam(..BevatBonTAORIndeling(BONNr), BONNr)
+	Do ..LabelDataFromBon(BONNr,.pxLabel)
  	Set pxLabel.Aantal=$G(Aantal,1)
  	
  	; Instellingen voor BARTENDER
@@ -886,7 +894,8 @@
 	Do ..BepaalOutput(ProductID)
 	
 	If (BonID'=""){
-		Do ..LabelDataFromBon(BonID,pxLabel) 
+		Set pxLabel.KlantNaam = ..GeefKlantNaam(..ProductTypeAPI.IsTAORIndelingProduct(ProductID), BonID)
+		Do ..LabelDataFromBon(BonID,.pxLabel)
 	}
 	Do ..LabelDataFromProduct(ProductID,pxLabel) 
 
@@ -945,23 +954,35 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKlantNaam">
+<FormalSpec>IsTAORIndeling:%Boolean,BONNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[
+	#dim KlantNaam As TECH.String = ""
+	#dim Bon As DOM.VKP.Bon = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefBon(BONNr)
+	If IsTAORIndeling {
+		#dim KlantID As DOM.common.PartijID = Bon.GeefKlantID()
+		Set KlantNaam = ..VerkoopAPI.GeefKlant(KlantID).GeefNaam()
+	}Else{
+		Set KlantNaam = Bon.GeefLeveringsAdres().GeefNaam()
+	}
+	Quit KlantNaam
+]]></Implementation>
+</Method>
+
 <Method name="LabelDataFromBon">
-<FormalSpec>BONNr:%String,pxLabel:BL.Sys.pxLabel</FormalSpec>
+<FormalSpec><![CDATA[BONNr:%String,&pxLabel:BL.Sys.pxLabel]]></FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim Bon As DOM.VKP.Bon = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefBon(BONNr)
 	#dim D As %String = "\"
-	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(Bon.GeefKlantID())
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(Bon.GeefKlantID())
 	#dim Partij As DOM.PARTIJ.Partij = ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij(Bon.GeefKlantID())
 	#dim KLNr As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.GeefID())
 	#dim FakSoort As %String =$S($P(^KU1(BONNr,"F"),D,2):"G",1:"F") ; Reeds gefactureerd
 	#dim Leveringadres As DOM.common.Adres = Bon.GeefLeveringsAdres()
 	Set pxLabel.BonNr = $$EXTNUM^vhLib.DataTypes(BONNr,0,".",0)
-	If ..BevatBonTAORIndeling(BONNr) {
-		Set pxLabel.KlantNaam = Klant.GeefNaam()
-	}Else{
-		Set pxLabel.KlantNaam = Leveringadres.GeefNaam()
-	}
 	Set pxLabel.KLNr=KLNr
 	Set pxLabel.Gemeente=$E(Leveringadres.GeefGemeente(),1,18)
 	Set pxLabel.Taal = Partij.GeefTaal()