Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestBlum.cls.xml
===================================================================
diff -u -r45951 -r46022
--- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestBlum.cls.xml	(.../TestBlum.cls.xml)	(revision 45951)
+++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestBlum.cls.xml	(.../TestBlum.cls.xml)	(revision 46022)
@@ -62,7 +62,7 @@
     Do ToeleveringAPIMock.VerwachtMethodCall("Bewaar",ToeleveringMock).DanDoeNiks()
 
     Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New()
-    Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorSoprContractId","Identnummer","SoprContractId").DanReturn("4321")
+    Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer","L||5005","SoprContractId").DanReturn("4321")
 
  	Set ReceptieServiceMock = ##class(vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService).%New()
  	Do ReceptieServiceMock.VerwachtMethodCall("MaakReceptieVoorToelevering","L||5005","1", ..Matches.List(ProductLijnen) ,$$$CurrentTimeStamp ,"BestelBevestigingNr").DanReturn("RcpNummer")
@@ -101,8 +101,7 @@
     Do ToeleveringAPIMock.VerwachtMethodCall("Bewaar",ToeleveringMock).DanDoeNiks()
 
     Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New()
-    ;Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorSoprContractId","Identnummer","SoprContractId").DanReturn("4321")
-    Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer","L||5005").DanReturn("4321")
+    Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer","L||5005","").DanReturn("4321")
 
  	Set ReceptieServiceMock = ##class(vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService).%New()
  	Do ReceptieServiceMock.VerwachtMethodCall("MaakReceptieVoorToelevering","L||5005","1", ..Matches.List(ProductLijnen) ,$$$CurrentTimeStamp ,"BestelBevestigingNr").DanReturn("RcpNummer")
@@ -141,8 +140,7 @@
     Do ToeleveringAPIMock.VerwachtMethodCall("Bewaar",ToeleveringMock).DanDoeNiks()
 
     Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New()
-    ;Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorSoprContractId","Identnummer","SoprContractId").DanReturn("4321")
-    Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer","L||5002").DanReturn("4321")
+    Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer","L||5002","SoprContractId").DanReturn("4321")
 
  	Set ReceptieServiceMock = ##class(vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService).%New()
  	Do ReceptieServiceMock.VerwachtMethodCall("MaakReceptieVoorToelevering","L||5002","1", ..Matches.List(ProductLijnen) ,$$$CurrentTimeStamp ,"BestelBevestigingNr").DanReturn("RcpNummer")
Index: AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml
===================================================================
diff -u -r46003 -r46022
--- AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml	(.../InventoryInConverter.cls.xml)	(revision 46003)
+++ AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml	(.../InventoryInConverter.cls.xml)	(revision 46022)
@@ -146,12 +146,7 @@
 <FormalSpec>Toelevering:DOM.AKP.Toelevering,JournalEntryLine:AXif.Dynamics.InventoryIn.MessageParts.AxdEntityJournalTrans</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim ProductId as %String = ""
-	if ($Length(JournalEntryLine.SOPRContractId)) & (Toelevering.GeefLeverancierID() = ##class(DOM.AKP.enu.Leverancier).Blum()) {
-		Set ProductId = ..ProductLookup.GeefProductIdVoorSoprContractId(JournalEntryLine.ItemId,JournalEntryLine.SOPRContractId)
-	} else {
-		Set ProductId = ..ProductLookup.GeefProductIdVoorLeverancierId(JournalEntryLine.ItemId,Toelevering.GeefLeverancierID())
-	}
+	#dim ProductId as %String = ..ProductLookup.GeefProductIdVoorLeverancierId(JournalEntryLine.ItemId,Toelevering.GeefLeverancierID(),JournalEntryLine.SOPRContractId)
 	#dim Aantal as %Decimal = JournalEntryLine.Qty
 	#dim ToeleveringLijn As DOM.AKP.ProductToeleveringLijn = Toelevering.MaakNieuweProductLijn(ProductId)
 	Do ToeleveringLijn.ZetAantal(JournalEntryLine.Qty)
@@ -209,11 +204,7 @@
 			#dim JournalEntryLine as AXif.Dynamics.InventoryIn.MessageParts.AxdEntityJournalTrans = JournalLineIterator.Next()
 			#dim Toelevering As DOM.AKP.Toelevering = ..BepaalToelevering(JournalEntry,JournalEntryLine)
 			#dim PRId as %String = ""
-			if ($Length(JournalEntryLine.SOPRContractId))  & (Toelevering.GeefLeverancierID() = ##class(DOM.AKP.enu.Leverancier).Blum()) {
-				Set PRId = ..ProductLookup.GeefProductIdVoorSoprContractId(JournalEntryLine.ItemId,JournalEntryLine.SOPRContractId)
-			} else {
-				Set PRId = ..ProductLookup.GeefProductIdVoorLeverancierId(JournalEntryLine.ItemId,Toelevering.GeefLeverancierID())
-			}
+			Set PRId = ..ProductLookup.GeefProductIdVoorLeverancierId(JournalEntryLine.ItemId,Toelevering.GeefLeverancierID(),JournalEntryLine.SOPRContractId)
 			Do PRNrLijst.Insert(PRId)
 		}		
 	}