Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml
===================================================================
diff -u -r45911 -r46524
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 45911)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLbx/1014463.xml	(.../1014463.xml)	(revision 46524)
@@ -10,6 +10,7 @@
     <ProductName>LB4M/E ABAC500x564 X SWWI</ProductName>
     <RequestMessageId>DummyRequestMessageId</RequestMessageId>
     <SalesId>DummySalesId</SalesId>
+    <SourcingDataAreaId>HLX</SourcingDataAreaId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
       <BOMQty>2</BOMQty>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml
===================================================================
diff -u -r46393 -r46524
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 46393)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestOl/64938.xml	(.../64938.xml)	(revision 46524)
@@ -11,6 +11,7 @@
     <ProductName>OO.VLFV30INVLAKVERD</ProductName>
     <RequestMessageId>DummyRequestMessageId</RequestMessageId>
     <SalesId>DummySalesId</SalesId>
+    <SourcingDataAreaId>VHBE</SourcingDataAreaId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
       <BOMQty>1</BOMQty>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml
===================================================================
diff -u -r45911 -r46524
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 45911)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTbx/777573.xml	(.../777573.xml)	(revision 46524)
@@ -10,6 +10,7 @@
     <ProductName>TB8MAI.A45F500x564   TSBZ</ProductName>
     <RequestMessageId>DummyRequestMessageId</RequestMessageId>
     <SalesId>DummySalesId</SalesId>
+    <SourcingDataAreaId>HLX</SourcingDataAreaId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
       <BOMQty>2</BOMQty>
Index: vhUnitTest/DOM/PM/impl/ProductTypeAPIimpl/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/PM/impl/ProductTypeAPIimpl/Test.cls.xml	(revision 0)
+++ vhUnitTest/DOM/PM/impl/ProductTypeAPIimpl/Test.cls.xml	(revision 46524)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.PM.impl.ProductTypeAPIimpl.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: een Product is geen GenerischAfgeleidProduct indien een Product geen GenerischeProductId heeft">
+<Implementation><![CDATA[
+	#dim RandomProductId As %String = "RandomProductId"
+	
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Do ProductStub.IndienMethodCall("GeefGenerischProductID").DanReturn("")
+	
+	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiStub.IndienMethodCall("GeefProduct", RandomProductId).DanReturn(ProductStub)
+	
+	#dim ProductTypeApi As DOM.PM.ProductTypeAPI = ##class(DOM.PM.impl.ProductTypeAPIimpl).%New(ProductApiStub)
+	#dim IsGenerischAfgeleidProduct As %Boolean = ProductTypeApi.IsGenerischAfgeleidProduct(RandomProductId)
+	
+	Do $$$AssertFalse(IsGenerischAfgeleidProduct)
+]]></Implementation>
+</Method>
+
+<Method name="Test: een Product is een GenerischAfgeleidProduct indien een Product gevonden wordt het GenerischeProductId">
+<Implementation><![CDATA[
+	Do ..AssertGenerischAfgeleidProduct($$$False, $$$False)
+	Do ..AssertGenerischAfgeleidProduct($$$True, $$$True)
+]]></Implementation>
+</Method>
+
+<Method name="AssertGenerischAfgeleidProduct">
+<FormalSpec>BestaatProduct:%Boolean,VerwachtResultaat:%Boolean</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim RandomProductId As %String = "RandomProductId"
+	#dim RandomGenerischProductId As %String = "RandomGenerischProductId"
+	
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Do ProductStub.IndienMethodCall("GeefGenerischProductID").DanReturn(RandomGenerischProductId)
+	
+	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiStub.IndienMethodCall("GeefProduct", RandomProductId).DanReturn(ProductStub)
+	Do ProductApiStub.IndienMethodCall("BestaatProduct", RandomGenerischProductId).DanReturn(BestaatProduct)
+	
+	#dim ProductTypeApi As DOM.PM.ProductTypeAPI = ##class(DOM.PM.impl.ProductTypeAPIimpl).%New(ProductApiStub)
+	#dim IsGenerischAfgeleidProduct As %Boolean = ProductTypeApi.IsGenerischAfgeleidProduct(RandomProductId)
+	
+	Do $$$AssertEquals(IsGenerischAfgeleidProduct, VerwachtResultaat)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml
===================================================================
diff -u -r45911 -r46524
--- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 45911)
+++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestTax/1648504.xml	(.../1648504.xml)	(revision 46524)
@@ -10,6 +10,7 @@
     <ProductName>TA4M/E CDRR500x564    W W</ProductName>
     <RequestMessageId>DummyRequestMessageId</RequestMessageId>
     <SalesId>DummySalesId</SalesId>
+    <SourcingDataAreaId>HLX</SourcingDataAreaId>
     <BOMLine class="entity">
       <BOMLine>1</BOMLine>
       <BOMQty>1</BOMQty>
Index: DOM/PM/impl/ProductTypeAPIimpl.cls.xml
===================================================================
diff -u -r45507 -r46524
--- DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 45507)
+++ DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 46524)
@@ -3,6 +3,24 @@
 <Class name="DOM.PM.impl.ProductTypeAPIimpl">
 <Super>TECH.RegisteredObject,DOM.PM.ProductTypeAPI</Super>
 
+<Property name="ProductApi">
+<Type>DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ProductApi:DOM.PM.ProductAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductType">
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>DOM.PM.enu.ProductType</ReturnType>
@@ -427,9 +445,10 @@
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim ProductAPI As DOM.PM.ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
-	#dim Product As DOM.PM.Product = ProductAPI.GeefProduct(ProductID)
-	Quit ProductAPI.BestaatProduct(Product.GeefGenerischProductID())
+	#dim Product As DOM.PM.Product = ..ProductApi.GeefProduct(ProductID)
+	#dim GenerischProductId As %String = Product.GeefGenerischProductID()
+	
+	Quit ($$$Not(GenerischProductId = "") && ..ProductApi.BestaatProduct(GenerischProductId))
 ]]></Implementation>
 </Method>
 </Class>