Index: vhUnitTest/BL/Flow/Levering/LabelLogoBepaler/GeefLogo/Test.cls.xml
===================================================================
diff -u -r71336 -r71662
--- vhUnitTest/BL/Flow/Levering/LabelLogoBepaler/GeefLogo/Test.cls.xml	(.../Test.cls.xml)	(revision 71336)
+++ vhUnitTest/BL/Flow/Levering/LabelLogoBepaler/GeefLogo/Test.cls.xml	(.../Test.cls.xml)	(revision 71662)
@@ -15,90 +15,140 @@
 <Method name="Test: Klant Van Raemdonck heeft Van Raemdonck logo">
 <Implementation><![CDATA[
 	#dim KlantNummer As %Integer = 1523
-	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(KlantNummer)
+	#dim OorsprongKetting As %String = ..GeefDummyOorsprongKettingVoorPersonality(##class(DOM.common.enu.Personality).VanRaemdonck(), KlantNummer)
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
 	Do $$$AssertEquals(Logo,"Logo\Logo Van Raemdonck.jpg")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Klant Schachermayer heeft Schachermayer logo">
 <Implementation><![CDATA[
 	#dim KlantNummer As %Integer = 13446
-	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(KlantNummer)
+	#dim OorsprongKetting = ""
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
 	Do $$$AssertEquals(Logo,"Logo\Logo Schachermayer 13446.jpg")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Klant Du Pont heeft Du Pont logo">
 <Implementation><![CDATA[
 	#dim KlantNummer As %Integer = 1736
-	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(KlantNummer)
+	#dim OorsprongKetting = ..GeefDummyOorsprongKettingVoorPersonality(##class(DOM.common.enu.Personality).Dupont(), KlantNummer)
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
 	Do $$$AssertEquals(Logo,"Logo\Logo Du Pont 1736.jpg")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Klant Haefele NL heeft Haefele NL logo">
 <Implementation><![CDATA[
 	#dim KlantNummer As %Integer = 2671
-	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(KlantNummer)
+	#dim OorsprongKetting = ..GeefDummyOorsprongKettingVoorPersonality(##class(DOM.common.enu.Personality).HaefeleNL(), KlantNummer)
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
 	Do $$$AssertEquals(Logo,"Logo\Logo Haefele NL 2671.jpg")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Klant Haefele B heeft Haefele B logo">
 <Implementation><![CDATA[
 	#dim KlantNummer As %Integer = 4875
-	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(KlantNummer)
+	#dim OorsprongKetting = ..GeefDummyOorsprongKettingVoorPersonality(##class(DOM.common.enu.Personality).HaefeleBE(), KlantNummer)
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
 	Do $$$AssertEquals(Logo,"Logo\Logo Haefele B 4875.png")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Klant Optima heeft Optima logo">
 <Implementation><![CDATA[
 	#dim KlantNummer As %Integer = 6279
-	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(KlantNummer)
+	#dim OorsprongKetting = ""
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
 	Do $$$AssertEquals(Logo,"Logo\Logo Optima 6279.svg")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Klant Hein heeft Hein logo">
 <Implementation><![CDATA[
 	#dim KlantNummer As %Integer = 7833
-	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(KlantNummer)
+	#dim OorsprongKetting = ..GeefDummyOorsprongKettingVoorPersonality(##class(DOM.common.enu.Personality).Hein(), KlantNummer)
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
 	Do $$$AssertEquals(Logo,"Logo\Logo Hein 7833.svg")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Klant Campe Tonny heeft Campe Tonny logo">
 <Implementation><![CDATA[
 	#dim KlantNummer As %Integer = 4826
-	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(KlantNummer)
+	#dim OorsprongKetting = ..GeefDummyOorsprongKettingVoorPersonality(##class(DOM.common.enu.Personality).CampeTonny(), KlantNummer)
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
 	Do $$$AssertEquals(Logo,"Logo\Logo Campe Tonny 4826.jpg")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Klant Hapro heeft Hapro logo">
+<Method name="aTest: Klant Hapro heeft Hapro logo">
 <Implementation><![CDATA[
 	#dim KlantNummer As %Integer = 26471
-	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(KlantNummer)
+	#dim OorsprongKetting = ""
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
 	Do $$$AssertEquals(Logo,"Logo\Logo HaproX 26471.jpg")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Klant Van Hoecke heeft het standaard VH logo">
 <Implementation><![CDATA[
 	#dim KlantNummer As %Integer = 4682
-	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(KlantNummer)
+	#dim OorsprongKetting = ..GeefDummyOorsprongKettingVoorPersonality(##class(DOM.common.enu.Personality).VanHoecke(), KlantNummer)
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
 	Do $$$AssertEquals(Logo,"Logo\Logo VHZwart.svg")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Klant die niet alle logo&apos;s wilt krijgt het van hoecke logo">
 <Implementation><![CDATA[
-	#dim KlantNummer As %Integer = "UT_klantummerNietinIPCom" 
-	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(KlantNummer)
+	#dim KlantNummer As %Integer = "UT_klantummerNietinIPCom"
+	#dim OorsprongKetting = ""
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
 	Do $$$AssertEquals(Logo,"Logo\Logo VHZwart.svg")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Klant Blum Polen die voor zichzelf bestelt heeft eigen logo">
+<Implementation><![CDATA[
+	#dim KlantNummer As %Integer = 37598
+	#dim OorsprongKetting = ..GeefDummyOorsprongKettingVoorPersonality(##class(DOM.common.enu.Personality).BlumPL(), KlantNummer)
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
+	Do $$$AssertEquals(Logo,"Logo\Logo Blum.svg")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Distributeur van Blum Polen heeft eigen logo">
+<Implementation><![CDATA[
+	#dim KlantNummer As %Integer = 37598
+	#dim DistributeurId As %String = "J53338"
+	#dim OorsprongKetting = ..GeefDummyOorsprongKettingVoorBlumPolen(##class(DOM.common.enu.Personality).BlumPL(), KlantNummer, DistributeurId)
+	#dim Logo As %String = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(OorsprongKetting, KlantNummer)
+	Do $$$AssertEquals(Logo,"Logo\Logo BlumPL J53338.svg")
+]]></Implementation>
+</Method>
+
+<Method name="GeefDummyOorsprongKettingVoorPersonality">
+<FormalSpec>PersonalityId:%Integer,KlantNummer:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim DummyOorsprongKetting = "((" _ PersonalityId _ ", ""EindKlant"", 123456), (1, ""K||" _ KlantNummer _ """, 123457))"
+	Quit DummyOorsprongKetting
+]]></Implementation>
+</Method>
+
+<Method name="GeefDummyOorsprongKettingVoorBlumPolen">
+<FormalSpec>PersonalityId:%Integer,KlantNummer:%Integer,DistributeurId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim DummyOorsprongKetting = "((" _ DistributeurId _ ", ""EindKlant"", 123456), (" _ PersonalityId _ ", ""DistributeurNaam"", 123457), (1, ""K||" _ KlantNummer _ """, 123458))"
+	Quit DummyOorsprongKetting
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: BL/Flow/Levering/LabelLogoBepaler.cls.xml
===================================================================
diff -u -r63406 -r71662
--- BL/Flow/Levering/LabelLogoBepaler.cls.xml	(.../LabelLogoBepaler.cls.xml)	(revision 63406)
+++ BL/Flow/Levering/LabelLogoBepaler.cls.xml	(.../LabelLogoBepaler.cls.xml)	(revision 71662)
@@ -3,24 +3,61 @@
 <Class name="BL.Flow.Levering.LabelLogoBepaler">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="Logo">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="GeefLogo">
-<FormalSpec>KlantNummer:%Integer</FormalSpec>
+<FormalSpec>OorsprongKetting:%String,KlantNummer:%Integer</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim Logo As %String = $G(^IPCom("CS","LOGO4682",0))
-	If ..WilLogoOpAlleEtiketten(KlantNummer){
-		Set Logo = $G(^IPCom("CS","LOGO"_KlantNummer,0))
+	Set ..Logo = $G(^IPCom("CS","LOGO4682",0))
+	
+	If (OorsprongKetting = "") {
+		Do ..ZetLogoMetReferentie(KlantNummer)
+	} Else {
+		#dim OorsprongKettingLijst As %List = ..GeefOorsprongKettingLijst(OorsprongKetting)
+		If ($ListLength(OorsprongKettingLijst) < 3) {
+			Do ..ZetLogoMetReferentie(KlantNummer)
+		} Else {
+			#dim TweedePersonality As %String = $Piece($List(OorsprongKettingLijst, 2),",", 1)
+			
+			If (TweedePersonality = ##class(DOM.common.enu.Personality).BlumPL()) {
+				#dim DistributeurId = $Piece($List(OorsprongKettingLijst, 1),",", 1)
+				#dim LogoRef As %String = "_BPL_" _ DistributeurId
+				Do ..ZetLogoMetReferentie(LogoRef)
+			} Else {
+				Do ..ZetLogoMetReferentie(KlantNummer)
+			}
+		}
 	}
-	Quit "Logo\"_Logo
+	
+	Quit "Logo\" _ ..Logo
 ]]></Implementation>
 </Method>
 
-<Method name="WilLogoOpAlleEtiketten">
-<FormalSpec>KlantNummer:%Integer</FormalSpec>
+<Method name="ZetLogoMetReferentie">
+<FormalSpec>LogoReferentie:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit $Get(^IPCom("CS","LOGO"_KlantNummer,0,"LogoOpAlleBeslagEtiketten")) = 1
+<Implementation><![CDATA[
+	If ($Get(^IPCom("CS","LOGO" _ LogoReferentie,0,"LogoOpAlleBeslagEtiketten")) = 1) {
+		Set ..Logo = $G(^IPCom("CS","LOGO" _ LogoReferentie,0))
+	}
 ]]></Implementation>
 </Method>
+
+<Method name="GeefOorsprongKettingLijst">
+<FormalSpec>OorsprongKettingString:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%List</ReturnType>
+<Implementation><![CDATA[
+	Set OorsprongKettingString = $Replace(OorsprongKettingString,"((","")
+	Set OorsprongKettingString = $Replace(OorsprongKettingString,"))","")
+			
+	Quit ##class(TECH.ListUtils).PiecesToListbuild(OorsprongKettingString, "), (")
+]]></Implementation>
+</Method>
 </Class>