Index: AX/Uitgaand/PM/ExtArtOmschrLev/impl/ExtArtOmschrLevIterator.cls.xml
===================================================================
diff -u -r41186 -r41192
--- AX/Uitgaand/PM/ExtArtOmschrLev/impl/ExtArtOmschrLevIterator.cls.xml	(.../ExtArtOmschrLevIterator.cls.xml)	(revision 41186)
+++ AX/Uitgaand/PM/ExtArtOmschrLev/impl/ExtArtOmschrLevIterator.cls.xml	(.../ExtArtOmschrLevIterator.cls.xml)	(revision 41192)
@@ -18,13 +18,39 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LeverancierNummer">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Vestiging">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DefaultOrderType">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="MoetUitgeslotenWorden">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>QueryAPI:TECH.Query.QueryAPI="",Vestiging:%String</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..Vestiging = Vestiging
 	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
 	Do ..VoerUitQuery()
 	Set ..Converter = ##class(AX.Uitgaand.PM.ExtArtOmschrLev.impl.ExtArtOmschrLevDixfConverter).%New(Vestiging)
@@ -46,18 +72,139 @@
 
 <Method name="HasNext">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ( ..ResultSet.Next() > 0 )
+<Implementation><![CDATA[
+	Do ..BepaalDefaultOrderType()
+	// Hier moet beslist worden of het product moet meegenomen worden of niet, afhangend van ..MoetUitgeslotenWorden
+	Quit ( ..ResultSet.Next() > 0 )
 ]]></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>
+
+<Method name="BepaalMoetUitgeslotenWorden">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	If (..DefaultOrderType = "Aankooporder"){
+		Do ..LeverancierFilter()
+	}
+	Else{
+		Set ..MoetUitgeslotenWorden = $$$True	
+	}
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="BepaalDefaultOrderType">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If ..Vestiging = "VanHoecke" {
+		Do ..BepaalDefaultOrderTypeVH()
+	}
+	Else {
+		If ..Vestiging = "Halux" {
+			Do ..BepaalDefaultOrderTypeHLX()
+		}
+		Else {
+			Write !,"Geef als parameter ofwel VanHoecke, ofwel Halux mee!"
+		}
+	}
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="BepaalDefaultOrderTypeVH">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim LinkType As %String = ..Product.Basis.LinkType
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer()
+	
+	If ((LinkType = "S") && (LeverancierNummer = "6051")){
+		Set ..DefaultOrderType = "Productie"
+	}
+	Else {
+		Set ..DefaultOrderType = "Aankooporder"
+	}
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="BepaalDefaultOrderTypeHLX">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim LeverancierNummer As %String = ..GeefLeverancierNummer()
+	
+	If (LeverancierNummer = "6332") {
+		Set ..DefaultOrderType = "Productie"
+	}
+	Else {
+		Set ..DefaultOrderType = "Aankooporder"
+	}
+	Quit
+]]></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" {
+		Do ..LeverancierFilterVH()
+	}
+	Else {
+		If ..Vestiging = "Halux" {
+			Do ..LeverancierFilterHLX()
+		}
+		Else {
+			Write !,"Geef als parameter ofwel VanHoecke, ofwel Halux mee!"
+		}
+	}
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="LeverancierFilterVH">
+<Implementation><![CDATA[
+	If (..LeverancierNummer '= "6332"){
+		Set ..MoetUitgeslotenWorden = $$$False	
+	}
+	Else{
+		Set ..MoetUitgeslotenWorden = $$$True
+	}
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="LeverancierFilterHLX">
+<Implementation><![CDATA[
+	#dim LinkType As %String = ..Product.Basis.LinkType
+		
+	If ((LinkType = "HH") && (LinkType = "HHZ")){
+		Set ..MoetUitgeslotenWorden = $$$False	
+	}
+	Else{
+		Set ..MoetUitgeslotenWorden = $$$True
+	}
+	Quit
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/PM/ExtArtOmschrLev/impl/ExtArtOmschrLevDixfConverter.cls.xml
===================================================================
diff -u -r41187 -r41192
--- AX/Uitgaand/PM/ExtArtOmschrLev/impl/ExtArtOmschrLevDixfConverter.cls.xml	(.../ExtArtOmschrLevDixfConverter.cls.xml)	(revision 41187)
+++ AX/Uitgaand/PM/ExtArtOmschrLev/impl/ExtArtOmschrLevDixfConverter.cls.xml	(.../ExtArtOmschrLevDixfConverter.cls.xml)	(revision 41192)
@@ -113,7 +113,6 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim CustVendRelationVH As %String
-	#dim DefaultOrderTypeVH As %String = ..BepaalDefaultOrderTypeVH()
 	#dim LeverancierNummer As %String = ..GeefLeverancierNummer()
 	
 	Set CustVendRelationVH = ##class(TECH.StringUtils).AddLeadingChar(LeverancierNummer,"0",5)
@@ -135,41 +134,6 @@
 	Quit CustVendRelationHLX
 ]]></Implementation>
 </Method>
-
-<Method name="BepaalDefaultOrderTypeVH">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim BepaalDefaultOrderTypeVH As %String
-	#dim LinkType As %String = ..Product.Basis.LinkType
-	#dim LeverancierNummer As %String = ..GeefLeverancierNummer()
-	
-	If ((LinkType = "S") && (LeverancierNummer = "6051")){
-		Set BepaalDefaultOrderTypeVH = "Productie"
-	}
-	Else {
-		Set BepaalDefaultOrderTypeVH = "Aankooporder"
-	}
-	Quit BepaalDefaultOrderTypeVH
-]]></Implementation>
-</Method>
-
-<Method name="BepaalDefaultOrderTypeHLX">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim BepaalDefaultOrderTypeHLX As %String
-	#dim LeverancierNummer As %String = ..GeefLeverancierNummer()
-	
-	If (LeverancierNummer = "6332") {
-		Set BepaalDefaultOrderTypeHLX = "Productie"
-	}
-	Else {
-		Set BepaalDefaultOrderTypeHLX = "Aankooporder"
-	}
-	Quit BepaalDefaultOrderTypeHLX
-]]></Implementation>
-</Method>
 </Class>