Index: AX/Uitgaand/PM/UOMConversie/impl/UOMConversieIterator.cls.xml
===================================================================
diff -u -r41168 -r42533
--- AX/Uitgaand/PM/UOMConversie/impl/UOMConversieIterator.cls.xml	(.../UOMConversieIterator.cls.xml)	(revision 41168)
+++ AX/Uitgaand/PM/UOMConversie/impl/UOMConversieIterator.cls.xml	(.../UOMConversieIterator.cls.xml)	(revision 42533)
@@ -50,15 +50,21 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Utils">
+<Type>AXimpl.Utils</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>QueryAPI:TECH.Query.QueryAPI=""</FormalSpec>
+<FormalSpec>QueryAPI:TECH.Query.QueryAPI="",Utils:AXimpl.Utils</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..Piece = 1
 	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
+	Set ..Utils = $$$Inject(Utils,##class(AXimpl.Utils).%New())
 	Do ..VoerUitQuery()
 	Set ..Converter = ##class(AX.Uitgaand.PM.UOMConversie.impl.UOMConversieDixfConverter).%New()
 	Quit $$$OK
@@ -69,7 +75,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%'"
+	Set SqlStatement = "SELECT ID FROM Prod.Product 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>
@@ -108,7 +114,8 @@
 <Method name="BepaalAantalLijnenPerProduct">
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	Set ..UOMSeqGroupId = ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New("VanHoecke").BepaalUOMSeqGroupId(..Product)
+	Set ..UOMSeqGroupId = ..Utils.ConvertUOMSeqGroupId(##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv(),..Product)
+	// ##class(AX.Uitgaand.PM.VrijgegProduct.impl.VrijgegProductDixfConverter).%New("VanHoecke").BepaalUOMSeqGroupId(..Product)
 	#dim AantalLijnenPerProduct As %Integer
 	Set AantalLijnenPerProduct = $Length(..UOMSeqGroupId,"-") - 1