Index: AX/Uitgaand/PM/Product/impl/ProductDixfConverter.cls.xml
===================================================================
diff -u -r47243 -r47312
--- AX/Uitgaand/PM/Product/impl/ProductDixfConverter.cls.xml	(.../ProductDixfConverter.cls.xml)	(revision 47243)
+++ AX/Uitgaand/PM/Product/impl/ProductDixfConverter.cls.xml	(.../ProductDixfConverter.cls.xml)	(revision 47312)
@@ -3,19 +3,19 @@
 <Class name="AX.Uitgaand.PM.Product.impl.ProductDixfConverter">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="GenerischOrgaluxProductFilter">
-<Type>AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter</Type>
+<Property name="IsBasisProductFilter">
+<Type>AX.Uitgaand.PM.impl.IsBasisProductFilter</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>GenerischOrgaluxProductFilter:AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter</FormalSpec>
+<FormalSpec>IsBasisProductFilter:AX.Uitgaand.PM.impl.IsBasisProductFilter</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..GenerischOrgaluxProductFilter = $$$Inject(GenerischOrgaluxProductFilter,##class(AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New())
+	Set ..IsBasisProductFilter = $$$Inject(IsBasisProductFilter, ##class(AX.Uitgaand.PM.impl.IsBasisProductFilter).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -29,18 +29,18 @@
 	Set AxProduct.ADUCalcTechnologyBOMBOL = ..BepaalADUCalcTechnologyBOMBOL(Product)
 	Set AxProduct.ADUCertClaimLevel = ..BepaalADUCertClaimLevel(Product)
 	Set AxProduct.DisplayProductNumber = Product.Basis.IdentNummer
-	Set AxProduct.EcoResProductDimensionGroupName = $$$If(..GenerischOrgaluxProductFilter.IsGenerischOrgaluxProduct(Product),"Con","")
+	Set AxProduct.EcoResProductDimensionGroupName = $$$If(..IsBasisProductFilter.IsValid(Product),"Con","")
 	Set AxProduct.EcoResProductTranslationDescription = $Translate(Product.Tekst.GetOmschrijving("N"," "),";",",")
 	Set AxProduct.EcoResProductTranslationLanguageId = "nl-be"
 	Set AxProduct.EcoResProductTranslationName = Product.Basis.KortTekst
 	Set AxProduct.EcoResStorageDimensionGroupName = "WMS"
 	Set AxProduct.EcoResTrackingDimensionGroupName = "Batch"
 	Set AxProduct.IsReuseConfigurationEnabled = "Nee"
 	Set AxProduct.IsVariantGenerationEnabled = "Nee"
-	Set AxProduct.ProductSubType = $$$If(..GenerischOrgaluxProductFilter.IsGenerischOrgaluxProduct(Product),"ProductMaster","Product")
+	Set AxProduct.ProductSubType = $$$If(..IsBasisProductFilter.IsValid(Product),"ProductMaster","Product")
 	Set AxProduct.ProductType = "Artikel"
 	Set AxProduct.SearchName = ##class(TECH.StringUtils).StringStrippenVanLeestekensSpatiesTabs(Product.Basis.KortTekst)
-	Set AxProduct.VariantConfigurationTechnology = $$$If(..GenerischOrgaluxProductFilter.IsGenerischOrgaluxProduct(Product),"Vooraf gedefinieerde variant","")
+	Set AxProduct.VariantConfigurationTechnology = $$$If(..IsBasisProductFilter.IsValid(Product),"Vooraf gedefinieerde variant","")
 	Quit AxProduct
 ]]></Implementation>
 </Method>
@@ -52,7 +52,7 @@
 <Implementation><![CDATA[
 	#dim ADUCalcTechnologyBOMBOL As %String = "0"
 	
-	If (..GenerischOrgaluxProductFilter.IsGenerischOrgaluxProduct(Product)) {
+	If (..IsBasisProductFilter.IsValid(Product)) {
 		Set ADUCalcTechnologyBOMBOL = "3"
 	} Else {
 		#dim LinkType = Product.Basis.LinkType
Index: AX/Uitgaand/PM/impl/IsBasisProductFilter.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/PM/impl/IsBasisProductFilter.cls.xml	(revision 0)
+++ AX/Uitgaand/PM/impl/IsBasisProductFilter.cls.xml	(revision 47312)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.PM.impl.IsBasisProductFilter">
+<Super>TECH.RegisteredObject,TECH.Mockable</Super>
+
+<Property name="GenerischOrgaluxProductFilter">
+<Type>AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>GenerischOrgaluxProductFilter:AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..GenerischOrgaluxProductFilter = $$$Inject(GenerischOrgaluxProductFilter, ##class(AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="IsValid">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsValid As %Boolean = $$$False
+	
+	If ..GenerischOrgaluxProductFilter.IsGenerischOrgaluxProduct(Product) {
+		Set IsValid = $$$True
+	}
+	
+	Quit IsValid
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AX/Uitgaand/PM/impl/IsBasisProductFilter/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AX/Uitgaand/PM/impl/IsBasisProductFilter/Test.cls.xml	(revision 0)
+++ vhUnitTest/AX/Uitgaand/PM/impl/IsBasisProductFilter/Test.cls.xml	(revision 47312)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AX.Uitgaand.PM.impl.IsBasisProductFilter.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="ProductId">
+<Type>%String</Type>
+<Default>1000</Default>
+</Parameter>
+
+<Property name="IsBasisProductFilter">
+<Type>AX.Uitgaand.PM.impl.IsBasisProductFilter</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+ 	Do ##super()
+ 	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId)
+ 	Do ##class(vhTest.Utils.DOM.PM.Product).CreeerProduct(..#ProductId)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+ 	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId)
+ 	Do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Generische Orgalux Producten zijn Basisproducten">
+<Implementation><![CDATA[
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeControlerenProduct()
+	
+	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
+	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$True)
+	
+	Set ..IsBasisProductFilter = GenerischOrgaluxProductFilterStub
+	
+	#dim Filter As AX.Uitgaand.PM.impl.IsBasisProductFilter = ..GeefFilter()
+	
+	#dim Resultaat As %Boolean = Filter.IsValid(AxProduct)
+	
+	Do $$$AssertEquals(Resultaat,$$$True)
+]]></Implementation>
+</Method>
+
+<Method name="GeefTeControlerenProduct">
+<Private>1</Private>
+<ReturnType>AX.Uitgaand.PM.Product.impl.Product</ReturnType>
+<Implementation><![CDATA[
+	Set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New()
+	Do Product.BasisSetObjectId(..#ProductId)
+	Quit Product
+]]></Implementation>
+</Method>
+
+<Method name="GeefFilter">
+<Private>1</Private>
+<ReturnType>AX.Uitgaand.PM.impl.IsBasisProductFilter</ReturnType>
+<Implementation><![CDATA[	quit ##class(AX.Uitgaand.PM.impl.IsBasisProductFilter).%New(..IsBasisProductFilter)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/AX/Uitgaand/PM/impl/IsBasisProductFilter.cls.xml
===================================================================
diff -u
--- vhTest/Fake/AX/Uitgaand/PM/impl/IsBasisProductFilter.cls.xml	(revision 0)
+++ vhTest/Fake/AX/Uitgaand/PM/impl/IsBasisProductFilter.cls.xml	(revision 47312)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.AX.Uitgaand.PM.impl.IsBasisProductFilter">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AX.Uitgaand.PM.impl.IsBasisProductFilter</Super>
+
+<Method name="IsValid">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AX/Uitgaand/PM/Product/impl/ProductDixfConverter/Test.cls.xml
===================================================================
diff -u -r46428 -r47312
--- vhUnitTest/AX/Uitgaand/PM/Product/impl/ProductDixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 46428)
+++ vhUnitTest/AX/Uitgaand/PM/Product/impl/ProductDixfConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47312)
@@ -8,8 +8,8 @@
 <Default>1000</Default>
 </Parameter>
 
-<Property name="GenerischOrgaluxProductFilter">
-<Type>AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter</Type>
+<Property name="IsBasisProductFilter">
+<Type>AX.Uitgaand.PM.impl.IsBasisProductFilter</Type>
 <Private>1</Private>
 </Property>
 
@@ -32,10 +32,10 @@
 <Implementation><![CDATA[
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$True)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$True)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -50,10 +50,10 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.LinkType = "HHZ"
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -71,10 +71,10 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.LinkType = "S"
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -89,10 +89,10 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.FSCHout = ""
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -107,10 +107,10 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.FSCHout = "GEEN"
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -125,10 +125,10 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.FSCHout = "5050"
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -143,10 +143,10 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.FSCHout = "8030"
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -161,10 +161,10 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.FSCHout = "CW"
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -179,10 +179,10 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.FSCHout = "7030"
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -197,10 +197,10 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.FSCHout = "RCLD"
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -215,10 +215,10 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.FSCHout = "MC"
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -233,10 +233,10 @@
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	Set AxProduct.Basis.FSCHout = "Z"
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -251,10 +251,10 @@
 <Implementation><![CDATA[
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -268,10 +268,10 @@
 <Implementation><![CDATA[
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$True)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$True)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -285,10 +285,10 @@
 <Implementation><![CDATA[
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -302,10 +302,10 @@
 <Implementation><![CDATA[
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$True)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$True)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -319,10 +319,10 @@
 <Implementation><![CDATA[
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -336,10 +336,10 @@
 <Implementation><![CDATA[
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$True)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$True)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -353,10 +353,10 @@
 <Implementation><![CDATA[
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -370,10 +370,10 @@
 <Implementation><![CDATA[
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$True)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$True)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -387,10 +387,10 @@
 <Implementation><![CDATA[
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$False)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -404,10 +404,10 @@
 <Implementation><![CDATA[
 	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
 	
-	Set GenerischOrgaluxProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.Product.impl.GenerischOrgaluxProductFilter).%New()
-	Do GenerischOrgaluxProductFilterStub.IndienMethodCall("IsGenerischOrgaluxProduct",AxProduct).DanReturn($$$True)
+	Set IsBasisProductFilterStub = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilterStub.IndienMethodCall("IsValid",AxProduct).DanReturn($$$True)
 	
-	Set ..GenerischOrgaluxProductFilter = GenerischOrgaluxProductFilterStub
+	Set ..IsBasisProductFilter = IsBasisProductFilterStub
 	
 	#dim Converter As AX.Uitgaand.PM.Product.impl.ProductDixfConverter = ..GeefConverter()
 	
@@ -430,7 +430,7 @@
 <Method name="GeefConverter">
 <Private>1</Private>
 <ReturnType>AX.Uitgaand.PM.Product.impl.ProductDixfConverter</ReturnType>
-<Implementation><![CDATA[	quit ##class(AX.Uitgaand.PM.Product.impl.ProductDixfConverter).%New(..GenerischOrgaluxProductFilter)
+<Implementation><![CDATA[	quit ##class(AX.Uitgaand.PM.Product.impl.ProductDixfConverter).%New(..IsBasisProductFilter)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Mock/AX/Uitgaand/PM/impl/IsBasisProductFilter.cls.xml
===================================================================
diff -u
--- vhTest/Mock/AX/Uitgaand/PM/impl/IsBasisProductFilter.cls.xml	(revision 0)
+++ vhTest/Mock/AX/Uitgaand/PM/impl/IsBasisProductFilter.cls.xml	(revision 47312)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AX.Uitgaand.PM.impl.IsBasisProductFilter,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="IsValid">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsValid",Product)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>