Index: APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler.cls.xml
===================================================================
diff -u -r33486 -r33523
--- APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler.cls.xml	(.../TussenEtiketVoorToeleveringBepaler.cls.xml)	(revision 33486)
+++ APPS/Halux/PPS/Document/impl/common/TussenEtiketVoorToeleveringBepaler.cls.xml	(.../TussenEtiketVoorToeleveringBepaler.cls.xml)	(revision 33523)
@@ -57,13 +57,13 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim KennisAnkersTekst As %String = ""
-	#dim KennisAnkerIterator As TECH.Iterator	
+	#dim KennisAnkerIterator As TECH.ListIterator	
 	#dim ProductIDIterator As TECH.Iterator = ..ToeleveringService.GeefProductIDIterator(ToeleveringID)
 	#dim ActiedomeinIterator As TECH.Iterator = ##class(TECH.ListbuildIterator).%New($ListBuild("PROD:ASM","PROD:VERP"))
 	Set KennisAnkerIterator = ..KennisAnkerRepository.GeefKennisAnkerIterator(..ToeleveringService.GeefKlant(ToeleveringID).GeefID(), ProductIDIterator,ActiedomeinIterator)
 	While KennisAnkerIterator.HasNext() {
 		#dim KennisAnker As Derde.Kennis.Kennis = KennisAnkerIterator.Next()
-		Set KennisAnkersTekst = KennisAnkersTekst _ KennisAnker.Msg 
+		Set KennisAnkersTekst = KennisAnkersTekst _ KennisAnker.Msg
 		Set:KennisAnkerIterator.HasNext() KennisAnkersTekst = KennisAnkersTekst _ ";"
 	}
 	Quit KennisAnkersTekst
Index: DOM/common/Kennis/impl/KennisAnkerRepository.cls.xml
===================================================================
diff -u -r33473 -r33523
--- DOM/common/Kennis/impl/KennisAnkerRepository.cls.xml	(.../KennisAnkerRepository.cls.xml)	(revision 33473)
+++ DOM/common/Kennis/impl/KennisAnkerRepository.cls.xml	(.../KennisAnkerRepository.cls.xml)	(revision 33523)
@@ -12,22 +12,21 @@
 <FormalSpec>KlantID:%String="",ProductIDIterator:TECH.Iterator,ActieDomeinen:TECH.Iterator</FormalSpec>
 <ReturnType>TECH.ListIterator</ReturnType>
 <Implementation><![CDATA[
-	Set KennisAnkers = ##class(%ListOfDataTypes).%New()
-	#dim KennisAnkerIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(##class(%ListOfDataTypes).%New(KennisAnkers))
+	#dim KlantNr As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(KlantID)
 	
+	Set KennisAnkers = ##class(%ListOfDataTypes).%New()	
 	#dim Error As %String = ""
-	#dim KennisIDLb As %List = ""
 	
-	while ProductIDIterator.HasNext() {
-		#dim ProductID As %String  = ProductIDIterator.Next()		
-		Set KennisIDLb = ##class(BL.Derde.Kennis.Kennis).GetIDsToPopup(KlantID,.Error,##class(TECH.ListUtils).IteratorToListbuild(ActieDomeinen),$LB(ProductID))
-		
-		Set KennisAnkerIDIt = ##class(TECH.ListbuildIterator).%New(KennisIDLb)		
-		While KennisAnkerIDIt.HasNext() {
-			#dim Kennis As Derde.Kennis.Kennis = ..GeefViaID(KennisAnkerIDIt.Next())			
-			Do KennisAnkers.Insert(Kennis)
+	Set ProductIDLb = ##class(TECH.ListUtils).IteratorToListbuild(ProductIDIterator)
+	Set KennisIDLb = ##class(BL.Derde.Kennis.Kennis).GetIDsToPopup(KlantNr,.Error,##class(TECH.ListUtils).IteratorToListbuild(ActieDomeinen),ProductIDLb)
+	Set KennisAnkerIDIt = ##class(TECH.ListbuildIterator).%New(KennisIDLb)		
+	While KennisAnkerIDIt.HasNext() {
+		#dim Kennis As Derde.Kennis.Kennis = ..GeefViaID(KennisAnkerIDIt.Next())			
+		Do KennisAnkers.Insert(Kennis)
 		}
-	}
+		
+	#dim KennisAnkerIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(KennisAnkers)
+	
 	Quit KennisAnkerIterator
 ]]></Implementation>
 </Method>