Index: AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml
===================================================================
diff -u -r47279 -r47598
--- AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml	(.../InventoryInConverter.cls.xml)	(revision 47279)
+++ AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml	(.../InventoryInConverter.cls.xml)	(revision 47598)
@@ -51,6 +51,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="CurrentLegalEntity">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>ToeleveringAPI:DOM.AKP.ToeleveringAPI,ProductLookup:AXimpl.Admin.Common.ProductBepaler,ReceptieService:APPS.AKP.Receptie.impl.ReceptieService,InventoryOutConverter:AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter,ProductRepository:Prod.ProductRepository</FormalSpec>
 <Private>1</Private>
@@ -90,6 +95,7 @@
 	Set JournalTableIterator = ##class(TECH.ListIterator).%New(WMSJournalOutRequest.JournalTable)
 	While JournalTableIterator.HasNext() {
 		#dim JournalEntry as AXif.Dynamics.InventoryIn.MessageParts.AxdEntityJournalTable = JournalTableIterator.Next()
+		Set ..CurrentLegalEntity = JournalEntry.LegalEntityId
 		Set JournalLineIterator = ##class(TECH.ListIterator).%New(JournalEntry.JournalTrans)
 		While JournalLineIterator.HasNext()	{
 			#dim JournalEntryLine as AXif.Dynamics.InventoryIn.MessageParts.AxdEntityJournalTrans = JournalLineIterator.Next()
@@ -156,7 +162,11 @@
 	if JournalEntryLine.InventTransType = "Sales" {
 		Quit "L||6051" ;Van Hoecke voor terugnames
 	} else {
-		Quit ##class(AXimpl.AxToAdminUtils).ConvertSupplierID(JournalEntryLine.CustVendAccount)
+		if ..CurrentLegalEntity = "vhbe" {
+			Quit ##class(AXimpl.AxToAdminUtils).ConvertSupplierID(JournalEntryLine.CustVendAccount)
+		} else { 
+			Quit ##class(AXimpl.AxToAdminUtils).ConvertSupplierIDHLX(JournalEntryLine.CustVendAccount)
+		}
 	}
 ]]></Implementation>
 </Method>
Index: AXimpl/AxToAdminUtils.cls.xml
===================================================================
diff -u -r47255 -r47598
--- AXimpl/AxToAdminUtils.cls.xml	(.../AxToAdminUtils.cls.xml)	(revision 47255)
+++ AXimpl/AxToAdminUtils.cls.xml	(.../AxToAdminUtils.cls.xml)	(revision 47598)
@@ -16,6 +16,9 @@
 <FormalSpec>SupplierId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
+	; opgelet! geen automatische sync van supplierid en leverancierid. dit wordt manueel gedaan!
+	; voor legale entiteit VH is dus SupplierId = "0" _ LeverancierNr
+	; voor legale entiteit hlx is dit niet nodzakelijk zo.
 	#dim LeverancierId as %String = SupplierId
 	;SOPR leveranciers
 	Set:SupplierId="08607" LeverancierId = "5005"
@@ -42,56 +45,71 @@
 	Set:SupplierId="08628" LeverancierId = "5005"
 	Set:SupplierId="08629" LeverancierId = "5005"
 	Set:SupplierId="08630" LeverancierId = "5005"	
-	;gewone leveranciers
-    Set:SupplierId="06347" LeverancierId = "5026"
-    Set:SupplierId="05645" LeverancierId = "5817"
-    Set:SupplierId="05669" LeverancierId = "5830"
-    Set:SupplierId="05947" LeverancierId = "5926"
-    Set:SupplierId="05497" LeverancierId = "6051"
-    Set:SupplierId="05702" LeverancierId = "6099"
-    Set:SupplierId="05685" LeverancierId = "6118"
-    Set:SupplierId="06237" LeverancierId = "6237"
-    Set:SupplierId="05644" LeverancierId = "6270"
-    Set:SupplierId="06317" LeverancierId = "6317"
-    Set:SupplierId="05541" LeverancierId = "6328"
-    Set:SupplierId="06347" LeverancierId = "6347"
-    Set:SupplierId="05741" LeverancierId = "6369"
-    Set:SupplierId="06415" LeverancierId = "6415"
-    Set:SupplierId="05927" LeverancierId = "6479"
-    Set:SupplierId="06494" LeverancierId = "6494"
-    Set:SupplierId="06501" LeverancierId = "6501"
-    Set:SupplierId="06543" LeverancierId = "6543"
-    Set:SupplierId="06587" LeverancierId = "6587"
-    Set:SupplierId="06588" LeverancierId = "6588"
-    Set:SupplierId="05677" LeverancierId = "6628"
-    Set:SupplierId="05504" LeverancierId = "6689"
-    Set:SupplierId="06636" LeverancierId = "6725"
-    Set:SupplierId="05605" LeverancierId = "6792"
-    Set:SupplierId="05522" LeverancierId = "6813"
-    Set:SupplierId="05588" LeverancierId = "6831"
-    Set:SupplierId="05692" LeverancierId = "6892"
-    Set:SupplierId="05877" LeverancierId = "6943"
-    Set:SupplierId="05721" LeverancierId = "7012"
-    Set:SupplierId="05678" LeverancierId = "7025"
-    Set:SupplierId="05688" LeverancierId = "7063"
-    Set:SupplierId="05867" LeverancierId = "7178"
-    Set:SupplierId="05838" LeverancierId = "7317"
-    Set:SupplierId="05921" LeverancierId = "7407"
-    Set:SupplierId="05756" LeverancierId = "7431"
-    Set:SupplierId="05585" LeverancierId = "7447"
-    Set:SupplierId="05843" LeverancierId = "7494"
-    Set:SupplierId="05586" LeverancierId = "7631"
-    Set:SupplierId="05880" LeverancierId = "7771"
-    Set:SupplierId="05931" LeverancierId = "7802"
-    Set:SupplierId="05898" LeverancierId = "7835"
-    Set:SupplierId="05924" LeverancierId = "7903"
-    Set:SupplierId="05885" LeverancierId = "7917"
-    Set:SupplierId="06657" LeverancierId = "8020"
 
 	Quit "L||"_+LeverancierId
 ]]></Implementation>
 </Method>
 
+<Method name="ConvertSupplierIDHLX">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>SupplierId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	; opgelet! geen sync van supplierid en leverancierid.
+	; voor legale entiteit hlx is dit misschien gelijk, maar wsl niet
+	; voor legale entiteit VH is SupplierId = "0" _ LeverancierNr
+
+	#dim LeverancierId as %String = SupplierId
+
+    Quit:SupplierId="06347" "L||5026"
+    Quit:SupplierId="05645" "L||5817"
+    Quit:SupplierId="05669" "L||5830"
+    Quit:SupplierId="05947" "L||5926"
+    Quit:SupplierId="05497" "L||6051"
+    Quit:SupplierId="05702" "L||6099"
+    Quit:SupplierId="05685" "L||6118"
+    Quit:SupplierId="06237" "L||6237"
+    Quit:SupplierId="05644" "L||6270"
+    Quit:SupplierId="06317" "L||6317"
+    Quit:SupplierId="05541" "L||6328"
+    Quit:SupplierId="06347" "L||6347"
+    Quit:SupplierId="05741" "L||6369"
+    Quit:SupplierId="06415" "L||6415"
+    Quit:SupplierId="05927" "L||6479"
+    Quit:SupplierId="06494" "L||6494"
+    Quit:SupplierId="06501" "L||6501"
+    Quit:SupplierId="06543" "L||6543"
+    Quit:SupplierId="06587" "L||6587"
+    Quit:SupplierId="06588" "L||6588"
+    Quit:SupplierId="05677" "L||6628"
+    Quit:SupplierId="05504" "L||6689"
+    Quit:SupplierId="06636" "L||6725"
+    Quit:SupplierId="05605" "L||6792"
+    Quit:SupplierId="05522" "L||6813"
+    Quit:SupplierId="05588" "L||6831"
+    Quit:SupplierId="05692" "L||6892"
+    Quit:SupplierId="05877" "L||6943"
+    Quit:SupplierId="05721" "L||7012"
+    Quit:SupplierId="05678" "L||7025"
+    Quit:SupplierId="05688" "L||7063"
+    Quit:SupplierId="05867" "L||7178"
+    Quit:SupplierId="05838" "L||7317"
+    Quit:SupplierId="05921" "L||7407"
+    Quit:SupplierId="05756" "L||7431"
+    Quit:SupplierId="05585" "L||7447"
+    Quit:SupplierId="05843" "L||7494"
+    Quit:SupplierId="05586" "L||7631"
+    Quit:SupplierId="05880" "L||7771"
+    Quit:SupplierId="05931" "L||7802"
+    Quit:SupplierId="05898" "L||7835"
+    Quit:SupplierId="05924" "L||7903"
+    Quit:SupplierId="05885" "L||7917"
+    Quit:SupplierId="06657" "L||8020"
+    ; als we hier komen is het een leverancier die we niet voorzien hebben!!!
+    Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Nieuwe leverancier met id '"_SupplierId_"' gedefinieerd in AX Halux, die nog niet voorzien is in Admin Conversiecode."))
+]]></Implementation>
+</Method>
+
 <Method name="ConvertZuluTimeStampToDate">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ZuluTimeStampStringFormaat:%TimeStamp</FormalSpec>
Index: vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestHalux/TestConvertersmijtexceptieindiennognietgekendeleveranciervoorhalux/Journaal.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestHalux/TestConvertersmijtexceptieindiennognietgekendeleveranciervoorhalux/Journaal.xml	(revision 0)
+++ vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestHalux/TestConvertersmijtexceptieindiennognietgekendeleveranciervoorhalux/Journaal.xml	(revision 47598)
@@ -0,0 +1,14 @@
+<AxdADUMsgWMSJournalOut>
+    <JournalTable>
+        <JournalId>JournalId</JournalId>
+        <LegalEntityId>hlx</LegalEntityId>
+        <JournalTrans>
+            <CustVendAccount>01234</CustVendAccount>
+            <InventTransType>Purch</InventTransType>
+            <ItemId>Identnummer</ItemId>
+            <JournalLineNum>1</JournalLineNum>
+            <Qty>25</Qty>
+        </JournalTrans>
+    </JournalTable>
+</AxdADUMsgWMSJournalOut>
+
Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestHalux.cls.xml
===================================================================
diff -u -r47376 -r47598
--- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestHalux.cls.xml	(.../TestHalux.cls.xml)	(revision 47376)
+++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestHalux.cls.xml	(.../TestHalux.cls.xml)	(revision 47598)
@@ -15,15 +15,15 @@
 <Implementation><![CDATA[
 	Set ProductLijnen = ##class(%ListOfObjects).%New()
 	Do ProductLijnen.Insert( ##class(vhTest.Utils.DOM.AKP.ProductToeleveringLijn).GeefProductToeleveringLijn())
-	#dim ToeleveringMock as DOM.AKP.Toelevering = ##class(vhTest.Utils.DOM.AKP.Toelevering).StandaardToeleveringHoofding("L||1234",ProductLijnen)
+	#dim ToeleveringMock as DOM.AKP.Toelevering = ##class(vhTest.Utils.DOM.AKP.Toelevering).StandaardToeleveringHoofding("L||6628",ProductLijnen)
     Do ToeleveringMock.VerwachtMethodCall("MaakNieuweProductLijn",4321).DanReturn(ProductLijnen.GetAt(1))
 
 	#dim ToeleveringAPIMock As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
-    Do ToeleveringAPIMock.VerwachtMethodCall("MaakNieuwToelevering","L||1234","").DanReturn(ToeleveringMock)
+    Do ToeleveringAPIMock.VerwachtMethodCall("MaakNieuwToelevering","L||6628","").DanReturn(ToeleveringMock)
     Do ToeleveringAPIMock.VerwachtMethodCall("Bewaar",ToeleveringMock).DanDoeNiks()
     
     Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
-    Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer","L||1234").DanReturn("4321")
+    Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer","L||6628").DanReturn("4321")
  
  	Set ReceptieServiceMock = ##class(vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService).%New()
  	Do ReceptieServiceMock.VerwachtMethodCall("MaakReceptieVoorToelevering","L||1234","1", ..Matches.List(ProductLijnen) ,$$$CurrentTimeStamp ,"BestelBevestigingNr").DanReturn("RcpNummer").ExactAantalKeer(0)
@@ -51,6 +51,29 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test Converter smijt exceptie indien nog niet gekende leverancier voor halux">
+<Implementation><![CDATA[
+	#dim ToeleveringAPIMock As vhTest.Mock.DOM.AKP.ToeleveringAPI = ##class(vhTest.Mock.DOM.AKP.ToeleveringAPI).MockInstance()
+    Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
+ 	Set ReceptieServiceMock = ##class(vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService).%New() 	
+ 	Set RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "4321")
+	Set InventoryOutConverter = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
+	Set ProductRepositoryMock = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Nieuwe leverancier met id '01234' gedefinieerd in AX Halux, die nog niet voorzien is in Admin Conversiecode.")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+
+    Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock)
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID")
+    
+    Do ToeleveringAPIMock.Verifieer()
+    Do ProductLookupMock.Verifieer()
+    Do ReceptieServiceMock.Verifieer()
+    Do InventoryOutConverter.Verifieer()
+    Do ProductRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefJournal">
 <Private>1</Private>
 <ReturnType>AXif.Dynamics.InventoryIn.MessageParts.AxdADUMsgWMSJournalOut</ReturnType>
Index: vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestHalux/TeststandaardgedragHaluxmaakttoeleveringenGEENreceptieaanengeefteeninventsyncberichtterug/Journaal.xml
===================================================================
diff -u -r46016 -r47598
--- vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestHalux/TeststandaardgedragHaluxmaakttoeleveringenGEENreceptieaanengeefteeninventsyncberichtterug/Journaal.xml	(.../Journaal.xml)	(revision 46016)
+++ vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/TestHalux/TeststandaardgedragHaluxmaakttoeleveringenGEENreceptieaanengeefteeninventsyncberichtterug/Journaal.xml	(.../Journaal.xml)	(revision 47598)
@@ -3,7 +3,7 @@
         <JournalId>JournalId</JournalId>
         <LegalEntityId>hlx</LegalEntityId>
         <JournalTrans>
-            <CustVendAccount>1234</CustVendAccount>
+            <CustVendAccount>05677</CustVendAccount>
             <InventTransType>Purch</InventTransType>
             <ItemId>Identnummer</ItemId>
             <JournalLineNum>1</JournalLineNum>