Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57218 -r57223
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57218)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57223)
@@ -67,7 +67,11 @@
 	#dim Product As DOM.PM.Product = ""
 	
 	Try {
-		Set Product = ..GeefProduct(Request)
+		If ($$$Not(##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol())) {
+			Set Product = ..GeefProduct(Request)
+		} Else {
+			Set Product = ..GeefProductIndienIsActiefAttrVsAdminProdNrInBomBol(Request)
+		}
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Set ConfigVariant.ErrorText = Exception.GeefOmschrijving()
@@ -106,6 +110,64 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefProductIndienIsActiefAttrVsAdminProdNrInBomBol">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[
+	#dim Product As DOM.PM.Product = ""
+	
+	If (Request.AttrVsAdminProdNr = "Customizable") {
+		Set Product = ..GeefProductCustomizableAttrVsAdminProdNr(Request)
+	} ElseIf (Request.AttrVsAdminProdNr = "ChangeRequest") {
+		Set Product = ..GeefProductChangeRequestAttrVsAdminProdNr(Request)
+	} ElseIf (Request.AttrVsAdminProdNr = "Fixed") {
+		Set Product = ..GeefProductFixedAttrVsAdminProdNr(Request)
+	}
+	
+	Quit Product
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductCustomizableAttrVsAdminProdNr">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[
+	#dim Product As DOM.PM.Product = ""
+	
+	
+	
+	Quit Product
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductChangeRequestAttrVsAdminProdNr">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[
+	#dim Product As DOM.PM.Product = ""
+	
+	
+	
+	Quit Product
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductFixedAttrVsAdminProdNr">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[
+	#dim Product As DOM.PM.Product = ""
+	
+	
+	
+	Quit Product
+]]></Implementation>
+</Method>
+
 <Method name="GeefAttributeValueTxtVolgensAttributeName">
 <FormalSpec>AttributeLijst:%ListOfObjects,AttributeName:%String</FormalSpec>
 <Private>1</Private>