Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverterHLX.cls.xml
===================================================================
diff -u
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverterHLX.cls.xml	(revision 0)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverterHLX.cls.xml	(revision 47614)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverterHLX">
+<Super>AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter</Super>
+
+<Parameter name="LegalEntity">
+<Type>%String</Type>
+<Default>hlx</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverterVHBE.cls.xml
===================================================================
diff -u
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverterVHBE.cls.xml	(revision 0)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverterVHBE.cls.xml	(revision 47614)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverterVHBE">
+<Super>AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter</Super>
+
+<Parameter name="LegalEntity">
+<Type>%String</Type>
+<Default>vhbe</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: AXimpl/AxToAdminUtils.cls.xml
===================================================================
diff -u -r47598 -r47614
--- AXimpl/AxToAdminUtils.cls.xml	(.../AxToAdminUtils.cls.xml)	(revision 47598)
+++ AXimpl/AxToAdminUtils.cls.xml	(.../AxToAdminUtils.cls.xml)	(revision 47614)
@@ -105,7 +105,8 @@
     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!!!
+    ; als we hier komen is het een nieuwe leverancier die we niet voorzien hebben!!!
+    DO ##class(vhLib.Logger).%New().ErrorMail("Nieuwe leverancier met id '"_SupplierId_"' gedefinieerd in AX Halux, die nog niet voorzien is in ConvertSupplierIDHLX")
     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>
Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml
===================================================================
diff -u -r47585 -r47614
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47585)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47614)
@@ -57,17 +57,19 @@
 </Method>
 
 <Method name="ConvertProductItem">
-<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem</FormalSpec>
+<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem,LegalEntity:%String="vhbe"</FormalSpec>
 <Implementation><![CDATA[
+	Quit:((LegalEntity = "hlx") && (##class(AXimpl.AxToAdminUtils).ConvertSupplierIDHLX(ProductItem.PrimaryVendorId) = "L||6051"))
+	Quit:((LegalEntity = "vhbe") && (##class(AXimpl.AxToAdminUtils).ConvertSupplierID(ProductItem.PrimaryVendorId) = "L||6332"))
 	try {		
 		if ..ProductAPI.BestaatIdentNr(ProductItem.ItemId) {
 			#dim Product as DOM.PM.Product = ..ProductAPI.GeefProductVolgensIdentNr(ProductItem.ItemId)
-			Do ..UpdateProduct(ProductItem,Product)
+			Do ..UpdateProduct(ProductItem,Product,LegalEntity)
 		} else {
 			Set Product = ..GeefNieuwProduct()
-			Do Product.ZetLeverancierId(..BepaalLeverancierId(ProductItem)) ;PrimaryVendorId
+			Do Product.ZetLeverancierId(..BepaalLeverancierId(ProductItem,LegalEntity)) ;PrimaryVendorId
 			Do Product.ZetIdentNr(..BepaalIdentNr(ProductItem)) ;alleen bij nieuw product aangezien we bij een update het product vinden via identnummer....
-			Do ..UpdateProduct(ProductItem,Product)
+			Do ..UpdateProduct(ProductItem,Product,LegalEntity)
 			Do ..StuurDoorNaarEWMS(Product)
 		}
 	} catch {
@@ -94,10 +96,10 @@
 </Method>
 
 <Method name="UpdateProduct">
-<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem,Product:DOM.PM.Product</FormalSpec>
+<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem,Product:DOM.PM.Product,LegalEntity:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Do Product.ZetLeverancierId(..BepaalLeverancierId(ProductItem)) ;PrimaryVendorId
+	Do Product.ZetLeverancierId(..BepaalLeverancierId(ProductItem,LegalEntity)) ;PrimaryVendorId
 	Do Product.ZetCifPPL(..BepaalCifPPL(ProductItem)) ;ActiveCostPrice
 	;Do Product.ZetWeetniet1(..BepaalWeetniet1(ProductItem)) ;BOMQty vlp negeren
 	;Do Product.ZetWeetNiet2(..BepaalWeetNiet2(ProductItem)) ;BOMUnitId vlp negeren
@@ -404,10 +406,12 @@
 </Method>
 
 <Method name="BepaalLeverancierId">
-<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem</FormalSpec>
+<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem,LegalEntity:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[ Quit ##class(AXimpl.AxToAdminUtils).ConvertSupplierID(ProductItem.PrimaryVendorId)
+<Implementation><![CDATA[
+ Quit:(LegalEntity="vhbe") ##class(AXimpl.AxToAdminUtils).ConvertSupplierID(ProductItem.PrimaryVendorId)
+ Quit:(LegalEntity="hlx") ##class(AXimpl.AxToAdminUtils).ConvertSupplierIDHLX(ProductItem.PrimaryVendorId)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml
===================================================================
diff -u -r47275 -r47614
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47275)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47614)
@@ -15,7 +15,7 @@
 	Set SOPR.SOPR= ##class(%ListOfDataTypes).%New()
 	
 	Set ProductItemConverterMock = ##class(vhTest.Mock.AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter).%New()
-	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(Principaal)).DanDoeNiks().ExactAantalKeer(1)
+	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(Principaal),).DanDoeNiks().ExactAantalKeer(1)
 	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(SOPR)).DanDoeNiks().Nooit()
 	
 	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
@@ -35,7 +35,7 @@
 	set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
 	Do LoggerMock.VerwachtMethodCall("Warning","Productsynchronizatie AX - Admin","Voor principaal product 'IdentNummer' in AX bestaat het product voor SOPR contract 'vhbe-08614' nog niet." _ $$$CRLF _ "PM is verwittigd, geen actie nodig").DanDoeNiks()
 
-	Set Converter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter).%New(ProductItemConverterMock,ProductAPIMock,ProductLookupMock,MailAPIMock,LoggerMock)
+	Set Converter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverterVHBE).%New(ProductItemConverterMock,ProductAPIMock,ProductLookupMock,MailAPIMock,LoggerMock)
 	
 	Do Converter.Convert(Envelope)
 	Do ProductItemConverterMock.Verifieer()
@@ -64,8 +64,8 @@
 	Set SOPR.Ext.GetAt(1).ExternalItemId= "0123456789012345678901234567890123456789"
 		
 	Set ProductItemConverterMock = ##class(vhTest.Mock.AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter).%New()
-	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(Principaal)).DanDoeNiks().ExactAantalKeer(1)
-	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(SOPR)).DanDoeNiks().ExactAantalKeer(1)
+	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(Principaal),"vhbe").DanDoeNiks().ExactAantalKeer(1)
+	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(SOPR),"vhbe").DanDoeNiks().ExactAantalKeer(1)
 	
 	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
 	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","IdentNummer","L||5005","vhbe-08614").DanReturn("SOPRProductId")
@@ -78,9 +78,10 @@
 	
 	#dim MailAPIMock as vhTest.Mock.TECH.Mail.MailAPI = ##class(vhTest.Mock.TECH.Mail.MailAPI).MockInstance()
 		
-	Set Converter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter).%New(ProductItemConverterMock,ProductAPIMock,ProductLookupMock,MailAPIMock)
+	Set Converter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverterVHBE).%New(ProductItemConverterMock,ProductAPIMock,ProductLookupMock,MailAPIMock)
 	
 	Do Converter.Convert(Envelope)
+
 	Do ProductMock.Verifieer()
 	Do ProductAPIMock.Verifieer()
 	Do ProductItemConverterMock.Verifieer()
Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml
===================================================================
diff -u -r47275 -r47614
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml	(.../EnvelopeConverter.cls.xml)	(revision 47275)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml	(.../EnvelopeConverter.cls.xml)	(revision 47614)
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter">
+<Abstract>1</Abstract>
 <Super>TECH.RegisteredObject</Super>
 
+<Parameter name="LegalEntity">
+<Type>%String</Type>
+<Default>OverschijfInAfgeleideClass</Default>
+</Parameter>
+
 <Property name="ProductItemConverter">
 <Type>AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter</Type>
 <Private>1</Private>
@@ -50,7 +56,8 @@
 	Set ProductItemIterator = ##class(TECH.ListIterator).%New(Message.Body.MessageParts.MessagePart.Item)
 	While ProductItemIterator.HasNext(){
 		#dim ProductItem as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem = ProductItemIterator.Next()
-		Do ..ProductItemConverter.ConvertProductItem(ProductItem)
+		Do ..ProductItemConverter.ConvertProductItem(ProductItem, ..#LegalEntity)
+		
 		Set SOPRIterator = ##class(TECH.ListIterator).%New(ProductItem.SOPR)
 		While SOPRIterator.HasNext(){
 			#dim SOPRProductId = ""
@@ -63,7 +70,7 @@
 			If $Length(SOPRProductId){			
 				#dim SOPRIdentNummer = ..ProductAPI.GeefProduct(SOPRProductId).GeefIdentNr()
 				#dim SOPRPrice as %Numeric = SOPR.CostPrice	
-				Do ..ProductItemConverter.ConvertProductItem(..ApplySOPRToProductItem(ProductItem,SOPRIdentNummer, SOPRPrice))
+				Do ..ProductItemConverter.ConvertProductItem(..ApplySOPRToProductItem(ProductItem,SOPRIdentNummer, SOPRPrice),..#LegalEntity)
 			} else {
 				Do ..StuurOntbrekendeSOPRMail(ProductItem.ItemId,SOPR.ContractId)
 			}
Index: vhTest/Mock/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml
===================================================================
diff -u -r47144 -r47614
--- vhTest/Mock/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47144)
+++ vhTest/Mock/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter.cls.xml	(.../ProductItemConverter.cls.xml)	(revision 47614)
@@ -9,8 +9,8 @@
 <Inheritance>right</Inheritance>
 
 <Method name="ConvertProductItem">
-<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ConvertProductItem",ProductItem)
+<FormalSpec>ProductItem:AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem,LegalEntity:%String="vhbe"</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ConvertProductItem",ProductItem,LegalEntity)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhDeploy/D20171117AXConfigProductItemInConvertorHlxVhbe.cls.xml
===================================================================
diff -u
--- vhDeploy/D20171117AXConfigProductItemInConvertorHlxVhbe.cls.xml	(revision 0)
+++ vhDeploy/D20171117AXConfigProductItemInConvertorHlxVhbe.cls.xml	(revision 47614)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.D20171117AXConfigProductItemInConvertorHlxVhbe">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>ConfigItem - Instellen ConfigItem AX ProductItemIn Converter opsplitsing hlx vhbe</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Kill ^AX.Config("In","Converter","Items/Upsert")
+	Kill ^AX.Config("In","Envelope","Items/Upsert")
+	
+	Set ^AX.Config("In","Converter","ItemsHLX/Upsert")="AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverterHLX"
+	Set ^AX.Config("In","Envelope","ItemsHLX/Upsert")="AXif.Dynamics.ProductItemIn.Envelope"
+
+	Set ^AX.Config("In","Converter","ItemsVHBE/Upsert")="AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverterVHBE"
+	Set ^AX.Config("In","Envelope","ItemsVHBE/Upsert")="AXif.Dynamics.ProductItemIn.Envelope"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/Test.cls.xml
===================================================================
diff -u -r47585 -r47614
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47585)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/ProductItemConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47614)
@@ -3,6 +3,41 @@
 <Class name="vhUnitTest.AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="aTest ProductConverter slaat producten met leverancier Halux over voor legale entiteit VHBE">
+<Implementation><![CDATA[
+	#dim ProductAPIMock as DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	#dim ProductRolAPIMock as DOM.PM.ProductRolAPI = ##class(vhTest.Mock.DOM.PM.ProductRolAPI).MockInstance()
+	Set LangtekstBewaarderMock = ##class(vhTest.Mock.DOM.PM.LangtekstBewaarder).%New()
+	Set KlasRepositoryMock = ##class(vhTest.Mock.Prod.Klas.KlasRepository).%New()
+	Set PakketServiceMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.PakketService).%New()
+	
+	#dim Envelope as AXif.Dynamics.ProductItemIn.Envelope = ..GeefEnvelope("ProductItemInUpdateKorttekst.xml")
+	Set Envelope.Body.MessageParts.MessagePart.Item.GetAt(1).PrimaryVendorId= "06332"
+
+	Set Converter = ##class(vhUnitTest.AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter.ProductItemConverterFake).%New(ProductAPIMock,ProductRolAPIMock,LangtekstBewaarderMock,KlasRepositoryMock,,,PakketServiceMock)
+
+	Do Converter.ConvertProductItem(Envelope.Body.MessageParts.MessagePart.Item.GetAt(1),"vhbe")
+]]></Implementation>
+</Method>
+
+<Method name="Test ProductConverter slaat producten met leverancier Van Hoecke over voor legale entiteit HLX">
+<Implementation><![CDATA[
+	#dim ProductAPIMock as DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	#dim ProductRolAPIMock as DOM.PM.ProductRolAPI = ##class(vhTest.Mock.DOM.PM.ProductRolAPI).MockInstance()
+	Set LangtekstBewaarderMock = ##class(vhTest.Mock.DOM.PM.LangtekstBewaarder).%New()
+	Set KlasRepositoryMock = ##class(vhTest.Mock.Prod.Klas.KlasRepository).%New()
+	Set PakketServiceMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.PakketService).%New()
+	
+	#dim Envelope as AXif.Dynamics.ProductItemIn.Envelope = ..GeefEnvelope("ProductItemInUpdateKorttekst.xml")
+	Set Envelope.Body.MessageParts.MessagePart.Item.GetAt(1).PrimaryVendorId= "05497"
+	
+
+	Set Converter = ##class(vhUnitTest.AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter.ProductItemConverterFake).%New(ProductAPIMock,ProductRolAPIMock,LangtekstBewaarderMock,KlasRepositoryMock,,,PakketServiceMock)
+
+	Do Converter.ConvertProductItem(Envelope.Body.MessageParts.MessagePart.Item.GetAt(1),"hlx")
+]]></Implementation>
+</Method>
+
 <Method name="Test Standaard gedrag converter van ProductItem voor update">
 <Implementation><![CDATA[
 	#dim ProductMock as vhTest.Mock.PM.DOM.Product = ..GeefProductMockMetVerwachtMethodCalls()