Index: vhTest/Mock/AXimpl/Admin/Common/ProductBepaler.cls.xml
===================================================================
diff -u -r47570 -r47783
--- vhTest/Mock/AXimpl/Admin/Common/ProductBepaler.cls.xml	(.../ProductBepaler.cls.xml)	(revision 47570)
+++ vhTest/Mock/AXimpl/Admin/Common/ProductBepaler.cls.xml	(.../ProductBepaler.cls.xml)	(revision 47783)
@@ -15,9 +15,9 @@
 </Method>
 
 <Method name="GeefProductId">
-<FormalSpec>IdentNummer:%String,KlantId:%String</FormalSpec>
+<FormalSpec>IdentNummer:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefProductId",IdentNummer,KlantId)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefProductId",IdentNummer)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml
===================================================================
diff -u -r47572 -r47783
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 47572)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 47783)
@@ -78,7 +78,7 @@
 	Do OrderLevenCyclusServiceMock.VerwachtMethodCall("VoegToeProductVoorKlant",OrderMock,"DummyKlantID","DummyProductID",10).DanReturn(ProductOrderlijnMock).ExactAantalKeer(1)
 	
 	Set ProductBepalerMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
-	Do ProductBepalerMock.VerwachtMethodCall("GeefProductId","0.741.108.3","DummyKlantID").DanReturn("DummyProductID")
+	Do ProductBepalerMock.VerwachtMethodCall("GeefProductId","0.741.108.3").DanReturn("DummyProductID")
 	Do ProductBepalerMock.VerwachtMethodCall("GeefFoutmeldingIndienGenerischProduct","DummyProductID").DanDoeNiks()
 	
 	Set SalesOrderConverter = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New(..GeefOrderApi(OrderMock), OrderLevenCyclusServiceMock,,ProductBepalerMock,..GeefDocumentReferentie(), ..GeefOrderLijnenSorteerder())
Index: AXimpl/Admin/Common/ProductBepaler.cls.xml
===================================================================
diff -u -r47656 -r47783
--- AXimpl/Admin/Common/ProductBepaler.cls.xml	(.../ProductBepaler.cls.xml)	(revision 47656)
+++ AXimpl/Admin/Common/ProductBepaler.cls.xml	(.../ProductBepaler.cls.xml)	(revision 47783)
@@ -35,20 +35,16 @@
 </Method>
 
 <Method name="GeefProductId">
-<FormalSpec>IdentNummer:%String,KlantId:%String</FormalSpec>
+<FormalSpec>IdentNummer:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim SearchCriteria As BL.Prod.sub.pxSearchCriteria = ##class(BL.Prod.sub.pxSearchCriteria).Create($$$ProdCritUsageAll)
-	Set SearchCriteria.At="I"
-	Set SearchCriteria.SearchTxt = IdentNummer
-	Set SearchCriteria.VerifyCustomer = KlantId
-	#dim Producten As %List = ##class(BL.Prod.Search).SearchIndexAsList(SearchCriteria)
-	If ($LL(Producten) = 0) {
-		Do ##class(TECH.Exceptions.InvalidInputException).Throw("Er is geen product gevonden voor IdentNummer " _IdentNummer _" en klant " _KlantId _"!")
-	} ElseIf ($LL(Producten) > 1) {
-		Do ##class(TECH.Exceptions.InvalidInputException).Throw("Er zijn meerdere producten gevonden voor IdentNummer " _IdentNummer _" en klant " _KlantId _"!")
+	#dim ProductId As %String 
+	Try {
+		Set ProductId =  ..ProductApi.GeefProductIdVoorIdentNummer(IdentNummer)
+	} Catch {
+		Do ##class(TECH.Exceptions.InvalidInputException).Throw("Er is geen product gevonden voor IdentNummer " _IdentNummer)
 	}
-	Quit $LG(Producten)
+	Quit ProductId
 ]]></Implementation>
 </Method>
 
Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r47656 -r47783
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 47656)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 47783)
@@ -242,7 +242,7 @@
 	If ..IsSOPRContract(OrderLine) {
 		Set ProductId = ..ProductBepaler.GeefProductIdVoorLeverancierId(OrderLine.ItemId, ##class(DOM.AKP.enu.Leverancier).Blum(), OrderLine.SOPRContractId)
 	} Else {
-		Set ProductId = ..ProductBepaler.GeefProductId(OrderLine.ItemId, Order.GeefKlantID())
+		Set ProductId = ..ProductBepaler.GeefProductId(OrderLine.ItemId)
 	}
 	
 	Do ..ProductBepaler.GeefFoutmeldingIndienGenerischProduct(ProductId)