Index: AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml
===================================================================
diff -u -r48801 -r48802
--- AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml	(.../AxInventSyncCreator.cls.xml)	(revision 48801)
+++ AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml	(.../AxInventSyncCreator.cls.xml)	(revision 48802)
@@ -68,35 +68,33 @@
 		Do ##class(TECH.ExceptionHandler).Throw(##class(AXimpl.NoConversionNeededException).%New(##this.%ClassName(),PRNr))
 	}
 	
+	Set Product = ..ProductRepository.GeefViaID(PRNr)
+	
 	#dim IsStockOverKinderen As %Boolean = ..IsStockOverKinderenBepaler.IsStockOverKinderen(PRNr)
 	If (($$$Not(IsStockOverKinderen)) && (..StockReservatieRepository.BestaatViaID(PRNr))) {
 		#dim StockProduct As Prod.StockReservatie = ..StockReservatieRepository.GeefViaID(PRNr)
 		Set WVStock = StockProduct.WVStock
 		Set FysStock = StockProduct.FysStock
 		
-		If ..ProductRepository.BestaatViaID(PRNr) {
-			Set Product = ..ProductRepository.GeefViaID(PRNr)
-			If (..StockFirmaBepaler.BepaalVoorGewoneStock(Product)=##class(DOM.common.enu.InterneFirma).VanHoeckeNv()) {
-				Set FysStock = +FysStock + +WVStock
-				Set WVStock = ""
-			}
+		If (..StockFirmaBepaler.BepaalVoorGewoneStock(Product)=##class(DOM.common.enu.InterneFirma).VanHoeckeNv()) {
+			Set FysStock = +FysStock + +WVStock
+			Set WVStock = ""
 		}
+		
 	} 
 	
 	Set InventSyncProduct = ##class(AXif.Dynamics.Inventory.MessageParts.AxdEntityInventSync).%New()
 	Set InventSyncProduct.class = "entity"
 	Set InventSyncProduct.ConfigId = AxConfigId
 	Set InventSyncProduct.ItemId = ..GeefIdentNummer(PRNr, PRNrSoprPrincipaal)
 	
-	If ..ProductRepository.BestaatViaID(PRNr) {
-		Set Product = ..ProductRepository.GeefViaID(PRNr)
-		If (..StockFirmaBepaler.BepaalVoorGeblokkeerdeStock(Product)=##class(DOM.common.enu.InterneFirma).VanHoeckeNv()) {
-			Set InventSyncProduct.QtyBlockedHLX = 0
-			Set InventSyncProduct.QtyBlockedVH = ..AXimplFormatter.FormatInventSyncProductQuantity($$$If(IsStockOverKinderen,0,..GeefQtyBlockedVH(PRNr,PRNrSoprPrincipaal,SOPRKindInCache)))			
-		} Else {
-			Set InventSyncProduct.QtyBlockedHLX = ..AXimplFormatter.FormatInventSyncProductQuantity($$$If(IsStockOverKinderen,0,..GeefQtyBlockedVH(PRNr,PRNrSoprPrincipaal,SOPRKindInCache)))
-			Set InventSyncProduct.QtyBlockedVH = 0
-		}
+	Set InventSyncProduct.QtyBlockedHLX = 0
+	Set InventSyncProduct.QtyBlockedVH = 0
+	#dim BlockedQty As %String = ..AXimplFormatter.FormatInventSyncProductQuantity($$$If(IsStockOverKinderen,0,..GeefQtyBlockedVH(PRNr,PRNrSoprPrincipaal,SOPRKindInCache)))
+	If (..StockFirmaBepaler.BepaalVoorGeblokkeerdeStock(Product)=##class(DOM.common.enu.InterneFirma).VanHoeckeNv()) {
+		Set InventSyncProduct.QtyBlockedVH = BlockedQty			
+	} Else {
+		Set InventSyncProduct.QtyBlockedHLX = BlockedQty
 	}
 	
 	Set InventSyncProduct.QtyHLX = ..AXimplFormatter.FormatInventSyncProductQuantity(+WVStock + +InventSyncProduct.QtyBlockedHLX)