Index: vhTest/Fake/BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml
===================================================================
diff -u -r40835 -r63382
--- vhTest/Fake/BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml	(.../OnderdelendoosLogoBepaler.cls.xml)	(revision 40835)
+++ vhTest/Fake/BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml	(.../OnderdelendoosLogoBepaler.cls.xml)	(revision 63382)
@@ -8,11 +8,18 @@
 <Super>BL.PPS.common.impl.OnderdelendoosLogoBepaler</Super>
 
 <Method name="GeefLogo">
-<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<FormalSpec>KlantNummer:TECH.Integer</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
+
+<Method name="WilLogoOpAlleEtiketten">
+<FormalSpec>KlantNummer:TECH.Integer</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml
===================================================================
diff -u -r58718 -r63382
--- vhTest/Mock/BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml	(.../OnderdelendoosLogoBepaler.cls.xml)	(revision 58718)
+++ vhTest/Mock/BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml	(.../OnderdelendoosLogoBepaler.cls.xml)	(revision 63382)
@@ -9,11 +9,18 @@
 <Inheritance>right</Inheritance>
 
 <Method name="GeefLogo">
-<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<FormalSpec>KlantNummer:TECH.Integer</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLogo",Klant)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLogo",KlantNummer)
 ]]></Implementation>
 </Method>
+
+<Method name="WilLogoOpAlleEtiketten">
+<FormalSpec>KlantNummer:TECH.Integer</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("WilLogoOpAlleEtiketten",KlantNummer)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml
===================================================================
diff -u -r62283 -r63382
--- BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml	(.../OnderdelendoosLogoBepaler.cls.xml)	(revision 62283)
+++ BL/PPS/common/impl/OnderdelendoosLogoBepaler.cls.xml	(.../OnderdelendoosLogoBepaler.cls.xml)	(revision 63382)
@@ -4,22 +4,23 @@
 <Super>TECH.Mockable</Super>
 
 <Method name="GeefLogo">
-<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<FormalSpec>KlantNummer:TECH.Integer</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim KlantID As %String = Klant.GeefID()
-	#dim KlantNummer As TECH.Integer = $Piece(KlantID,"||",2)
-	
-	Quit:(KlantID=##class(DOM.VKP.enu.Klant).DuPont()) "logo\"_^IPCom("CS","LOGO"_KlantNummer,0)
-	Quit:(KlantID=##class(DOM.VKP.enu.Klant).HaefeleNederland()) ""
-	Quit:(KlantID=##class(DOM.VKP.enu.Klant).HaefeleBelgie()) ""
-	Quit:(KlantID=##class(DOM.VKP.enu.Klant).HaefeleDuitsland()) ""
-	Quit:(KlantID=##class(DOM.VKP.enu.Klant).VanRaemdonck()) "logo\"_^IPCom("CS","LOGO"_KlantNummer,0)
-	
-	;standaardlogo vh
-	Quit "logo\"_$G(^IPCom("CS","LOGO4682",0))
+	#dim Logo As %String = $G(^IPCom("CS","LOGO4682",0))
+	If ..WilLogoOpAlleEtiketten(KlantNummer){
+		Set Logo = $G(^IPCom("CS","LOGO"_KlantNummer,0))
+	}
+	Quit "Logo\"_Logo
 ]]></Implementation>
 </Method>
+
+<Method name="WilLogoOpAlleEtiketten">
+<FormalSpec>KlantNummer:TECH.Integer</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $D(^IPCom("CS","LOGO"_KlantNummer,0,"LogoOpAlleBeslagEtiketten"))
+]]></Implementation>
+</Method>
 </Class>