Index: APPS/Halux/Docs/impl/LadeKlantEtiketBuilder.cls.xml
===================================================================
diff -u -r71822 -r71855
--- APPS/Halux/Docs/impl/LadeKlantEtiketBuilder.cls.xml	(.../LadeKlantEtiketBuilder.cls.xml)	(revision 71822)
+++ APPS/Halux/Docs/impl/LadeKlantEtiketBuilder.cls.xml	(.../LadeKlantEtiketBuilder.cls.xml)	(revision 71855)
@@ -158,7 +158,7 @@
 	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(Partij.GeefID())	
 	Set Etiket.LblToelevering = ..GeefVertalingLabel("DOSSIER",Partij.GeefTaal(),"Dossier")
 	Set Etiket.ToeleveringID = Toelevering.GeefID()
-	Set Etiket.LogoImg = Klant.GeefLogo()	
+	Set Etiket.LogoImg = ##class(BL.Flow.Levering.LabelLogoBepaler).%New().GeefLogo(Toelevering.GeefOorsprongKetting(), Klant.GeefCode())
 	
 	If ToeleveringLijn.GeefOrderID()'="" {
 		#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(ToeleveringLijn.GeefOrderID())
Index: vhDeploy/Deploy20230919xNieuweMappingLogosBlumPolen.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20230919xNieuweMappingLogosBlumPolen.cls.xml	(revision 0)
+++ vhDeploy/Deploy20230919xNieuweMappingLogosBlumPolen.cls.xml	(revision 71855)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20230919xNieuweMappingLogosBlumPolen">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Nieuwe mapping voor logos van distributeurs van Blum Polen. Voor alle etiketten en leverbon.</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set ^IPCom("CS","LOGO_BPL_101",0) = "Logo BlumPL Pakdrew.svg"
+	Set ^IPCom("CS","LOGO_BPL_102",0) = "Logo BlumPL CenterMebel.svg"
+	Set ^IPCom("CS","LOGO_BPL_103",0) = "Logo BlumPL Merkury.svg"
+	
+	Set ^IPCom("CS","LOGO_BPL_101",0,"LogoOpAlleBeslagEtiketten")=1
+	Set ^IPCom("CS","LOGO_BPL_102",0,"LogoOpAlleBeslagEtiketten")=1
+	Set ^IPCom("CS","LOGO_BPL_103",0,"LogoOpAlleBeslagEtiketten")=1
+	
+	Kill ^IPCom("CS","LOGO_BPL_BPL002")
+	Kill ^IPCom("CS","LOGO_BPL_BPL_005")
+	Kill ^IPCom("CS","LOGO_BPL_J53338")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r71661 -r71855
--- DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71661)
+++ DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71855)
@@ -31,7 +31,13 @@
 	} Else {
 		Try {
 			#dim OorsprongKetting As %List = ..GeefOorsprongKettingLijst(OorsprongKettingString)
-			#dim PersonalityID As %Integer = $Piece($List(OorsprongKetting, 1),",", 1)
+			#dim PersonalityID As %Integer
+			
+			If $ListLength(OorsprongKetting) < 3 {
+				Set PersonalityID = $Piece($List(OorsprongKetting, 1),",", 1)
+			} Else {
+				Set PersonalityID = $Piece($List(OorsprongKetting, $ListLength(OorsprongKetting) - 1),",", 1)
+			}
 		} Catch {
 			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 			Do ##class(vhLib.Logger).%New().Warning("EindPersonalityBepaler","Er was een probleem met het verwerken van oorsprongketting '"_OorsprongKettingString_"'")
Index: vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml
===================================================================
diff -u -r64693 -r71855
--- vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 64693)
+++ vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 71855)
@@ -73,11 +73,11 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Ketting met 3 items (bv Seefelder -&gt; Hein -&gt; Van Hoecke)">
+<Method name="Test: Ketting met 3 items (bv Seefelder -&gt; Hein -&gt; Van Hoecke) geeft Hein">
 <Implementation><![CDATA[
 	#dim Ketting As %String = "((13, ""seefelder"", 1234), (11, ""hein_221"", 255024), (1, ""K||7833"", 255025))"
 	
-	Do $$$AssertEquals(..VoerUit(Ketting).GeefID(), ##class(DOM.common.enu.Personality).Seefelder())
+	Do $$$AssertEquals(..VoerUit(Ketting).GeefID(), ##class(DOM.common.enu.Personality).Hein())
 ]]></Implementation>
 </Method>