Index: AXimpl/common/AxProductValidator.cls.xml
===================================================================
diff -u -r55397 -r55441
--- AXimpl/common/AxProductValidator.cls.xml	(.../AxProductValidator.cls.xml)	(revision 55397)
+++ AXimpl/common/AxProductValidator.cls.xml	(.../AxProductValidator.cls.xml)	(revision 55441)
@@ -48,7 +48,7 @@
 	
 	If $$$Not(..SoprIteratorFilter.IsValid(Product)) {
 		Set IsValid = $$$False
-	} ElseIf ((Product.Basis.LinkType = "S") && ($$$Not(..ProductTypeApi.IsSpaceTowerProduct(ProductNummer)))) {
+	} ElseIf ((Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).MoederZonderStock()) && ($$$Not(..ProductTypeApi.IsSpaceTowerProduct(ProductNummer)))) {
 		Set IsValid = $$$False
 	} ElseIf (..IsOngewenstProductInMigratieFilter.IsValid(Product)) {
 		Set IsValid = $$$False
Index: vhUnitTest/AXimpl/common/AxProductValidator/IsGeldig/Test.cls.xml
===================================================================
diff -u -r55398 -r55441
--- vhUnitTest/AXimpl/common/AxProductValidator/IsGeldig/Test.cls.xml	(.../Test.cls.xml)	(revision 55398)
+++ vhUnitTest/AXimpl/common/AxProductValidator/IsGeldig/Test.cls.xml	(.../Test.cls.xml)	(revision 55441)
@@ -57,7 +57,7 @@
 <Method name="Test: Default werking =&gt; IsValid = True">
 <Implementation><![CDATA[
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = "H"
+	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatVH()
 	
 	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
 	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
@@ -83,7 +83,7 @@
 <Method name="Test: SoprIteratorFilter geeft False =&gt; IsValid = False">
 <Implementation><![CDATA[
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = "H"
+	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatVH()
 	
 	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
 	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
@@ -109,7 +109,7 @@
 <Method name="Test: IsOngewenstProductInMigratieFilter geeft True =&gt; IsValid = False">
 <Implementation><![CDATA[
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = "H"
+	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatVH()
 	
 	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
 	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
@@ -135,7 +135,7 @@
 <Method name="Test: IdentNummer begint met 6 =&gt; IsValid = False">
 <Implementation><![CDATA[
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = "H"
+	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatVH()
 	Set Product.Basis.IdentNummer = "6.123.451.0"
 	
 	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
@@ -162,7 +162,7 @@
 <Method name="Test: LinkType in S en is geen IsSpaceTowerProduct =&gt; IsValid = False">
 <Implementation><![CDATA[
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = "S"
+	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).MoederZonderStock()
 	
 	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
 	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
@@ -192,7 +192,7 @@
 <Method name="Test: IsSpaceTowerProduct maar LinkType in niet S =&gt; IsValid = True">
 <Implementation><![CDATA[
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = "H"
+	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatVH()
 	
 	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
 	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
@@ -222,7 +222,7 @@
 <Method name="Test: LinkType in S en IsSpaceTowerProduct =&gt; IsValid = True">
 <Implementation><![CDATA[
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = "S"
+	Set Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).MoederZonderStock()
 	
 	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
 	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
Index: vhUnitTest/AXimpl/common/AxProductValidator/IsGeldigWithAxConfigId/Test.cls.xml
===================================================================
diff -u -r55399 -r55441
--- vhUnitTest/AXimpl/common/AxProductValidator/IsGeldigWithAxConfigId/Test.cls.xml	(.../Test.cls.xml)	(revision 55399)
+++ vhUnitTest/AXimpl/common/AxProductValidator/IsGeldigWithAxConfigId/Test.cls.xml	(.../Test.cls.xml)	(revision 55441)
@@ -51,7 +51,6 @@
 <Method name="Test: Default werking =&gt; IsValid = True">
 <Implementation><![CDATA[
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = "H"
 	
 	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
 	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
@@ -77,7 +76,6 @@
 <Method name="Test: SoprIteratorFilter geeft False =&gt; IsValid = False">
 <Implementation><![CDATA[
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = "H"
 	
 	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
 	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
@@ -103,7 +101,6 @@
 <Method name="Test: IsOngewenstProductInMigratieFilter geeft True =&gt; IsValid = False">
 <Implementation><![CDATA[
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = "H"
 	
 	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()
 	Do AxProductFactoryStub.IndienMethodCall("Maak", ..#ProductId).DanReturn(Product)
@@ -129,7 +126,6 @@
 <Method name="Test: IdentNummer begint met 6 =&gt; IsValid = False">
 <Implementation><![CDATA[
 	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..#ProductId)
-	Set Product.Basis.LinkType = "H"
 	Set Product.Basis.IdentNummer = "6.123.451.0"
 	
 	#dim AxProductFactoryStub As AXimpl.common.AxProductFactory = ##class(vhTest.Mock.AXimpl.common.AxProductFactory).%New()