Index: AX/Uitgaand/PM/ExtArtOmschrLev/impl/ExtArtOmschrLevIterator.cls.xml
===================================================================
diff -u -r41192 -r41214
--- AX/Uitgaand/PM/ExtArtOmschrLev/impl/ExtArtOmschrLevIterator.cls.xml	(.../ExtArtOmschrLevIterator.cls.xml)	(revision 41192)
+++ AX/Uitgaand/PM/ExtArtOmschrLev/impl/ExtArtOmschrLevIterator.cls.xml	(.../ExtArtOmschrLevIterator.cls.xml)	(revision 41214)
@@ -63,27 +63,44 @@
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%'"
-	_" and ID in (1432226,1432225,1425096,1425095,682391,1359867,1168696,1168689,830507,1155640,161442,906194,709825,924268,"
+	//Indien selectie nodig is...
+	/*_" and ID in (1432226,1432225,1425096,1425095,682391,1359867,1168696,1168689,830507,1155640,161442,906194,709825,924268,"
 	_"1124771,1038806,1039173,1039208,1247980,353741,353743,353744,254245,254258,1259381,161441,665626,1067709,1067714,268026,"
-	_"1168369,668615,878186,878220,1169509,1194443,383880,830257)"
+	_"1168369,668615,878186,878220,1169509,1194443,383880,830257)"*/
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>
 
 <Method name="HasNext">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Do ..BepaalDefaultOrderType()
-	// Hier moet beslist worden of het product moet meegenomen worden of niet, afhangend van ..MoetUitgeslotenWorden
-	Quit ( ..ResultSet.Next() > 0 )
+	#dim TeOutputtenProductGevonden As %Boolean = 0
+
+	While($$$Not(TeOutputtenProductGevonden)&&(..ResultSet.Next()>0))
+	{
+		Set ..Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..ResultSet.GetData(1))
+		If (..ResultSet.GetData(1) = "") {
+			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Leeg uit Resultset : '"_..ResultSet.GetData(1)_"' ."))
+		}
+		If $$$Not($IsObject(..Product.Basis)) {
+			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Product bestaat niet : '"_..ResultSet.GetData(1)_"' ."))
+		}
+		Set ..LeverancierNummer = ..Product.Basis.LeverancierNummer
+	
+		Do ..BepaalDefaultOrderType()
+		Do ..BepaalMoetUitgeslotenWorden()
+		Set TeOutputtenProductGevonden = $$$Not(..MoetUitgeslotenWorden)
+	}
+	
+	Quit TeOutputtenProductGevonden
 ]]></Implementation>
 </Method>
 
 <Method name="Next">
 <ReturnType>AXdixf.ExtArtOmschr.ExtArtOmschr</ReturnType>
 <Implementation><![CDATA[
 	#dim ConvertedProduct As AXdixf.ExtArtOmschr.ExtArtOmschr = ..Converter.Convert(..ResultSet.GetData(1))
-	Set ..Product = ConvertedProduct
+
 	Quit ConvertedProduct
 ]]></Implementation>
 </Method>
@@ -126,9 +143,8 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim LinkType As %String = ..Product.Basis.LinkType
-	#dim LeverancierNummer As %String = ..GeefLeverancierNummer()
 	
-	If ((LinkType = "S") && (LeverancierNummer = "6051")){
+	If ((LinkType = "S") && (..LeverancierNummer = "6051")){
 		Set ..DefaultOrderType = "Productie"
 	}
 	Else {
@@ -142,9 +158,7 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim LeverancierNummer As %String = ..GeefLeverancierNummer()
-	
-	If (LeverancierNummer = "6332") {
+	If (..LeverancierNummer = "6332") {
 		Set ..DefaultOrderType = "Productie"
 	}
 	Else {
@@ -154,15 +168,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefLeverancierNummer">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	Set:(..LeverancierNummer = "") ..LeverancierNummer = ..Product.Basis.LeverancierNummer
-	Quit ..LeverancierNummer
-]]></Implementation>
-</Method>
-
 <Method name="LeverancierFilter">
 <Implementation><![CDATA[
 	If ..Vestiging = "VanHoecke" {
@@ -195,8 +200,8 @@
 <Method name="LeverancierFilterHLX">
 <Implementation><![CDATA[
 	#dim LinkType As %String = ..Product.Basis.LinkType
-		
-	If ((LinkType = "HH") && (LinkType = "HHZ")){
+	
+	If ((LinkType = "HH") || (LinkType = "HHZ")){
 		Set ..MoetUitgeslotenWorden = $$$False	
 	}
 	Else{