Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestBlum.cls.xml
===================================================================
diff -u -r45914 -r45950
--- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestBlum.cls.xml	(.../TestBlum.cls.xml)	(revision 45914)
+++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestBlum.cls.xml	(.../TestBlum.cls.xml)	(revision 45950)
@@ -87,6 +87,85 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test conversie zoekt juiste product voor niet Sopr contract">
+<Implementation><![CDATA[
+	#Dim ProductLijn as vhTest.Mock.DOM.AKP.ProductToeleveringLijn =  ##class(vhTest.Utils.DOM.AKP.ProductToeleveringLijn).GeefProductToeleveringLijn()
+	Do ProductLijn.VerwachtMethodCall("ZetPalletNummer","PalletNummer").DanDoeNiks()	
+	Set ProductLijnen = ##class(%ListOfObjects).%New()
+	Do ProductLijnen.Insert(ProductLijn)
+    #dim ToeleveringMock as DOM.AKP.Toelevering = ##class(vhTest.Utils.DOM.AKP.Toelevering).StandaardToeleveringHoofding("L||5005",ProductLijnen)
+    Do ToeleveringMock.VerwachtMethodCall("MaakNieuweProductLijn",4321).DanReturn(ProductLijn)
+
+    #dim ToeleveringAPIMock As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
+    Do ToeleveringAPIMock.VerwachtMethodCall("MaakNieuwToelevering","L||5005","").DanReturn(ToeleveringMock)
+    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")
+
+ 	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")
+
+ 	Set RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "4321")
+	Set Antwoord = ##class(AXif.Dynamics.Inventory.MessageParts).%New()
+	Set InventoryOutConverter = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
+	Do InventoryOutConverter.VerwachtMethodCall("Convert",..Matches.DataTransferObject(RequestInventoryOut),"MessageID").DanReturn(Antwoord)
+
+    Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter)
+    #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID")
+
+    Do ToeleveringAPIMock.Verifieer()
+    Do ProductLookupMock.Verifieer()
+    Do ProductLijn.Verifieer()
+    Do ToeleveringMock.Verifieer()
+    Do ReceptieServiceMock.Verifieer()
+    Do InventoryOutConverter.Verifieer()
+
+    
+    Do $$$AssertEquals(Response,Antwoord)
+]]></Implementation>
+</Method>
+
+<Method name="Test SOPRContractId en palletnummer negeren indien leverancier niet Blum">
+<Implementation><![CDATA[
+	#Dim ProductLijn as vhTest.Mock.DOM.AKP.ProductToeleveringLijn =  ##class(vhTest.Utils.DOM.AKP.ProductToeleveringLijn).GeefProductToeleveringLijn()
+	Set ProductLijnen = ##class(%ListOfObjects).%New()
+	Do ProductLijnen.Insert(ProductLijn)
+    #dim ToeleveringMock as DOM.AKP.Toelevering = ##class(vhTest.Utils.DOM.AKP.Toelevering).StandaardToeleveringHoofding("L||5002",ProductLijnen)
+    Do ToeleveringMock.VerwachtMethodCall("MaakNieuweProductLijn",4321).DanReturn(ProductLijn)
+
+    #dim ToeleveringAPIMock As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
+    Do ToeleveringAPIMock.VerwachtMethodCall("MaakNieuwToelevering","L||5002","").DanReturn(ToeleveringMock)
+    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")
+
+ 	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")
+
+ 	Set RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "4321")
+	Set Antwoord = ##class(AXif.Dynamics.Inventory.MessageParts).%New()
+	Set InventoryOutConverter = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
+	Do InventoryOutConverter.VerwachtMethodCall("Convert",..Matches.DataTransferObject(RequestInventoryOut),"MessageID").DanReturn(Antwoord)
+
+    Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter)
+    #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID")
+
+    Do ToeleveringAPIMock.Verifieer()
+    Do ProductLookupMock.Verifieer()
+    ;Do ProductLijn.Verifieer()
+    Do ToeleveringMock.Verifieer()
+    Do ReceptieServiceMock.Verifieer()
+    Do InventoryOutConverter.Verifieer()
+
+    
+    Do $$$AssertEquals(Response,Antwoord)
+]]></Implementation>
+</Method>
+
 <Method name="GeefJournal">
 <Private>1</Private>
 <ReturnType>AXif.Dynamics.InventoryIn.MessageParts.AxdADUMsgWMSJournalOut</ReturnType>
Index: AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml
===================================================================
diff -u -r45845 -r45950
--- AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml	(.../InventoryInConverter.cls.xml)	(revision 45845)
+++ AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml	(.../InventoryInConverter.cls.xml)	(revision 45950)
@@ -128,7 +128,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim ProductId as %String = ""
-	if $Length(JournalEntryLine.SOPRContractId) {
+	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())
@@ -190,7 +190,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) {
+			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())
Index: vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestBlum/TestconversiezoektjuisteproductvoornietSoprcontract/JournaalBlum.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestBlum/TestconversiezoektjuisteproductvoornietSoprcontract/JournaalBlum.xml	(revision 0)
+++ vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestBlum/TestconversiezoektjuisteproductvoornietSoprcontract/JournaalBlum.xml	(revision 45950)
@@ -0,0 +1,14 @@
+<ADUMsgWMSJournalOut xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgWMSJournalOut">
+    <JournalTable>
+        <JournalId>JournalId</JournalId>
+        <JournalTrans>
+            <CustVendAccount>05005</CustVendAccount>
+            <InventTransType>Purch</InventTransType>
+            <ItemId>Identnummer</ItemId>
+            <JournalLineNum>1</JournalLineNum>
+            <LicensePlateId>PalletNummer</LicensePlateId>
+            <Qty>25</Qty>
+            <SOPRContractId></SOPRContractId>
+        </JournalTrans>
+    </JournalTable>
+</ADUMsgWMSJournalOut>
\ No newline at end of file
Index: vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestBlum/TestSOPRContractIdenpalletnummernegerenindienleveranciernietBlum/JournaalBlum.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestBlum/TestSOPRContractIdenpalletnummernegerenindienleveranciernietBlum/JournaalBlum.xml	(revision 0)
+++ vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestBlum/TestSOPRContractIdenpalletnummernegerenindienleveranciernietBlum/JournaalBlum.xml	(revision 45950)
@@ -0,0 +1,14 @@
+<ADUMsgWMSJournalOut xmlns="http://schemas.microsoft.com/dynamics/2008/01/documents/ADUMsgWMSJournalOut">
+    <JournalTable>
+        <JournalId>JournalId</JournalId>
+        <JournalTrans>
+            <CustVendAccount>05002</CustVendAccount>
+            <InventTransType>Purch</InventTransType>
+            <ItemId>Identnummer</ItemId>
+            <JournalLineNum>1</JournalLineNum>
+            <LicensePlateId>PalletNummer</LicensePlateId>
+            <Qty>25</Qty>
+            <SOPRContractId>SoprContractId</SOPRContractId>
+        </JournalTrans>
+    </JournalTable>
+</ADUMsgWMSJournalOut>
\ No newline at end of file
Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/Test.cls.xml
===================================================================
diff -u -r45914 -r45950
--- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 45914)
+++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 45950)
@@ -8,6 +8,7 @@
 <Implementation><![CDATA[
 	Do ##Super(aTestName)
 	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
+	w !,aTestName
 ]]></Implementation>
 </Method>