Index: AX/Uitgaand/PM/ExtArtOmschrLev/impl/ExtArtOmschrLevIterator.cls.xml
===================================================================
diff -u -r47284 -r47501
--- AX/Uitgaand/PM/ExtArtOmschrLev/impl/ExtArtOmschrLevIterator.cls.xml	(.../ExtArtOmschrLevIterator.cls.xml)	(revision 47284)
+++ AX/Uitgaand/PM/ExtArtOmschrLev/impl/ExtArtOmschrLevIterator.cls.xml	(.../ExtArtOmschrLevIterator.cls.xml)	(revision 47501)
@@ -90,6 +90,7 @@
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2')"
+	_" UNION SELECT ID FROM Prod.Product WHERE GenerischeRoutine = '254796'"
 	/*
 	//Indien selectie nodig is...
 	_" and ID in (1432226,1432225,1425096,1425095,682391,1359867,1168696,1168689,830507,1155640,161442,906194,709825,924268,"
Index: AX/Uitgaand/PM/ProductAfbeeldingen/impl/ProductAfbeeldingenIterator.cls.xml
===================================================================
diff -u -r47295 -r47501
--- AX/Uitgaand/PM/ProductAfbeeldingen/impl/ProductAfbeeldingenIterator.cls.xml	(.../ProductAfbeeldingenIterator.cls.xml)	(revision 47295)
+++ AX/Uitgaand/PM/ProductAfbeeldingen/impl/ProductAfbeeldingenIterator.cls.xml	(.../ProductAfbeeldingenIterator.cls.xml)	(revision 47501)
@@ -64,6 +64,7 @@
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2')"
+	_" UNION SELECT ID FROM Prod.Product WHERE GenerischeRoutine = '254796'"
 	/*
 	// Filter voor beperkt resultaat:
 	_" and ID in (1175,1988,2865,161441,161442,254245,254258,268026,353741,353743,353744,383880,665626,668615,682391,"
Index: AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIterator.cls.xml
===================================================================
diff -u -r47270 -r47501
--- AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIterator.cls.xml	(.../WHSReservationHierarchyItemIterator.cls.xml)	(revision 47270)
+++ AX/Uitgaand/PM/WHSReservationHierarchyItem/impl/WHSReservationHierarchyItemIterator.cls.xml	(.../WHSReservationHierarchyItemIterator.cls.xml)	(revision 47501)
@@ -65,6 +65,7 @@
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and KortTekst not like 'GEN%' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2')"
 	_" UNION SELECT ID FROM Prod.Product WHERE KortTekst like 'GEN%'  AND (NonAktief IS null OR NonAktief = '2') AND LeverancierNummer = '6332'"
+	_" UNION SELECT ID FROM Prod.Product WHERE GenerischeRoutine = '254796'"
 	/*_" 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)"*/
Index: AX/Uitgaand/PM/GenVrijgegProduct/impl/GenVrijgegProductDixfConverter.cls.xml
===================================================================
diff -u -r47480 -r47501
--- AX/Uitgaand/PM/GenVrijgegProduct/impl/GenVrijgegProductDixfConverter.cls.xml	(.../GenVrijgegProductDixfConverter.cls.xml)	(revision 47480)
+++ AX/Uitgaand/PM/GenVrijgegProduct/impl/GenVrijgegProductDixfConverter.cls.xml	(.../GenVrijgegProductDixfConverter.cls.xml)	(revision 47501)
@@ -18,20 +18,14 @@
 <Private>1</Private>
 </Property>
 
-<Property name="IsBasisProductFilter">
-<Type>AX.Uitgaand.PM.impl.IsBasisProductFilter</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>AXimplFormatter:AXimpl.Formatter,IsBasisProductFilter:AX.Uitgaand.PM.impl.IsBasisProductFilter,ArtikelGroepBepaler:AX.Uitgaand.PM.VrijgegProduct.impl.ArtikelGroepBepaler</FormalSpec>
+<FormalSpec>AXimplFormatter:AXimpl.Formatter,ArtikelGroepBepaler:AX.Uitgaand.PM.VrijgegProduct.impl.ArtikelGroepBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..AXimplFormatter = $$$Inject(AXimplFormatter,##class(AXimpl.Formatter).%New())
-	Set ..IsBasisProductFilter = $$$Inject(IsBasisProductFilter,##class(AX.Uitgaand.PM.impl.IsBasisProductFilter).%New())
 	Set ..ArtikelGroepBepaler = $$$Inject(ArtikelGroepBepaler,##class(AX.Uitgaand.PM.VrijgegProduct.impl.ArtikelGroepBepaler).%New())
 	Quit $$$OK
 ]]></Implementation>
@@ -65,7 +59,7 @@
 	Set ..AxProduct.DefaultOrderType = $$$If(Vestiging = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv(),"Aankoop","Productie")
 	Set ..AxProduct.DisplayProductNumber = Product.Basis.IdentNummer
 	Set ..AxProduct.EcoResStorageDimensionGroupName = "WMS"
-	Set ..AxProduct.EcoResTrackingDimensionGroupName = $$$If(..IsBasisProductFilter.IsValid(Product),"None","Batch")
+	Set ..AxProduct.EcoResTrackingDimensionGroupName = "None"
 	Set ..AxProduct.Intracode = ..BepaalIntracode(Product)
 	//Set ..AxProduct.IntrastatExclude = "" // ON HOLD
 	Set ..AxProduct.IntraUnit = $$$If(##class(TECH.StringUtils).Equals(..AxProduct.Intracode,"84659500","85043180","90172039"),"1","")
Index: AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter.cls.xml
===================================================================
diff -u -r47494 -r47501
--- AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter.cls.xml	(.../VrijgegProductDixfConverter.cls.xml)	(revision 47494)
+++ AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductDixfConverter.cls.xml	(.../VrijgegProductDixfConverter.cls.xml)	(revision 47501)
@@ -265,6 +265,9 @@
 	Set ..AxProduct.InventSiteId = "VHEPN1"
 	Set ..AxProduct.ItemBuyerGroupId = ..Utils.ConvertItemBuyerGroupId(##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv(),Product)
 	Set ..AxProduct.ItemGroupId = ..ArtikelGroepBepaler.GeefArtikelGroep(Product.Basis.ProductNr,##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv())
+	If (..AxProduct.ItemGroupId = "") {
+		w !,"ArtikelGroep is leeg voor VHBE voor product: '"_Product.Basis.KortTekst_"'"
+	}
 	Set ..AxProduct.ModelGroupId = $$$If(..AxProduct.ItemGroupId="KLEDIJ","NIGL","SOPR")
 	Set ..AxProduct.PmfProductType = ..BepaalPmfProductTypeVH(Product)
 	Set ..AxProduct.ReqGroupId = ..Utils.ConvertReqGroupId(##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv(),Product)
@@ -298,6 +301,9 @@
 	Set ..AxProduct.InventSiteId = "HLXEPN1"
 	Set ..AxProduct.ItemBuyerGroupId = ..Utils.ConvertItemBuyerGroupId(##class(AXimpl.InterneFirmaInitialen).HaluxNv(),Product)
 	Set ..AxProduct.ItemGroupId = ..ArtikelGroepBepaler.GeefArtikelGroep(Product.Basis.ProductNr,##class(AXimpl.InterneFirmaInitialen).HaluxNv())
+	If (..AxProduct.ItemGroupId = "") {
+		w !,"ArtikelGroep is leeg voor HLX voor product: '"_Product.Basis.KortTekst_"'"
+	}
 	Set ..AxProduct.ModelGroupId = $$$If(..AxProduct.ItemGroupId="KLEDIJ","NIGL","SOPR")
 	Set ..AxProduct.PmfProductType = ..BepaalPmfProductTypeHLX(Product)
 	Set ..AxProduct.ReqGroupId = ..Utils.ConvertReqGroupId(##class(AXimpl.InterneFirmaInitialen).HaluxNv(),Product)
Index: AX/Uitgaand/PM/GtinCode/impl/GtinCodeIterator.cls.xml
===================================================================
diff -u -r47277 -r47501
--- AX/Uitgaand/PM/GtinCode/impl/GtinCodeIterator.cls.xml	(.../GtinCodeIterator.cls.xml)	(revision 47277)
+++ AX/Uitgaand/PM/GtinCode/impl/GtinCodeIterator.cls.xml	(.../GtinCodeIterator.cls.xml)	(revision 47501)
@@ -64,6 +64,7 @@
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2')"
+	_" UNION SELECT ID FROM Prod.Product WHERE GenerischeRoutine = '254796'"
 	/*_" 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)"*/
Index: AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductIterator.cls.xml
===================================================================
diff -u -r47212 -r47501
--- AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductIterator.cls.xml	(.../VrijgegProductIterator.cls.xml)	(revision 47212)
+++ AX/Uitgaand/PM/VrijgegProduct/impl/VrijgegProductIterator.cls.xml	(.../VrijgegProductIterator.cls.xml)	(revision 47501)
@@ -64,6 +64,7 @@
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' AND KortTekst NOT LIKE 'GEN%' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2')"
+	_" UNION SELECT ID FROM Prod.Product WHERE GenerischeRoutine = '254796'"
 	// Indien nodig is hieronder een filter voorzien om het resultaat te beperken tot overzichtelijk, voor debugging:
 	/*_" and ID in (1175,1988,2865,161441,161442,254245,254258,268026,353741,353743,353744,383880,665626,668615,682391,"
 	_"709825,830257,830507,878186,878220,906194,924268,1038806,1039173,1039208,1067709,1067714,1124771,1155640,1168369,1168689,"
Index: AX/Uitgaand/PM/Assortimenten/impl/ProductCategorieGenerator.cls.xml
===================================================================
diff -u -r47257 -r47501
--- AX/Uitgaand/PM/Assortimenten/impl/ProductCategorieGenerator.cls.xml	(.../ProductCategorieGenerator.cls.xml)	(revision 47257)
+++ AX/Uitgaand/PM/Assortimenten/impl/ProductCategorieGenerator.cls.xml	(.../ProductCategorieGenerator.cls.xml)	(revision 47501)
@@ -96,7 +96,7 @@
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
 	Set rs=##class(TECH.ResultSet).%New()
-	Do rs.Prepare("SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2') AND ID NOT IN (797700,1102922,1156079,785609,769387,830298,865318,865317,865329,865330,865327)")
+	Do rs.Prepare("SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2') AND ID NOT IN (797700,1102922,1156079,785609,769387,830298,865318,865317,865329,865330,865327,1793108) UNION SELECT ID FROM Prod.Product WHERE GenerischeRoutine = '254796'")
  	Do rs.Execute()
 	Set it=##class(TECH.ResultSetIterator).%New(rs)
 	Quit it
Index: AX/Uitgaand/PM/ProductVertaling/impl/ProductVertalingIterator.cls.xml
===================================================================
diff -u -r47261 -r47501
--- AX/Uitgaand/PM/ProductVertaling/impl/ProductVertalingIterator.cls.xml	(.../ProductVertalingIterator.cls.xml)	(revision 47261)
+++ AX/Uitgaand/PM/ProductVertaling/impl/ProductVertalingIterator.cls.xml	(.../ProductVertalingIterator.cls.xml)	(revision 47501)
@@ -68,6 +68,7 @@
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' AND KortTekst NOT LIKE 'GEN%' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2')"
 	_" UNION SELECT ID FROM Prod.Product WHERE KortTekst like 'GEN%'  AND (NonAktief IS null OR NonAktief = '2') AND LeverancierNummer = '6332'"
+	_" UNION SELECT ID FROM Prod.Product WHERE GenerischeRoutine = '254796'"
 	/*
 	// Indien nodig is hieronder een filter voorzien om het resultaat te beperken tot overzichtelijk, voor debugging:
 	_" and ID in (1175,1988,2865,6945,161441,1342834,1432651)"
Index: vhUnitTest/AX/Uitgaand/PM/GenVrijgegProduct/impl/GenVrijgegProductDixfConverter/Test.cls.xml
===================================================================
diff -u -r47480 -r47501
--- vhUnitTest/AX/Uitgaand/PM/GenVrijgegProduct/impl/GenVrijgegProductDixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47480)
+++ vhUnitTest/AX/Uitgaand/PM/GenVrijgegProduct/impl/GenVrijgegProductDixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47501)
@@ -18,11 +18,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="IsBasisProductFilter">
-<Type>AX.Uitgaand.PM.impl.IsBasisProductFilter</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
  	Do ##super()
@@ -36,7 +31,6 @@
 <Implementation><![CDATA[
 	Do ##super(aTestName)
 	Set ..AXimplFormatter = ##class(vhTest.Dummy.AXimpl.Formatter).%New()
-	Set ..IsBasisProductFilter = ##class(vhTest.Fake.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
 	Set ..ArtikelGroepBepaler = ##class(vhTest.Fake.AX.Uitgaand.PM.VrijgegProduct.impl.ArtikelGroepBepaler).%New()
 ]]></Implementation>
 </Method>
@@ -228,7 +222,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: EcoResTrackingDimensionGroupName is None als de Filter True teruggeeft">
+<Method name="Test: EcoResTrackingDimensionGroupName is None">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
 	do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6332)
@@ -237,10 +231,6 @@
 	
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	
-	#dim IsBasisProductFilter As AX.Uitgaand.PM.impl.IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
-	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$True)
-	Set ..IsBasisProductFilter = IsBasisProductFilter
-	
 	#dim Converter As AX.Uitgaand.PM.GenVrijgegProduct.impl.GenVrijgegProductDixfConverter = ..GeefConverter()
 	
 	#dim ConvertedProduct As %String = Converter.Convert(AxProduct,Firma)
@@ -249,27 +239,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: EcoResTrackingDimensionGroupName is Batch als de Filter False teruggeeft">
-<Implementation><![CDATA[
-	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
-	do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6332)
-	
-	#dim Firma As AXimpl.InterneFirmaInitialen = ##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()
-	
-	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
-	
-	#dim IsBasisProductFilter As AX.Uitgaand.PM.impl.IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
-	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
-	Set ..IsBasisProductFilter = IsBasisProductFilter
-	
-	#dim Converter As AX.Uitgaand.PM.GenVrijgegProduct.impl.GenVrijgegProductDixfConverter = ..GeefConverter()
-	
-	#dim ConvertedProduct As %String = Converter.Convert(AxProduct,Firma)
-	
-	Do $$$AssertEquals(ConvertedProduct.EcoResTrackingDimensionGroupName,"Batch")
-]]></Implementation>
-</Method>
-
 <Method name="Test: Voor ItemGroupId wordt met ProductNr en Vestiging GeefArtikelGroep van de ArtikelGroepBepaler opgeroepen">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
@@ -304,7 +273,7 @@
 <Method name="GeefConverter">
 <Private>1</Private>
 <ReturnType>AX.Uitgaand.PM.GenVrijgegProduct.impl.GenVrijgegProductDixfConverter</ReturnType>
-<Implementation><![CDATA[	Quit ##class(AX.Uitgaand.PM.GenVrijgegProduct.impl.GenVrijgegProductDixfConverter).%New(..AXimplFormatter, ..IsBasisProductFilter, ..ArtikelGroepBepaler)
+<Implementation><![CDATA[	Quit ##class(AX.Uitgaand.PM.GenVrijgegProduct.impl.GenVrijgegProductDixfConverter).%New(..AXimplFormatter, ..ArtikelGroepBepaler)
 ]]></Implementation>
 </Method>
 </Class>
Index: AX/Uitgaand/PM/TMSInventEnabled/impl/TMSInventEnabledIterator.cls.xml
===================================================================
diff -u -r47262 -r47501
--- AX/Uitgaand/PM/TMSInventEnabled/impl/TMSInventEnabledIterator.cls.xml	(.../TMSInventEnabledIterator.cls.xml)	(revision 47262)
+++ AX/Uitgaand/PM/TMSInventEnabled/impl/TMSInventEnabledIterator.cls.xml	(.../TMSInventEnabledIterator.cls.xml)	(revision 47501)
@@ -65,6 +65,7 @@
 	#Dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2')"
 	_" UNION SELECT ID FROM Prod.Product WHERE KortTekst like 'GEN%'  AND (NonAktief IS null OR NonAktief = '2') AND LeverancierNummer = '6332'"
+	_" UNION SELECT ID FROM Prod.Product WHERE GenerischeRoutine = '254796'"
 	/*_" 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)"*/
Index: AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIterator.cls.xml
===================================================================
diff -u -r47267 -r47501
--- AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIterator.cls.xml	(.../VestSpecOrdInstIterator.cls.xml)	(revision 47267)
+++ AX/Uitgaand/PM/VestSpecOrdInst/impl/VestSpecOrdInstIterator.cls.xml	(.../VestSpecOrdInstIterator.cls.xml)	(revision 47501)
@@ -65,6 +65,7 @@
 	#dim SqlStatement as %String
 	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2')"
 	_" UNION SELECT ID FROM Prod.Product WHERE KortTekst like 'GEN%'  AND (NonAktief IS null OR NonAktief = '2') AND LeverancierNummer = '6332'"
+	_" UNION SELECT ID FROM Prod.Product WHERE GenerischeRoutine = '254796'"
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>