Index: vhTest/Mock/DOM/PM/ProductAPI.cls.xml
===================================================================
diff -u -r30491 -r45895
--- vhTest/Mock/DOM/PM/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 30491)
+++ vhTest/Mock/DOM/PM/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 45895)
@@ -3,8 +3,7 @@
 <Class name="vhTest.Mock.DOM.PM.ProductAPI">
 <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
-Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+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>DOM.PM.ProductAPI,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
@@ -97,6 +96,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefProductVolgensIdentNr">
+<FormalSpec>IdentNr:%String</FormalSpec>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefProductVolgensIdentNr",IdentNr)
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductVolgensKorttekst">
 <FormalSpec>Korttekst:%String</FormalSpec>
 <ReturnType>DOM.PM.Product</ReturnType>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r45066 -r45895
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 45066)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 45895)
@@ -3,7 +3,12 @@
 <Class name="vhUnitTest.WSimpl.AX.CalculatedProduct.RequestConverter.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="DummyRequest">
+<Property name="RandomProductId">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="RequestMetAdminProductNummer">
 <Type>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</Type>
 <Private>1</Private>
 </Property>
@@ -13,33 +18,30 @@
 <Implementation><![CDATA[
 	Do ##super(aTestName)
 	
-	Set ..DummyRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	Set ..RandomProductId = "RandomProductId"
+	Set ..RequestMetAdminProductNummer = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	
+	Do ..RequestMetAdminProductNummer.Attribute.Insert(..MaakAttribute("AdminProductNummer", ..RandomProductId))
 ]]></Implementation>
 </Method>
 
 <Method name="Test: RequestConverter converteert een AxdEntityRequest naar een AxdEntityConfigVariant">
 <Implementation><![CDATA[
 	#dim RandomItemId As %String = "RandomItemId"
-	#dim RandomProductId As %String = "RandomProductId"
 	#dim RandomInventTransId As %String = "RandomInventTransId"
 	
-	#dim Attribute As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute).%New()
-	Set Attribute.Name = "AdminProductNummer"
-	Set Attribute.ValueTxt = RandomProductId
+	Set ..RequestMetAdminProductNummer.ItemId = RandomItemId
+	Set ..RequestMetAdminProductNummer.InventTransId = RandomInventTransId
 	
-	Set ..DummyRequest.ItemId = RandomItemId
-	Set ..DummyRequest.InventTransId = RandomInventTransId
-	Do ..DummyRequest.Attribute.Insert(Attribute)
-	
 	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
 	Do ProductStub.IndienMethodCall("GeefEANCode")
-	Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(RandomProductId)
+	Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..RandomProductId)
 	Do ProductStub.IndienMethodCall("GeefKorttekst")
 	Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif")
 	
 	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiMock.VerwachtMethodCall("BestaatProduct", RandomProductId).DanReturn($$$True)
-	Do ProductApiMock.VerwachtMethodCall("GeefProduct", RandomProductId).DanReturn(ProductStub)
+	Do ProductApiMock.VerwachtMethodCall("BestaatProduct", ..RandomProductId).DanReturn($$$True)
+	Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..RandomProductId).DanReturn(ProductStub)
 	
 	#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
 	Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, RandomInventTransId).DanReturn(##class(%ListOfObjects).%New())
@@ -48,7 +50,7 @@
 	Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, RandomInventTransId).DanReturn(##class(%ListOfObjects).%New())
 	
 	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiMock, VariantDescriptionBepalerMock, BouwstenenConverterMock)
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(..DummyRequest, "RandomMessageId")
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(..RequestMetAdminProductNummer, "RandomMessageId")
 	
 	Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
 	
@@ -62,18 +64,38 @@
 <Implementation><![CDATA[
 	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$False)
+	Do ProductApiStub.IndienMethodCall("BestaatIdentNr", $$$ElkeWaarde).DanReturn($$$False)
 
+	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
 	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(..DummyRequest, "RandomMessageId")
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(DummyRequest, "RandomMessageId")
 	
 	Do $$$AssertEquals(ConfigVariant.ErrorText, ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound())
 ]]></Implementation>
 </Method>
 
-<Method name="Test: RequestConverter vult ErrorText in indien geen ProductId opgegeven">
+<Method name="Test: RequestConverter vult ErrorText in indien geen Product gevonden wordt voor opgegeven AdminProductNummer">
 <Implementation><![CDATA[
+	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$False)
+	
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(..RequestMetAdminProductNummer, "RandomMessageId")
+	
+	Do $$$AssertEquals(ConfigVariant.ErrorText, ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound())
+]]></Implementation>
+</Method>
+
+<Method name="Test: RequestConverter vult ErrorText in indien geen Product gevonden wordt voor opgegeven ItemId">
+<Implementation><![CDATA[
 	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New()
+	Set Request.ItemId = "OnbestaandeIdentNr"
+	
+	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$False)
+	Do ProductApiStub.IndienMethodCall("BestaatIdentNr", $$$ElkeWaarde).DanReturn($$$False)
+	
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
 	
 	Do $$$AssertEquals(ConfigVariant.ErrorText, ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound())
@@ -84,31 +106,64 @@
 <Implementation><![CDATA[
 	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$False)
+	Do ProductApiStub.IndienMethodCall("BestaatIdentNr", $$$ElkeWaarde).DanReturn($$$False)
 	
 	#dim RandomMessageId As %String = "RandomMessageId"
+	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
 	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(..DummyRequest, RandomMessageId)
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(DummyRequest, RandomMessageId)
 	
 	Do $$$AssertEquals(ConfigVariant.MessageId, RandomMessageId)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: RequestConverter laat velden leeg">
 <Implementation><![CDATA[
-	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
+	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()	
 	
 	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn($$$True)
+	Do ProductApiStub.IndienMethodCall("BestaatProduct", ..RandomProductId).DanReturn($$$True)
 	Do ProductApiStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde).DanReturn(ProductDummy)
 	
 	#dim RandomMessageId As %String = "RandomMessageId"
 	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(..DummyRequest, RandomMessageId)
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(..RequestMetAdminProductNummer, RandomMessageId)
 	
 	Do $$$AssertEquals(ConfigVariant.SourcingDataAreaId, "")
 	Do $$$AssertEquals(ConfigVariant.SourcingRouteId, "")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: RequestConverter haalt Product op op basis van IdentNr indien geen AdminProductNummer is opgegeven">
+<Implementation><![CDATA[
+	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
+	#dim RandomIdentNr As %String = "RandomIdentNr"
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	Set Request.ItemId = RandomIdentNr
+	
+	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiStub.IndienMethodCall("BestaatIdentNr", RandomIdentNr).DanReturn($$$True)
+	Do ProductApiStub.IndienMethodCall("GeefProductVolgensIdentNr", RandomIdentNr).DanReturn(ProductDummy)
+	
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiStub)
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
+]]></Implementation>
+</Method>
+
+<Method name="MaakAttribute">
+<FormalSpec>Name:%String,Value:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute</ReturnType>
+<Implementation><![CDATA[
+	#dim Attribute As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute).%New()
+	
+	Set Attribute.Name = Name
+	Set Attribute.ValueTxt = Value
+	
+	Quit Attribute
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r45066 -r45895
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 45066)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 45895)
@@ -47,6 +47,7 @@
 	Set ConfigVariant.SalesId = Request.SalesId
 	Set ConfigVariant.InventTransId = Request.InventTransId
 	
+	#dim Product As DOM.PM.Product = ""
 	#dim ProductId As %String = ""
 	#dim AttributesIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Request.Attribute)
 	
@@ -59,8 +60,14 @@
 	}
 
 	If ($$$Not(ProductId = "") && (..ProductApi.BestaatProduct(ProductId))) {
-		#dim Product As DOM.PM.Product = ..ProductApi.GeefProduct(ProductId)
-
+		Set Product = ..ProductApi.GeefProduct(ProductId)
+	}	
+	
+	If ((ProductId = "") && (..ProductApi.BestaatIdentNr(Request.ItemId))) {
+		Set Product = ..ProductApi.GeefProductVolgensIdentNr(Request.ItemId)
+	}
+	
+	If $$$Not(Product = "") {
 		Set ConfigVariant.GTIN = Product.GeefEANCode()
 		Set ConfigVariant.ProductName = Product.GeefKorttekst()
 		Set ConfigVariant.CostPrice = Product.GeefNettoAankoopPrijsInclCif()
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml
===================================================================
diff -u -r45066 -r45895
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml	(.../RequestData.cls.xml)	(revision 45066)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/RequestData.cls.xml	(.../RequestData.cls.xml)	(revision 45895)
@@ -36,6 +36,7 @@
 	
 	Do ProductApiStub.IndienMethodCall("BestaatProduct", $$$ElkeWaarde).DanReturn(BestaatProduct)
 	Do ProductApiStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde).DanReturn(ProductDummy)
+	Do ProductApiStub.IndienMethodCall("BestaatIdentNr", $$$ElkeWaarde).DanDoeNiks()
 	
 	#dim VariantDescriptionBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
 	Do VariantDescriptionBepalerStub.IndienMethodCall("Bepaal", ProductDummy, RandomItemId).DanReturn(##class(%ListOfObjects).%New())