Index: BL/Flow/Levering/Label.cls.xml
===================================================================
diff -u -r62215 -r62273
--- BL/Flow/Levering/Label.cls.xml	(.../Label.cls.xml)	(revision 62215)
+++ BL/Flow/Levering/Label.cls.xml	(.../Label.cls.xml)	(revision 62273)
@@ -6,7 +6,7 @@
 <ClassType/>
 <IncludeCode>BL.Derde.KlantSpecifiek</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Parameter name="StandaardLayout">
 <Default>10x10</Default>
@@ -41,12 +41,17 @@
 <Type>BL.Flow.Levering.sub.pxProductPallet</Type>
 </Property>
 
+<Property name="LabelLogoBepaler">
+<Type>BL.Flow.Levering.LabelLogoBepaler</Type>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>initvalue:%CacheString</FormalSpec>
+<FormalSpec>initvalue:%CacheString,LabelLogoBepaler:BL.Flow.Levering.LabelLogoBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Set ..LabelLogoBepaler = $$$Inject(LabelLogoBepaler, ##class(BL.Flow.Levering.LabelLogoBepaler).%New())
 	Set ..Logger = ##class(vhLib.Logger).%New("LeveringLabels")
 	Quit $$$OK
 ]]></Implementation>
@@ -158,10 +163,13 @@
 #dim KlantOptimaPack As DOM.VKP.VanHoeckeKlant = VerkoopAPI.GeefKlant(##class(DOM.VKP.enu.Klant).OptimaPack())
     
     If KLNr="" Quit $$$ERROR($$$GeneralError,"Verkeerd bonnummer "_..BONNr_": geen data in de global.")
-#dim KlantID As DOM.VKP.VanHoeckeKlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KLNr)
+	;#dim KlantID As DOM.VKP.VanHoeckeKlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KLNr)
     Set ..pxLabelKlant=##class(BL.Flow.Levering.sub.pxKlantPallet).Create()
     If $L($TR($P(xAdres,"\",1,10),"\",""))<5 Set xAdres=^KKL(^KK1(KLNr),0)
     
+    Set ..pxLabelKlant.Logo = ..LabelLogoBepaler.GeefLogo(KLNr)
+    
+    /*
     If (KlantID = ##class(DOM.VKP.enu.Klant).OptimaPack()){
 	    Set ..pxLabelKlant.Logo = ""
     } ElseIf (KlantID = ##class(DOM.VKP.enu.Klant).HaefeleNederland()) || (KlantID = ##class(DOM.VKP.enu.Klant).HaefeleBelgie()) || (KlantID = ##class(DOM.VKP.enu.Klant).HaefeleDuitsland() || (KlantID = ##class(DOM.VKP.enu.Klant).VanRaemdonck()))  {
@@ -173,6 +181,7 @@
     } Else{
 		Set ..pxLabelKlant.Logo="logo\Logo VHZwart.svg"
     }
+    */
     Set ..pxLabelKlant.KlantNaam=$Piece(xAdres,"\",2)
     Set ..pxLabelKlant.Toenaam=$Piece(xAdres,"\",3)
     Set ..pxLabelKlant.StraatNaamNr=$Piece(xAdres,"\",5)
@@ -234,6 +243,17 @@
 	Set xPR0=^KPR(..PRNr,0),xPR1=^KPR(..PRNr,1),xPR2=^KPR(..PRNr,2),xPR3=^KPR(..PRNr,3)
 	Set ..pxLabelProduct.Product=$S(Taal="N":"Product",Taal="F":"Produit",Taal="D":"Product",1:"Product")
 	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KLNr)
+	#dim StandaardLogo As %String = "logo\Logo VHZwart.svg"
+	If '(KlantID = ##class(DOM.VKP.enu.Klant).HaefeleBelgie()) && (##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsActiefHaefeleBENaarEindklant()) {
+		Set ..pxLabelKlant.Logo = StandaardLogo
+	} ElseIf(KlantID = ##class(DOM.VKP.enu.Klant).HaefeleDuitsland()) {
+		Set ..pxLabelKlant.Logo = StandaardLogo
+	}
+	Else {
+		Set ..pxLabelKlant.Logo = ..LabelLogoBepaler.GeefLogo()
+	}
+	
+	/*
 	If ((KLNr=$$$KlantSchachermayerAU)||(KLNr=$$$KlantSchachermayerNL)) {
 		Set ..pxLabelProduct.Logo=..pxLabelProduct.GetClientLogo(KLNr)
 	} ElseIf KlantID = ##class(DOM.VKP.enu.Klant).HaefeleNederland() {
@@ -247,6 +267,7 @@
     } Else{
 		Set ..pxLabelProduct.Logo="logo\Logo VHZwart.svg"
     }
+    */
 	Set ..pxLabelProduct.Korttekst=$Piece(xPR0,"\")
 	Set ..pxLabelProduct.AantalTitel=$S(Taal="N":"Aantal",Taal="F":"Quantité",Taal="D":"Menge",1:"Quantity")
 	Set ..pxLabelProduct.AantalStuks=AantalStuks