Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57492 -r58536
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57492)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 58536)
@@ -80,7 +80,7 @@
 	#dim ProductId As %String = ..GeefAttributeValueTxtVolgensAttributeName(Request.Attribute, "AdminProductNummer")
 	
 	Try {
-		If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol() && (..IsLbx(ProductId, Request.Attribute))) {
+		If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol() && (..IsIngefaseerd(ProductId, Request))) {
 			Set Product = ..ProductVolgensAxAttribuutBepaler.GeefProductVolgensAttrVsAdminProdNr(Request)
 		} Else {
 			Set Product = ..GeefProduct(Request, ProductId)
@@ -142,6 +142,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsIngefaseerd">
+<FormalSpec>ProductId:%String,Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsIngefaseerd As %Boolean = $$$False
+	#dim IsLade As %Boolean = ($$$Not(..GeefAttributeValueTxtVolgensAttributeName(Request.Attribute, "Familie") = ""))
+	
+	If IsLade {
+		Set IsIngefaseerd = ..IsLbx(ProductId, Request.Attribute)
+	}
+	
+	Quit IsIngefaseerd
+]]></Implementation>
+</Method>
+
 <Method name="GeefAxAttribute">
 <FormalSpec>AttributeName:%String,AttributeValueTxt:%String</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r57492 -r58536
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57492)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 58536)
@@ -242,19 +242,14 @@
 	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 	
 	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub) //.ExactAantalKeer(0)
+	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
 	Set ..ProductService = ProductServiceMock
 	
-	;#dim ProductVolgensAxAttribuutBepalerMock As WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler).%New()
-	;Do ProductVolgensAxAttribuutBepalerMock.VerwachtMethodCall("GeefProductVolgensAttrVsAdminProdNr", Request).DanReturn(ProductStub)
-	;Set ..ProductVolgensAxAttribuutBepaler = ProductVolgensAxAttribuutBepalerMock
-	
 	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).TAX())
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 	
 	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
 	Do ..Verifieer()
-	;Do ..ProductVolgensAxAttribuutBepaler.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -283,6 +278,46 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie NIET igv waarde Attribuut Familie = leeg">
+<Implementation><![CDATA[
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$True, ..#Applicatie)
+	
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId, $$$True, $$$True)
+	
+	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
+	Set ..ProductService = ProductServiceMock
+	
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).LBX())
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
+	
+	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
+	Do ..Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie NIET igv Attribuut Familie niet aanwezig">
+<Implementation><![CDATA[
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$True, ..#Applicatie)
+	
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId, $$$False)
+	
+	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
+	Set ..ProductService = ProductServiceMock
+	
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).LBX())
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
+	
+	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
+	Do ..Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; RequestConverter vult ErrorText in indien een exceptie geraised wordt bij het ophalen van het Product">
 <Implementation><![CDATA[
 	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("DOM.common.ProjectSettingsApi_IsActiefAttrVsAdminProdNrInBomBol", $$$True, ..#Applicatie)
@@ -295,9 +330,9 @@
 	#dim ProductVolgensAxAttribuutBepalerStub As WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler).%New()
 	Do ProductVolgensAxAttribuutBepalerStub.IndienMethodCall("GeefProductVolgensAttrVsAdminProdNr", $$$ElkeWaarde).DanException(##class(TECH.Exceptions.GeneralErrorException).%New(RandomExceptionMessage))
 	
-	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(,,,,,, ProductVolgensAxAttribuutBepalerStub, LadeVariantBepalerStub)
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(DummyRequest, ..#RandomMessageId)
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 	
 	Do $$$AssertEquals(ConfigVariant.ErrorText, RandomExceptionMessage)
 ]]></Implementation>
@@ -356,7 +391,7 @@
 </Method>
 
 <Method name="MaakRequest">
-<FormalSpec>ProductId:%String</FormalSpec>
+<FormalSpec>ProductId:%String,IsAttribuutFamilieAanwezig:%Boolean=1,IsAttribuutFamilieLeeg:%Boolean=0</FormalSpec>
 <Private>1</Private>
 <ReturnType>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</ReturnType>
 <Implementation><![CDATA[
@@ -369,6 +404,14 @@
 	
 	Do Request.Attribute.Insert(..MaakAttribute("AdminProductNummer", ProductId))
 	
+	If IsAttribuutFamilieAanwezig {
+		If IsAttribuutFamilieLeeg {
+			Do Request.Attribute.Insert(..MaakAttribute("Familie", ""))
+		} Else {
+			Do Request.Attribute.Insert(..MaakAttribute("Familie", "Lade"))
+		}
+	}
+	
 	Quit Request
 ]]></Implementation>
 </Method>