Index: APPS/PM/Maatwerk/impl/TAX/ZijkantLogoService.cls.xml
===================================================================
diff -u -r53810 -r61403
--- APPS/PM/Maatwerk/impl/TAX/ZijkantLogoService.cls.xml	(.../ZijkantLogoService.cls.xml)	(revision 53810)
+++ APPS/PM/Maatwerk/impl/TAX/ZijkantLogoService.cls.xml	(.../ZijkantLogoService.cls.xml)	(revision 61403)
@@ -18,8 +18,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="KlantDataRepository">
+<Type>DOM.VKP.impl.KlantDataRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ZijkantLogoRepository:DOM.PM.Maatwerk.TAX.Data.ZijkantLogoRepository,PersonalityRepository:DOM.common.impl.PersonalityRepository,LegacyPartijAPI:DOM.PARTIJ.impl.LegacyPartijAPI</FormalSpec>
+<FormalSpec>ZijkantLogoRepository:DOM.PM.Maatwerk.TAX.Data.ZijkantLogoRepository,PersonalityRepository:DOM.common.impl.PersonalityRepository,LegacyPartijAPI:DOM.PARTIJ.impl.LegacyPartijAPI,KlantDataRepository:DOM.VKP.impl.KlantDataRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -28,6 +33,7 @@
 	Set ..ZijkantLogoRepository = $$$Inject(ZijkantLogoRepository,##class(DOM.PM.Maatwerk.TAX.Data.ZijkantLogoRepository).%New())
 	Set ..PersonalityRepository = $$$Inject(PersonalityRepository, ##class(DOM.common.impl.PersonalityRepository).%New())
 	Set ..LegacyPartijAPI = $$$Inject(LegacyPartijAPI, ##class(DOM.PARTIJ.impl.LegacyPartijAPI).%New())
+	Set ..KlantDataRepository = $$$Inject(KlantDataRepository, ##class(DOM.VKP.impl.KlantDataRepository).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -59,7 +65,26 @@
 		#dim Personality As DOM.common.impl.Personality = ..PersonalityRepository.GeefViaKlantNummer(KlantNummer)
 		Set ZijkantLogoIterator = ..ZijkantLogoRepository.ZoekViaPersonalityID(Personality.GeefID())
 	} Else {
-		Set ZijkantLogoIterator = ..ZijkantLogoRepository.ZoekViaKlantID(KlantNummer)
+		If (..IsVanHoeckePersonality(PersonalityID)) {
+			Set ZijkantLogoIterator = ..ZijkantLogoRepository.ZoekViaPersonalityIDEnKlantID(PersonalityID, KlantNummer)
+		} Else {
+			If (PersonalityID = ##class(DOM.common.enu.Personality).SFS()) {
+				#dim KlantIterator As TECH.Iterator = ..KlantDataRepository.ZoekSFSHandelIdViaHandelKlantId(##class(DOM.common.SFSPersonality).Instance().GeefPrefix()_KlantNummer)
+				If (KlantIterator.HasNext()) {
+					#dim SFSHandelsKlantId As %String = $Piece($Piece(KlantIterator.Next().Naam,"(",2),"/",1)
+					If $$$HasLength(SFSHandelsKlantId) {
+						Set ZijkantLogoIterator = ..ZijkantLogoRepository.ZoekViaPersonalityIDEnKlantID(##class(DOM.common.enu.Personality).SFS(), SFSHandelsKlantId)
+					}  Else {
+						Set ZijkantLogoIterator = ..ZijkantLogoRepository.ZoekViaPersonalityIDEnKlantID(##class(DOM.common.enu.Personality).SFS(), KlantNummer)
+					}
+				} Else {
+					Set ZijkantLogoIterator = ..ZijkantLogoRepository.ZoekViaPersonalityIDEnKlantID(##class(DOM.common.enu.Personality).SFS(), KlantNummer)
+				}				
+			} Else {
+				Set ZijkantLogoIterator = ..ZijkantLogoRepository.ZoekViaPersonalityIDEnKlantID(PersonalityID, KlantNummer)
+			}		
+		}
+		
 	}
 
 	Quit ..MaakZijkantLogosVoorKlant(ZijkantLogoIterator)
Index: APPS/EDI/common/impl/Validator/ZijkantLogoValidator.cls.xml
===================================================================
diff -u -r53810 -r61403
--- APPS/EDI/common/impl/Validator/ZijkantLogoValidator.cls.xml	(.../ZijkantLogoValidator.cls.xml)	(revision 53810)
+++ APPS/EDI/common/impl/Validator/ZijkantLogoValidator.cls.xml	(.../ZijkantLogoValidator.cls.xml)	(revision 61403)
@@ -13,15 +13,21 @@
 <Private>1</Private>
 </Property>
 
+<Property name="KlantDataRepository">
+<Type>DOM.VKP.impl.KlantDataRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ZijkantLogoService:APPS.PM.Maatwerk.impl.TAX.ZijkantLogoService</FormalSpec>
+<FormalSpec>ZijkantLogoService:APPS.PM.Maatwerk.impl.TAX.ZijkantLogoService,KlantDataRepository:DOM.VKP.impl.KlantDataRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ZijkantLogoService = $$$Inject(ZijkantLogoService, ##class(APPS.PM.Maatwerk.impl.TAX.ZijkantLogoService).%New())
 	Set ..PersonalityRepository = ##class(DOM.common.impl.PersonalityRepository).%New()
+	Set ..KlantDataRepository = $$$Inject(KlantDataRepository, ##class(DOM.VKP.impl.KlantDataRepository).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -53,6 +59,17 @@
 			If (..IsVanHoeckePersonality(PersonalityID) && ..PersonalityRepository.BestaatViaKlantNummer(KlantID)) {			
 				Set PersonalityID = ..PersonalityRepository.GeefViaKlantNummer(KlantID).GeefID()
 				Set IsValid = ..ZijkantLogoService.BestaatLogoVoorPersonalityID(PersonalityID, TaxLade.ZijkantLogoID)
+			} ElseIf (PersonalityID = ##class(DOM.common.enu.Personality).SFS()) {	
+				#dim KlantIterator As TECH.Iterator = ..KlantDataRepository.ZoekSFSHandelIdViaHandelKlantId(##class(DOM.common.SFSPersonality).Instance().GeefPrefix()_KlantID)
+				If (KlantIterator.HasNext()) {
+					#dim SFSHandelsKlantId As %String = $Piece($Piece(KlantIterator.Next().Naam,"(",2),"/",1)
+					
+					If $$$HasLength(SFSHandelsKlantId) {
+						Set IsValid = ..ZijkantLogoService.BestaatLogoVoorKlantID(SFSHandelsKlantId, TaxLade.ZijkantLogoID)
+					} Else {
+						Set IsValid = ..ZijkantLogoService.BestaatLogoVoorKlantID(KlantID, TaxLade.ZijkantLogoID)
+					}
+				} 
 			} Else {
 				Set IsValid = ..ZijkantLogoService.BestaatLogoVoorKlantID(KlantID, TaxLade.ZijkantLogoID)
 			}