Index: vhUnitTest/AXimpl/Utils/ConvertUOMSeqGroupId/Test.cls.xml
===================================================================
diff -u -r46987 -r47532
--- vhUnitTest/AXimpl/Utils/ConvertUOMSeqGroupId/Test.cls.xml	(.../Test.cls.xml)	(revision 46987)
+++ vhUnitTest/AXimpl/Utils/ConvertUOMSeqGroupId/Test.cls.xml	(.../Test.cls.xml)	(revision 47532)
@@ -23,6 +23,11 @@
 <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()
@@ -37,6 +42,7 @@
 	Set ..ConvertorLeveranciersnummerVanHoeckeNaarHalux = ##class(vhTest.Fake.AX.Uitgaand.PM.impl.Convertor.ConvertorLeveranciersnummerVanHoeckeNaarHalux).%New()
 	Set ..PartijApi = ##class(vhTest.Fake.DOM.PARTIJ.PartijAPI).%New()
 	Set ..VoorraadInstellingCalculator = ##class(vhTest.Fake.AX.Uitgaand.PM.VrijgegProduct.impl.VoorraadInstellingCalculator).%New()
+	Set ..IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
 ]]></Implementation>
 </Method>
 
@@ -47,6 +53,26 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Stap 0 UOMSeqGroupId is STK als het een BasisProduct betreft">
+<Implementation><![CDATA[
+	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
+	Do LegacyProductAPIStub.IndienMethodCall("GeefLeverancierNummer",$$$ElkeWaarde).DanReturn(6051)
+	
+	#dim AxProduct As AX.Uitgaand.PM.Product.impl.Product = ..GeefTeConverterenProduct()
+	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$True)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
+	#dim Converter As AXimpl.Utils = ..GeefConverter()
+	
+	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
+	
+	Do $$$AssertEquals(UOMSeqGroupId,"STK")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Stap 1a UOMSeqGroupId is STK streepje GVP">
 <Implementation><![CDATA[
 	#dim LegacyProductAPIStub As vhTest.Mock.DOM.PM.LegacyProductAPI = ##class(vhTest.Mock.DOM.PM.LegacyProductAPI).MockInstance()
@@ -58,6 +84,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 0
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -77,6 +108,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 0
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -96,6 +132,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 0
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -115,6 +156,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 0
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -134,6 +180,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = ""
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -153,6 +204,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -172,6 +228,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -191,6 +252,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -210,6 +276,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -229,6 +300,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -248,6 +324,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -267,6 +348,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -286,6 +372,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -305,6 +396,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -324,6 +420,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -343,6 +444,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -362,6 +468,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -381,6 +492,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -400,6 +516,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -419,6 +540,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 0
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -438,6 +564,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 0
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -457,6 +588,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -476,6 +612,11 @@
 	Set AxProduct.Prijs.GrootVerpakking = 1
 	Set AxProduct.Basis.PalletAantal = 1
 	
+	Set IsBasisProductFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsBasisProductFilter).%New()
+	Do IsBasisProductFilter.IndienMethodCall("IsValid",AxProduct).DanReturn($$$False)
+	
+	Set ..IsBasisProductFilter = IsBasisProductFilter
+	
 	#dim Converter As AXimpl.Utils = ..GeefConverter()
 	
 	#dim UOMSeqGroupId As %String = Converter.ConvertUOMSeqGroupId(AxProduct)
@@ -497,7 +638,7 @@
 <Method name="GeefConverter">
 <Private>1</Private>
 <ReturnType>AXimpl.Utils</ReturnType>
-<Implementation><![CDATA[	quit ##class(AXimpl.Utils).%New(..PartijApi,..ConvertorLeveranciersnummerVanHoeckeNaarHalux,..VoorraadInstellingCalculator)
+<Implementation><![CDATA[	quit ##class(AXimpl.Utils).%New(..PartijApi,..ConvertorLeveranciersnummerVanHoeckeNaarHalux,..VoorraadInstellingCalculator,,,,,..IsBasisProductFilter)
 ]]></Implementation>
 </Method>
 </Class>