Index: AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIterator.cls.xml
===================================================================
diff -u -r42532 -r42598
--- AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIterator.cls.xml	(.../VestSpecOrdInstIterator.cls.xml)	(revision 42532)
+++ AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIterator.cls.xml	(.../VestSpecOrdInstIterator.cls.xml)	(revision 42598)
@@ -3,13 +3,11 @@
 <Class name="AX.Uitgaand.PM.VestSpecOrdInst.impl.VestSpecOrdInstIterator">
 <Super>TECH.RegisteredObject,TECH.Iterator</Super>
 
-<UDLText name="T">
-<Content><![CDATA[
-// VestSpecOrdInst = VestigingSpecifiekeOrderInstelling
+<Property name="DynIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
 
-]]></Content>
-</UDLText>
-
 <Property name="QueryAPI">
 <Type>TECH.Query.QueryAPI</Type>
 <Private>1</Private>
@@ -34,6 +32,9 @@
 <Implementation><![CDATA[
 	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
 	Do ..VoerUitQuery()
+	Set Filter = ##class(AX.Uitgaand.PM.VestSpecOrdInst.impl.VestSpecOrdInstIteratorFilter).%New()
+	Set ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
+	Set ..DynIterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator,,Filter)
 	Set ..Converter = ##class(AX.Uitgaand.PM.VestSpecOrdInst.impl.VestSpecOrdInstDixfConverter).%New(Vestiging)
 	Quit $$$OK
 ]]></Implementation>
@@ -44,22 +45,23 @@
 <Implementation><![CDATA[
 	#dim SqlTableProdProduct As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName("Prod.Product")
 	#Dim SqlStatement as %String
-	Set SqlStatement = "SELECT IdentNummer FROM "_SqlTableProdProduct_" WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%' AND (NonAktief IS null OR NonAktief = '2')"
+	Set SqlStatement = "SELECT ID FROM "_SqlTableProdProduct_" WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%' AND (NonAktief IS null OR NonAktief = '2')"
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>
 
 <Method name="HasNext">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ( ..ResultSet.Next() > 0 )
+<Implementation><![CDATA[	Quit ..DynIterator.HasNext()
 ]]></Implementation>
 </Method>
 
 <Method name="Next">
 <ReturnType>AXdixf.VestSpecOrdInst.VestSpecOrdInst</ReturnType>
 <Implementation><![CDATA[
-	#dim VestSpecOrdInst As AXdixf.VestSpecOrdInst.VestSpecOrdInst = ..Converter.Convert(..ResultSet)
-	Quit VestSpecOrdInst
+	Set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..DynIterator.Next().GetData(1))
+	#dim ConvertedProduct As AXdixf.VestSpecOrdInst.VestSpecOrdInst = ..Converter.Convert(Product)
+	Quit ConvertedProduct
 ]]></Implementation>
 </Method>
 </Class>
Index: AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIteratorFilter.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIteratorFilter.cls.xml	(revision 0)
+++ AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIteratorFilter.cls.xml	(revision 42598)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.PM.VestSpecOrdInst.impl.VestSpecOrdInstIteratorFilter">
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="IsValid">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="AxProductConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..AxProductConvertor = ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="IsValid">
+<FormalSpec>Item:TECH.ResultSet</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsValid As %Boolean = $$$False
+	#dim ConvertedAxProduct As AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct
+	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(Item.GetData(1))
+	#dim IsBlumProduct As %Boolean = (Product.Basis.LeverancierNummer = "5005")
+	
+	If (IsBlumProduct = 1){
+		Set ConvertedAxProduct = ..AxProductConvertor.AdminNaarAx(Product.Basis.ProductNr)
+		If ((ConvertedAxProduct.IsSoprInAx = 1) && (ConvertedAxProduct.IsSoprInCache = 1) || (ConvertedAxProduct.IsSoprInAx = 0) && (ConvertedAxProduct.IsSoprInCache = 0)){
+			Set IsValid = $$$True
+		} 
+	} Else {
+		Set IsValid = $$$True
+	}
+	
+	Quit IsValid
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 42598 refers to a dead (removed) revision in file `vhUnitTest/AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIterator/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstDixfConverter.cls.xml
===================================================================
diff -u -r41167 -r42598
--- AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstDixfConverter.cls.xml	(.../VestSpecOrdInstDixfConverter.cls.xml)	(revision 41167)
+++ AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstDixfConverter.cls.xml	(.../VestSpecOrdInstDixfConverter.cls.xml)	(revision 42598)
@@ -3,13 +3,6 @@
 <Class name="AX.Uitgaand.PM.VestSpecOrdInst.impl.VestSpecOrdInstDixfConverter">
 <Super>TECH.RegisteredObject</Super>
 
-<UDLText name="T">
-<Content><![CDATA[
-// VestSpecOrdInst = VestigingSpecifiekeOrderInstelling
-
-]]></Content>
-</UDLText>
-
 <Property name="Vestiging">
 <Type>%String</Type>
 <Private>1</Private>
@@ -33,15 +26,15 @@
 </Method>
 
 <Method name="Convert">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>AXdixf.VestSpecOrdInst.VestSpecOrdInst</ReturnType>
 <Implementation><![CDATA[
 	If ..Vestiging = "VanHoecke" {
-		Do ..ConvertVanHoecke(ResultSet)
+		Do ..ConvertVanHoecke(Product)
 	}
 	Else {
 		If ..Vestiging = "Halux" {
-			Do ..ConvertHalux(ResultSet)
+			Do ..ConvertHalux(Product)
 		}
 		Else {
 			Write !,"Geef als parameter ofwel VanHoecke, ofwel Halux mee!"
@@ -52,13 +45,13 @@
 </Method>
 
 <Method name="ConvertVanHoecke">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>AXdixf.VestSpecOrdInst.VestSpecOrdInst</ReturnType>
 <Implementation><![CDATA[
 	Set AxProduct = ##class(AXdixf.VestSpecOrdInst.VestSpecOrdInst).%New()
 	Set AxProduct.InventDimId = "VHEPN1"
 	Set AxProduct.InventLocationId = "MAG1"
-	Set AxProduct.ItemId = ResultSet.GetDataByName("IdentNummer")
+	Set AxProduct.ItemId = Product.Basis.IdentNummer
 	Set AxProduct.PurchInventLocationId = "MAG1"
 	Set AxProduct.SalesInventLocationId = "MAG1"
 	Set AxProduct.InventSiteId = "VHEPN1"
@@ -68,13 +61,13 @@
 </Method>
 
 <Method name="ConvertHalux">
-<FormalSpec>ResultSet:TECH.ResultSet</FormalSpec>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
 <ReturnType>AXdixf.VestSpecOrdInst.VestSpecOrdInst</ReturnType>
 <Implementation><![CDATA[
 	Set AxProduct = ##class(AXdixf.VestSpecOrdInst.VestSpecOrdInst).%New()
 	Set AxProduct.InventDimId = "HLXEPN1"
 	Set AxProduct.InventLocationId = "MAG2"
-	Set AxProduct.ItemId = ResultSet.GetDataByName("IdentNummer")
+	Set AxProduct.ItemId = Product.Basis.IdentNummer
 	Set AxProduct.PurchInventLocationId = "MAG2"
 	Set AxProduct.SalesInventLocationId = "MAG2"
 	Set AxProduct.InventSiteId = "HLXEPN1"