Index: AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/StockFirmaBepaler.cls.xml
===================================================================
diff -u
--- AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/StockFirmaBepaler.cls.xml	(revision 0)
+++ AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/StockFirmaBepaler.cls.xml	(revision 48760)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler">
+<Super>TECH.Mockable</Super>
+
+<Method name="Bepaal">
+<FormalSpec>Product:DOM.PM.Product</FormalSpec>
+<ReturnType>DOM.common.enu.InterneFirma</ReturnType>
+<Implementation><![CDATA[
+	#dim Result As DOM.common.enu.InterneFirma = ##class(DOM.common.enu.InterneFirma).VanHoeckeNv()
+	If (##class(TECH.StringUtils).Equals(Product.LinkType,##class(DOM.PM.enu.LinkType).HalffabrikaatHalux(),##class(DOM.PM.enu.LinkType).HalffabrikaatHaluxZonderStock())) {
+		Set Result = ##class(DOM.common.enu.InterneFirma).HaluxNv()
+		If (##class(TECH.StringUtils).Equals(Product.ProductGroepWMS,##class(DOM.PM.enu.ProductGroepWMS).Verpakking())) {
+			Set Result = ##class(DOM.common.enu.InterneFirma).VanHoeckeNv()
+		}
+	}
+	Quit Result
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/Test.cls.xml
===================================================================
diff -u -r48548 -r48760
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/Test.cls.xml	(.../Test.cls.xml)	(revision 48548)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/Test.cls.xml	(.../Test.cls.xml)	(revision 48760)
@@ -38,6 +38,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="StockFirmaBepaler">
+<Type>AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
  	Do ##super()
@@ -218,7 +223,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Als product linktype HH heeft dan moet QtyHlx &lt;&gt; 0 zijn">
+<Method name="Test: StockFirmaBepaler geeft VH -&gt; QtyHlx = 0 en opgesteld bij VH">
 <Implementation><![CDATA[
 	Set IsStockOverKinderenBepalerStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New()
 	Do IsStockOverKinderenBepalerStub.IndienMethodCall("IsStockOverKinderen",..#ProductId).DanReturn($$$False)
@@ -241,28 +246,32 @@
 	Do AXimplFormatterMock.IndienMethodCall("FormatInventSyncProductQuantity","55555").DanReturn("55555.00")
 	Do AXimplFormatterMock.IndienMethodCall("FormatInventSyncProductQuantity","666666").DanReturn("666666.00")
 	
+	Set StockFirmaBepalerStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler).%New()
+	Do StockFirmaBepalerStub.IndienMethodCall("Bepaal",$$$ElkeWaarde).DanReturn(##class(DOM.common.enu.InterneFirma).VanHoeckeNv())
+	
 	Set ..StockReservatieRepository = ..GeefStockReservatieRepositoryStub(StockProduct, ..#ProductId, $$$True)
 	Set ..ProductRepository = ..GeefProductRepositoryStub(Product)
 	Set ..ReceptieStockNiveauService = ReceptieStockNiveauServiceMock
 	Set ..AXimplFormatter = AXimplFormatterMock
 	Set ..IsStockOverKinderenBepaler = IsStockOverKinderenBepalerStub
+	Set ..StockFirmaBepaler = StockFirmaBepalerStub
 	
 	#dim InventSyncProduct As AXif.Dynamics.Inventory.MessageParts.AxdEntityInventSync = ..GeefAxInventSyncCreator().MaakInventSync(..#ProductId)
 
 	Do $$$AssertEquals(InventSyncProduct.QtyBlockedHLX,"0")
 	Do $$$AssertEquals(InventSyncProduct.QtyBlockedVH,"0.00")
-	Do $$$AssertEquals(InventSyncProduct.QtyHLX,"55555.00")
-	Do $$$AssertEquals(InventSyncProduct.QtyVH,"666666.00")
+	Do $$$AssertEquals(InventSyncProduct.QtyHLX,"0.00")
+	Do $$$AssertEquals(InventSyncProduct.QtyVH,"722221.00")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Als product linktype HHZ heeft dan moet QtyHlx &lt;&gt; 0 zijn">
+<Method name="Test: StockFirmaBepaler geeft HLX -&gt; QtyHlx &lt;&gt; 0 en VH &lt;&gt; 0">
 <Implementation><![CDATA[
 	Set IsStockOverKinderenBepalerStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New()
 	Do IsStockOverKinderenBepalerStub.IndienMethodCall("IsStockOverKinderen",..#ProductId).DanReturn($$$False)
 	
 	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
-	Set Product.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatHaluxZonderStock()
+	Set Product.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatHalux()
 	
 	Set StockProduct = ##class(Prod.StockReservatie).%New()
 	Set StockProduct.Product = Product
@@ -279,11 +288,15 @@
 	Do AXimplFormatterMock.IndienMethodCall("FormatInventSyncProductQuantity","55555").DanReturn("55555.00")
 	Do AXimplFormatterMock.IndienMethodCall("FormatInventSyncProductQuantity","666666").DanReturn("666666.00")
 	
+	Set StockFirmaBepalerStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler).%New()
+	Do StockFirmaBepalerStub.IndienMethodCall("Bepaal",$$$ElkeWaarde).DanReturn(##class(DOM.common.enu.InterneFirma).HaluxNv())
+	
 	Set ..StockReservatieRepository = ..GeefStockReservatieRepositoryStub(StockProduct, ..#ProductId, $$$True)
 	Set ..ProductRepository = ..GeefProductRepositoryStub(Product)
 	Set ..ReceptieStockNiveauService = ReceptieStockNiveauServiceMock
 	Set ..AXimplFormatter = AXimplFormatterMock
 	Set ..IsStockOverKinderenBepaler = IsStockOverKinderenBepalerStub
+	Set ..StockFirmaBepaler = StockFirmaBepalerStub
 	
 	#dim InventSyncProduct As AXif.Dynamics.Inventory.MessageParts.AxdEntityInventSync = ..GeefAxInventSyncCreator().MaakInventSync(..#ProductId)
 
@@ -294,43 +307,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Als product linktype &lt;&gt; HH of HHZ heeft dan moet QtyHlx = 0 zijn en de werkvloerstock bijgeteld worden bij fysieke stock VanHoecke">
-<Implementation><![CDATA[
-	Set IsStockOverKinderenBepalerStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New()
-	Do IsStockOverKinderenBepalerStub.IndienMethodCall("IsStockOverKinderen",..#ProductId).DanReturn($$$False)
-	
-	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
-	Set Product.LinkType = ##class(DOM.PM.enu.LinkType).Standaard()
-	
-	Set StockProduct = ##class(Prod.StockReservatie).%New()
-	Set StockProduct.Product = Product
-	Set StockProduct.WVStock = "55555"
-	Set StockProduct.FysStock = "666666"
-	
-	Set ReceptieStockNiveauServiceMock = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.ReceptieStockNiveauService).%New()
-	Do ReceptieStockNiveauServiceMock.IndienMethodCall("GeefAantalInReceptieNietGeboekt",..#ProductId,..#ProductId).DanReturn("4444")
-	
-	Set AXimplFormatterMock = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-	Do AXimplFormatterMock.IndienMethodCall("FormatInventSyncProductQuantity","0").DanReturn("0.00")
-	Do AXimplFormatterMock.IndienMethodCall("FormatInventSyncProductQuantity","722221").DanReturn("722221.00")
-	Do AXimplFormatterMock.IndienMethodCall("FormatInventSyncProductQuantity","4444").DanReturn("0.00")
-	Do AXimplFormatterMock.IndienMethodCall("FormatInventSyncProductQuantity","55555").DanReturn("55555.00")
-	
-	Set ..StockReservatieRepository = ..GeefStockReservatieRepositoryStub(StockProduct, ..#ProductId, $$$True)
-	Set ..ProductRepository = ..GeefProductRepositoryStub(Product)
-	Set ..ReceptieStockNiveauService = ReceptieStockNiveauServiceMock
-	Set ..AXimplFormatter = AXimplFormatterMock
-	Set ..IsStockOverKinderenBepaler = IsStockOverKinderenBepalerStub
-	
-	#dim InventSyncProduct As AXif.Dynamics.Inventory.MessageParts.AxdEntityInventSync = ..GeefAxInventSyncCreator().MaakInventSync(..#ProductId)
-
-	Do $$$AssertEquals(InventSyncProduct.QtyBlockedHLX,"0")
-	Do $$$AssertEquals(InventSyncProduct.QtyBlockedVH,"0.00")
-	Do $$$AssertEquals(InventSyncProduct.QtyHLX,"0.00")
-	Do $$$AssertEquals(InventSyncProduct.QtyVH,"722221.00")
-]]></Implementation>
-</Method>
-
 <Method name="Test: Als de PRNrSoprPrincipaal meegegeven is dan wordt het SOPRKindInCache meegegeven als 2e parameter aan GeefAantalInReceptieNietGeboekt">
 <Implementation><![CDATA[
 	Set IsStockOverKinderenBepalerStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New()
@@ -562,7 +538,7 @@
 <Method name="GeefAxInventSyncCreator">
 <Private>1</Private>
 <ReturnType>AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator</ReturnType>
-<Implementation><![CDATA[	Quit ##class(AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator).%New(..ProductRepository, ..SequenceNrGenerator, ..StockReservatieRepository, ..ReceptieStockNiveauService, ..AXimplFormatter, ..IsStockOverKinderenBepaler)
+<Implementation><![CDATA[	Quit ##class(AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator).%New(..ProductRepository, ..SequenceNrGenerator, ..StockReservatieRepository, ..ReceptieStockNiveauService, ..AXimplFormatter, ..IsStockOverKinderenBepaler, ..StockFirmaBepaler)
 ]]></Implementation>
 </Method>
 
Index: vhTest/Fake/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/StockFirmaBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Fake/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/StockFirmaBepaler.cls.xml	(revision 0)
+++ vhTest/Fake/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/StockFirmaBepaler.cls.xml	(revision 48760)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler</Super>
+
+<Method name="Bepaal">
+<FormalSpec>Product:DOM.PM.Product</FormalSpec>
+<ReturnType>DOM.common.enu.InterneFirma</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/StockFirmaBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/StockFirmaBepaler.cls.xml	(revision 0)
+++ vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/StockFirmaBepaler.cls.xml	(revision 48760)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Bepaal">
+<FormalSpec>Product:DOM.PM.Product</FormalSpec>
+<ReturnType>DOM.common.enu.InterneFirma</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Bepaal",Product)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/StockFirmaBepaler/Bepaal/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/StockFirmaBepaler/Bepaal/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/StockFirmaBepaler/Bepaal/Test.cls.xml	(revision 48760)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler.Bepaal.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="ProductId">
+<Type>%String</Type>
+<Default>1000</Default>
+</Parameter>
+
+<Method name="Test: Linktype Halffabrikaat Halux -&gt; firma Halux">
+<Implementation><![CDATA[
+	Set Bepaler = ##class(AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler).%New()
+	
+	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
+	Set Product.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatHalux()
+	
+	Do $$$AssertEquals(Bepaler.Bepaal(Product),##class(DOM.common.enu.InterneFirma).HaluxNv())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Linktype Halffabrikaat Halux zonder stock -&gt; firma Halux">
+<Implementation><![CDATA[
+	Set Bepaler = ##class(AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler).%New()
+	
+	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
+	Set Product.LinkType = ##class(DOM.PM.enu.LinkType).HalffabrikaatHaluxZonderStock()
+	
+	Do $$$AssertEquals(Bepaler.Bepaal(Product),##class(DOM.common.enu.InterneFirma).HaluxNv())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Linktype leeg -&gt; firma VanHoecke">
+<Implementation><![CDATA[
+	Set Bepaler = ##class(AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler).%New()
+	
+	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
+	Set Product.LinkType = ""
+	
+	Do $$$AssertEquals(Bepaler.Bepaal(Product),##class(DOM.common.enu.InterneFirma).VanHoeckeNv())
+]]></Implementation>
+</Method>
+
+<Method name="Test: ProductGroepEWMS = Verpakking en linktype HH of HHZ -&gt; firma VanHoecke">
+<Implementation><![CDATA[
+	Set Bepaler = ##class(AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler).%New()
+	
+	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
+	Set Product.LinkType = "HH"
+	Set Product.ProductGroepWMS = ##class(DOM.PM.enu.ProductGroepWMS).Verpakking()
+	
+	Do $$$AssertEquals(Bepaler.Bepaal(Product),##class(DOM.common.enu.InterneFirma).VanHoeckeNv())
+]]></Implementation>
+</Method>
+
+<Method name="GeefTeConverterenProduct">
+<Private>1</Private>
+<ReturnType>Prod.Product</ReturnType>
+<Implementation><![CDATA[
+	Set AxProduct = ##class(Prod.Product).%New(..#ProductId)
+	Quit AxProduct
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml
===================================================================
diff -u -r48548 -r48760
--- AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml	(.../AxInventSyncCreator.cls.xml)	(revision 48548)
+++ AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml	(.../AxInventSyncCreator.cls.xml)	(revision 48760)
@@ -33,8 +33,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="StockFirmaBepaler">
+<Type>AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ProductRepository:Prod.ProductRepository,SequenceNrGenerator:AXimpl.ConfigId,StockReservatieRepository:Prod.StockReservatieRepository,ReceptieStockNiveauService:AXimpl.Dynamics.InventoryOut.Converter.ReceptieStockNiveauService,AXimplFormatter:AXimpl.Formatter,IsStockOverKinderenBepaler:AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler</FormalSpec>
+<FormalSpec>ProductRepository:Prod.ProductRepository,SequenceNrGenerator:AXimpl.ConfigId,StockReservatieRepository:Prod.StockReservatieRepository,ReceptieStockNiveauService:AXimpl.Dynamics.InventoryOut.Converter.ReceptieStockNiveauService,AXimplFormatter:AXimpl.Formatter,IsStockOverKinderenBepaler:AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler,StockFirmaBepaler:AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -46,6 +51,7 @@
 	Set ..ReceptieStockNiveauService = $$$Inject(ReceptieStockNiveauService,##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieStockNiveauService).%New())
 	Set ..AXimplFormatter = $$$Inject(AXimplFormatter,##class(AXimpl.Formatter).%New())
 	Set ..IsStockOverKinderenBepaler = $$$Inject(IsStockOverKinderenBepaler,##class(AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New())
+	Set ..StockFirmaBepaler = $$$Inject(StockFirmaBepaler,##class(AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -65,7 +71,7 @@
 		
 		If ..ProductRepository.BestaatViaID(PRNr) {
 			#dim Product As DOM.PM.Product = ..ProductRepository.GeefViaID(PRNr)
-			If $$$Not(##class(TECH.StringUtils).Equals(Product.LinkType,##class(DOM.PM.enu.LinkType).HalffabrikaatHalux(),##class(DOM.PM.enu.LinkType).HalffabrikaatHaluxZonderStock())) {
+			If (..StockFirmaBepaler.Bepaal(Product)=##class(DOM.common.enu.InterneFirma).VanHoeckeNv()) {
 				Set FysStock = +FysStock + +WVStock
 				Set WVStock = ""
 			}