Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r49662 -r50293
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 49662)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 50293)
@@ -79,6 +79,11 @@
 	
 	Try {
 		Set Product = ..ProductService.GeefProduct(ProductId, Request.ItemId)
+		
+		If $$$Not($IsObject(Product)) {
+			;Set Product = ..ProductService.GeefProductGemaaktVolgensKenmerken(Request)
+		}
+		
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/Converter/AxProductKenmerkenConverter.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/Converter/AxProductKenmerkenConverter.cls.xml	(revision 0)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/Converter/AxProductKenmerkenConverter.cls.xml	(revision 50293)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefConvertedAxKenmerken">
+<FormalSpec>Attributes:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute</FormalSpec>
+<ReturnType>DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefConvertedAxKenmerken",Attributes)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/AX/CalculatedProduct/Converter/AxProductKenmerkenConverter.cls.xml
===================================================================
diff -u
--- WSimpl/AX/CalculatedProduct/Converter/AxProductKenmerkenConverter.cls.xml	(revision 0)
+++ WSimpl/AX/CalculatedProduct/Converter/AxProductKenmerkenConverter.cls.xml	(revision 50293)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter">
+<Super>TECH.RegisteredObject,TECH.Mockable</Super>
+
+<Method name="GeefConvertedAxKenmerken">
+<FormalSpec>Attributes:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute</FormalSpec>
+<ReturnType>DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken</ReturnType>
+<Implementation><![CDATA[
+	#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken = ##class(DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken).%New()
+	
+	
+	
+	Quit IngegevenKenmerken
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/ProductService/Test.cls.xml
===================================================================
diff -u -r47603 -r50293
--- vhUnitTest/WSimpl/AX/CalculatedProduct/ProductService/Test.cls.xml	(.../Test.cls.xml)	(revision 47603)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/ProductService/Test.cls.xml	(.../Test.cls.xml)	(revision 50293)
@@ -38,6 +38,37 @@
 	Do ProductApiMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: GeefProductGemaaktVolgensKenmerken roept de AxProductKenmerkenConverter en de BerekeningService op">
+<Implementation><![CDATA[
+	Set Attribute = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute).%New()
+	Set Attribute.Name = "AttribuutEen"
+	Set Attribute.ValueTxt = "ValueTxtEen"
+	
+	Set Attributes = ##class(%ListOfDataTypes).%New()
+	Do Attributes.Insert(Attribute)
+	
+	Set Request = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	Set Request.Attribute = Attributes
+	Set Request.CustAccount = "01234"
+	Set Request.Qty = 25
+	
+	#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken
+	Set IngegevenKenmerken = ##class(vhTest.Utils.DOM.PM.Maatwerk.Calc.Common.impl.LBXKenmerken).StandaardLade()
+	
+	Set AxProductKenmerkenConverterMock = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter).%New()
+	Do AxProductKenmerkenConverterMock.VerwachtMethodCall("GeefConvertedAxKenmerken",Request.Attribute).DanReturn(IngegevenKenmerken)
+	
+	Set BerekeningServiceMock = ##class(vhTest.Mock.APPS.PM.Maatwerk.impl.BerekeningServiceProduct).%New()
+	Do BerekeningServiceMock.VerwachtMethodCall("MaakProductVanKenmerken",IngegevenKenmerken,"K||1234",25).DanDoeNiks()
+	
+	#dim ProductService As WSimpl.AX.CalculatedProduct.ProductService = ##class(WSimpl.AX.CalculatedProduct.ProductService).%New(,BerekeningServiceMock, AxProductKenmerkenConverterMock)
+	Do ProductService.GeefProductGemaaktVolgensKenmerken(Request)
+	
+	Do AxProductKenmerkenConverterMock.Verifieer()
+	Do BerekeningServiceMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductService.cls.xml
===================================================================
diff -u -r47603 -r50293
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 47603)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 50293)
@@ -14,6 +14,13 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefProduct",ProductId,IdentNummer)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefProductGemaaktVolgensKenmerken">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefProductGemaaktVolgensKenmerken",Request)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r49662 -r50293
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 49662)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 50293)
@@ -58,6 +58,12 @@
 	Do ProductServiceStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde, $$$ElkeWaarde).DanException(##class(TECH.Exceptions.GeneralErrorException).%New(RandomExceptionMessage))
 	
 	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	Set AxdEntityAttribute = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute).%New()
+	Set AxdEntityAttribute.Name = "AdminProductNummer"
+	Set AxdEntityAttribute.ValueTxt = "1000"
+	Set AttributeLijst = ##class(%ListOfDataTypes).%New()
+	Do AttributeLijst.Insert(AxdEntityAttribute)
+	Set DummyRequest.Attribute = AttributeLijst
 	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub)
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(DummyRequest, "RandomMessageId")
 	
Index: WSimpl/AX/CalculatedProduct/ProductService.cls.xml
===================================================================
diff -u -r47603 -r50293
--- WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 47603)
+++ WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 50293)
@@ -3,19 +3,37 @@
 <Class name="WSimpl.AX.CalculatedProduct.ProductService">
 <Super>TECH.Mockable</Super>
 
+<Property name="AxProductKenmerkenConverter">
+<Type>WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="AxToAdminUtils">
+<Type>AXimpl.AxToAdminUtils</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="ProductApi">
 <Type>DOM.PM.ProductAPI</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="BerekeningService">
+<Type>APPS.PM.Maatwerk.impl.BerekeningServiceProduct</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ProductApi:DOM.PM.ProductAPI=""</FormalSpec>
+<FormalSpec>ProductApi:DOM.PM.ProductAPI="",BerekeningService:APPS.PM.Maatwerk.impl.BerekeningServiceProduct="",AxProductKenmerkenConverter:WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..AxToAdminUtils = ##class(AXimpl.AxToAdminUtils).%New()
 	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New())
+	Set ..BerekeningService = $$$Inject(BerekeningService, ##class(APPS.PM.Maatwerk.impl.BerekeningServiceProduct).%New())
+	Set ..AxProductKenmerkenConverter = $$$Inject(AxProductKenmerkenConverter, ##class(WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -32,6 +50,15 @@
 	Quit ..ProductApi.GeefProduct(ProductId)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefProductGemaaktVolgensKenmerken">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[
+	#dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken = ..AxProductKenmerkenConverter.GeefConvertedAxKenmerken(Request.Attribute)
+	Quit ..BerekeningService.MaakProductVanKenmerken(IngegevenKenmerken, ..AxToAdminUtils.ConvertCustomerID(Request.CustAccount), Request.Qty)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/WSimpl/AX/CalculatedProduct/Converter/AxProductKenmerkenConverter.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WSimpl/AX/CalculatedProduct/Converter/AxProductKenmerkenConverter.cls.xml	(revision 0)
+++ vhTest/Fake/WSimpl/AX/CalculatedProduct/Converter/AxProductKenmerkenConverter.cls.xml	(revision 50293)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.AX.CalculatedProduct.Converter.AxProductKenmerkenConverter</Super>
+
+<Method name="GeefConvertedAxKenmerken">
+<FormalSpec>Attributes:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute</FormalSpec>
+<ReturnType>DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/WSimpl/AX/CalculatedProduct/ProductService.cls.xml
===================================================================
diff -u -r47603 -r50293
--- vhTest/Fake/WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 47603)
+++ vhTest/Fake/WSimpl/AX/CalculatedProduct/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 50293)
@@ -13,6 +13,13 @@
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
+
+<Method name="GeefProductGemaaktVolgensKenmerken">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>