Index: BL/Flow/Levering/LabelLogoBepaler.cls.xml
===================================================================
diff -u -r62276 -r62280
--- BL/Flow/Levering/LabelLogoBepaler.cls.xml	(.../LabelLogoBepaler.cls.xml)	(revision 62276)
+++ BL/Flow/Levering/LabelLogoBepaler.cls.xml	(.../LabelLogoBepaler.cls.xml)	(revision 62280)
@@ -9,7 +9,7 @@
 <Implementation><![CDATA[
 	#dim Logo As %String = $G(^IPCom("CS","LOGO4682",0))
 	If ..WilLogoOpAlleEtiketten(KlantNummer){
-		Set Logo = $Piece(^IPCom("CS","LOGO"_KlantNummer,0),",",1)
+		Set Logo = $G(^IPCom("CS","LOGO"_KlantNummer,0))
 	}
 	Quit "Logo\"_Logo
 ]]></Implementation>
@@ -18,14 +18,7 @@
 <Method name="WilLogoOpAlleEtiketten">
 <FormalSpec>KlantNummer:%Integer</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim WilLogoOpAlleEtiketten As %Boolean
-	If ($D(^IPCom("CS","LOGO"_KlantNummer)) && $Piece(^IPCom("CS","LOGO"_KlantNummer,0),",",2)) {
-		Set WilLogoOpAlleEtiketten = $$$True
-	} Else {
-		Set WilLogoOpAlleEtiketten = $$$False
-	}
-	Quit WilLogoOpAlleEtiketten
+<Implementation><![CDATA[	Quit $D(^IPCom("CS","LOGO"_KlantNummer,0,"AlleEtiketten"))
 ]]></Implementation>
 </Method>
 </Class>