Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml
===================================================================
diff -u -r48487 -r48700
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml	(.../MappingTest.cls.xml)	(revision 48487)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/MappingTest.cls.xml	(.../MappingTest.cls.xml)	(revision 48700)
@@ -85,6 +85,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test Leverancier wordt vh indien supplier leeg en legal entity is vhbe">
+<Implementation><![CDATA[
+	Set ..ProductItem.PrimaryVendorId = ""
+	Do ..ProductMock.VerwachtMethodCall("ZetLeverancierId","L||6051").DanDoeNiks()
+	
+	Do ..Converter.ConvertProductItem(..ProductItem,"vhbe")
+	Do ..ProductMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Leverancier wordt hlx indien supplier leeg en legal entity is hlx">
+<Implementation><![CDATA[
+	Set ..ProductItem.PrimaryVendorId = ""
+	Do ..ProductMock.VerwachtMethodCall("ZetLeverancierId","L||6332").DanDoeNiks()
+	Do ..ProductMock.VerwachtMethodCall("ZetLinkType","HH").DanDoeNiks() ;neveneffect van lev = hlx
+	
+	Do ..Converter.ConvertProductItem(..ProductItem,"hlx")
+	Do ..ProductMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test: Geen prijs velden zetten indien product kindbouwstenen heeft">
 <Implementation><![CDATA[
 	#dim Iterator as TECH.Iterator = ##class(TECH.StringIterator).%New("A") ; er word alleen op de hasnext getest.
@@ -683,7 +704,7 @@
 <Method name="GeefTeConverterenProductItem">
 <Implementation><![CDATA[
 	Set ProductItem = ##class(AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem).%New()	
-	
+	Set ProductItem.PrimaryVendorId = "06666"
 	Set ProductItem.ItemId = "IdentNummer"
 	Set ProductItem.CountableOrDivisible= "Blank"
 	Set ProductItem.CertClaimLevel = "NonApplicable"
@@ -707,6 +728,7 @@
 	Do ProductMock.IndienMethodCall("Save").DanDoeNiks()
 	Do ProductMock.IndienMethodCall("GeefID").DanReturn("ProductID")
 	Do ProductMock.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(##class(vhTest.Utils.NullIterator).%New())
+	Do ProductMock.IndienMethodCall("ZetLeverancierId","L||6666").DanDoeNiks()
 	
 	;Do ProductMock.IndienMethodCall("ZetCifPPL","").DanDoeNiks()
 	Do ProductMock.IndienMethodCall("ZetPPL","").DanDoeNiks()
Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml
===================================================================
diff -u -r48687 -r48700
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 48687)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 48700)
@@ -69,6 +69,7 @@
 		Do ..Logger.Info("AX ProductSynchronizatie","Product voor legal entity '" _ LegalEntity _ "' met leverancier '"_ ProductItem.PrimaryVendorId _ "' overgeslagen.")
 		quit
 	}
+	
 	try {		
 		if ..ProductAPI.BestaatIdentNr(ProductItem.ItemId) {
 			Do ..Logger.Info("AX ProductSynchronizatie","Bestaand product met ident nummer '"_ProductItem.ItemId_"'")
@@ -475,8 +476,15 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
- Quit:(LegalEntity="vhbe") ##class(AXimpl.AxToAdminUtils).ConvertSupplierID(ProductItem.PrimaryVendorId)
- Quit:(LegalEntity="hlx") ##class(AXimpl.AxToAdminUtils).ConvertSupplierIDHLX(ProductItem.PrimaryVendorId)
+ if (LegalEntity="vhbe"){
+	 Quit:(ProductItem.PrimaryVendorId = "") "L||6051"
+	 Quit ##class(AXimpl.AxToAdminUtils).ConvertSupplierID(ProductItem.PrimaryVendorId)
+ }
+	
+ If (LegalEntity="hlx"){
+	 Quit:ProductItem.PrimaryVendorId="" "L||6332"
+	 Quit ##class(AXimpl.AxToAdminUtils).ConvertSupplierIDHLX(ProductItem.PrimaryVendorId)
+ }
 ]]></Implementation>
 </Method>
 
Index: AXimpl/AxToAdminUtils.cls.xml
===================================================================
diff -u -r48679 -r48700
--- AXimpl/AxToAdminUtils.cls.xml	(.../AxToAdminUtils.cls.xml)	(revision 48679)
+++ AXimpl/AxToAdminUtils.cls.xml	(.../AxToAdminUtils.cls.xml)	(revision 48700)
@@ -60,7 +60,7 @@
 	; voor legale entiteit VH is SupplierId = "0" _ LeverancierNr
 
 	#dim LeverancierId as %String = SupplierId
-
+	Quit:SupplierId="" ""
     Quit:SupplierId="06347" "L||5026"
     Quit:SupplierId="05645" "L||5817"
     Quit:SupplierId="05669" "L||5830"