Index: vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml
===================================================================
diff -u -r44580 -r44673
--- vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml	(.../AxInventSyncCreator.cls.xml)	(revision 44580)
+++ vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml	(.../AxInventSyncCreator.cls.xml)	(revision 44673)
@@ -9,9 +9,9 @@
 <Inheritance>right</Inheritance>
 
 <Method name="MaakInventSync">
-<FormalSpec>PRNr:%String,PRNrSoprPrincipieel:%String="",SoprContractId:%String=""</FormalSpec>
+<FormalSpec>PRNr:%String,PRNrSoprPrincipaal:%String="",SoprContractId:%String=""</FormalSpec>
 <ReturnType>AXif.Dynamics.InventoryOut.MessageParts.AxdEntityInventSync</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakInventSync",PRNr,PRNrSoprPrincipieel,SoprContractId)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakInventSync",PRNr,PRNrSoprPrincipaal,SoprContractId)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/Test.cls.xml
===================================================================
diff -u -r44515 -r44673
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/Test.cls.xml	(.../Test.cls.xml)	(revision 44515)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/Test.cls.xml	(.../Test.cls.xml)	(revision 44673)
@@ -8,6 +8,11 @@
 <Default>1000</Default>
 </Parameter>
 
+<Property name="ProductRepository">
+<Type>Prod.ProductRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="SequenceNrGenerator">
 <Type>AXimpl.ConfigId</Type>
 <Private>1</Private>
@@ -30,6 +35,7 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(aTestName)
+	Set ..ProductRepository = ##class(vhTest.Mock.Prod.ProductRepository).%New()
 	Set ..SequenceNrGenerator = ##class(vhTest.Dummy.AXimpl.ConfigId).%New()
 	Set ..StockReservatieRepository = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
 ]]></Implementation>
@@ -42,16 +48,47 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: class is de default entity">
+<Implementation><![CDATA[
+	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
+	#dim StockProduct As Prod.StockReservatie = ##class(Prod.StockReservatie).%New()
+	Set StockProduct.Product = Product
+	
+	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$True)
+	Do StockReservatieRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(StockProduct)
+	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID","").DanReturn($$$False)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
+	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
+	
+	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
+	
+	#dim InventSyncProduct As AXif.Dynamics.InventoryOut.MessageParts.AxdEntityInventSync = AxInventSyncCreator.MaakInventSync(..#ProductId)
+	
+	Do $$$AssertEquals(InventSyncProduct.class,"entity")
+]]></Implementation>
+</Method>
+
 <Method name="Test: ConfigId moet voorlopig leeg blijven">
 <Implementation><![CDATA[
 	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
 	#dim StockProduct As Prod.StockReservatie = ##class(Prod.StockReservatie).%New()
 	Set StockProduct.Product = Product
 	
 	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$True)
 	Do StockReservatieRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(StockProduct)
 	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID","").DanReturn($$$False)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
 	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
 	
 	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
 	
@@ -61,7 +98,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ItemId is het IdentNummer">
+<Method name="Test: ItemId is het IdentNummer volgens het PRNr in de 1e parameter als de 2e zijnde PRNrSoprPrincipaal niet meegegeven is">
 <Implementation><![CDATA[
 	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
 	Set Product.IdentNummer = "0.123.456.7"
@@ -70,9 +107,15 @@
 	Set StockProduct.Product = Product
 	
 	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$True)
 	Do StockReservatieRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(StockProduct)
 	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID","").DanReturn($$$False)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
 	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
 	
 	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
 	
@@ -82,6 +125,32 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: ItemId is het IdentNummer volgens het PRNr in de 2e parameter zijnde PRNrSoprPrincipaal als die meegegeven is">
+<Implementation><![CDATA[
+	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
+	Set Product.IdentNummer = "0.123.456.7"
+	
+	#dim StockProduct As Prod.StockReservatie = ##class(Prod.StockReservatie).%New(9999)
+	
+	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID","9999").DanReturn($$$True)
+	Do StockReservatieRepositoryStub.IndienMethodCall("GeefViaID","9999").DanReturn(StockProduct)
+	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$True)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
+	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
+	
+	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
+	
+	#dim InventSyncProduct As AXif.Dynamics.InventoryOut.MessageParts.AxdEntityInventSync = AxInventSyncCreator.MaakInventSync("9999", ..#ProductId)
+	
+	Do $$$AssertEquals(InventSyncProduct.ItemId,"0.123.456.7")
+]]></Implementation>
+</Method>
+
 <Method name="Test: QtyHLX is de stock bij Halux zijnde werkvloerstock zijnde WVStock">
 <Implementation><![CDATA[
 	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
@@ -90,9 +159,15 @@
 	Set StockProduct.WVStock = "55555"
 	
 	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$True)
 	Do StockReservatieRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(StockProduct)
 	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID","").DanReturn($$$False)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
 	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
 	
 	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
 	
@@ -110,9 +185,15 @@
 	Set StockProduct.WVStock = ""
 	
 	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$True)
 	Do StockReservatieRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(StockProduct)
 	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID","").DanReturn($$$False)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
 	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
 	
 	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
 	
@@ -122,6 +203,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: QtyHLX is 0 als er geen StockReservatie object bestaat">
+<Implementation><![CDATA[
+	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
+	#dim StockProduct As Prod.StockReservatie = ##class(Prod.StockReservatie).%New()
+	Set StockProduct.Product = Product
+	
+	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$False)
+	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID","").DanReturn($$$False)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
+	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
+	
+	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
+	
+	#dim InventSyncProduct As AXif.Dynamics.InventoryOut.MessageParts.AxdEntityInventSync = AxInventSyncCreator.MaakInventSync(..#ProductId)
+	
+	Do $$$AssertEquals(InventSyncProduct.QtyHLX,"0")
+]]></Implementation>
+</Method>
+
 <Method name="Test: QtyVH is de stock bij Van Hoecke zijnde fysieke stock zijnde FysStock">
 <Implementation><![CDATA[
 	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
@@ -130,9 +235,15 @@
 	Set StockProduct.FysStock = "666666"
 	
 	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$True)
 	Do StockReservatieRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(StockProduct)
 	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID","").DanReturn($$$False)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
 	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
 	
 	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
 	
@@ -150,9 +261,15 @@
 	Set StockProduct.FysStock = ""
 	
 	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$True)
 	Do StockReservatieRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(StockProduct)
 	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID","").DanReturn($$$False)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
 	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
 	
 	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
 	
@@ -162,6 +279,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: QtyVH is 0 als er geen StockReservatie object bestaat">
+<Implementation><![CDATA[
+	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
+	#dim StockProduct As Prod.StockReservatie = ##class(Prod.StockReservatie).%New()
+	Set StockProduct.Product = Product
+	
+	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$False)
+	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID","").DanReturn($$$False)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
+	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
+	
+	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
+	
+	#dim InventSyncProduct As AXif.Dynamics.InventoryOut.MessageParts.AxdEntityInventSync = AxInventSyncCreator.MaakInventSync(..#ProductId)
+	
+	Do $$$AssertEquals(InventSyncProduct.QtyVH,"0")
+]]></Implementation>
+</Method>
+
 <Method name="Test: SequenceNr roept de SequenceNrGenerator op">
 <Implementation><![CDATA[
 	Set SequenceNrGeneratorStub = ##class(vhTest.Mock.AXimpl.ConfigId).%New()
@@ -172,10 +313,16 @@
 	Set StockProduct.Product = Product
 	
 	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$True)
 	Do StockReservatieRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(StockProduct)
 	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID","").DanReturn($$$False)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
 	Set ..SequenceNrGenerator = SequenceNrGeneratorStub
 	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
 	
 	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
 	
@@ -185,35 +332,54 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: SOPRContractId moet voorlopig leeg blijven">
+<Method name="Test: Als een SoprContractId meegegeven is moet SOPRContractId daarmee ingevuld worden">
 <Implementation><![CDATA[
+	#dim SoprContractId As %String = "SoprContractId"
 	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
 	#dim StockProduct As Prod.StockReservatie = ##class(Prod.StockReservatie).%New()
 	Set StockProduct.Product = Product
 	
 	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$True)
 	Do StockReservatieRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(StockProduct)
 	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID","").DanReturn($$$False)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
 	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
 	
 	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
 	
-	#dim InventSyncProduct As AXif.Dynamics.InventoryOut.MessageParts.AxdEntityInventSync = AxInventSyncCreator.MaakInventSync(..#ProductId)
+	#dim InventSyncProduct As AXif.Dynamics.InventoryOut.MessageParts.AxdEntityInventSync = AxInventSyncCreator.MaakInventSync(..#ProductId,,SoprContractId)
 	
-	Do $$$AssertEquals(InventSyncProduct.SOPRContractId,"")
+	Do $$$AssertEquals(InventSyncProduct.SOPRContractId,"SoprContractId")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Als het PRNr onbestaand is wordt een exceptie geraisd">
+<Method name="Test: Als een GEEN SoprContractId meegegeven is moet SOPRContractId leeg zijn">
 <Implementation><![CDATA[
-	Set ..StockReservatieRepository = ##class(Prod.StockReservatieRepository).%New()
+	#dim Product As Prod.Product = ..GeefTeConverterenProduct()
+	#dim StockProduct As Prod.StockReservatie = ##class(Prod.StockReservatie).%New()
+	Set StockProduct.Product = Product
 	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Kon object van type Prod.StockReservatie niet openen met id 'Onbekend PRNr'")
-	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.BaseException",Substrings))
+	Set StockReservatieRepositoryStub = ##class(vhTest.Mock.Prod.StockReservatieRepository).%New()
+	Do StockReservatieRepositoryStub.IndienMethodCall("BestaatViaID",..#ProductId).DanReturn($$$True)
+	Do StockReservatieRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(StockProduct)
 	
+	Set ProductRepositoryStub = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("BestaatViaID","").DanReturn($$$False)
+	Do ProductRepositoryStub.IndienMethodCall("GeefViaID",..#ProductId).DanReturn(Product)
+	
+	Set ..StockReservatieRepository = StockReservatieRepositoryStub
+	Set ..ProductRepository = ProductRepositoryStub
+	
 	#dim AxInventSyncCreator As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator = ..GeefAxInventSyncCreator()
 	
-	#dim InventSyncProduct As AXif.Dynamics.InventoryOut.MessageParts.AxdEntityInventSync = AxInventSyncCreator.MaakInventSync("Onbekend PRNr")
+	#dim InventSyncProduct As AXif.Dynamics.InventoryOut.MessageParts.AxdEntityInventSync = AxInventSyncCreator.MaakInventSync(..#ProductId)
+	
+	Do $$$AssertEquals(InventSyncProduct.SOPRContractId,"")
 ]]></Implementation>
 </Method>
 
@@ -229,7 +395,7 @@
 <Method name="GeefAxInventSyncCreator">
 <Private>1</Private>
 <ReturnType>AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator</ReturnType>
-<Implementation><![CDATA[	Quit ##class(AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator).%New(..SequenceNrGenerator, ..StockReservatieRepository)
+<Implementation><![CDATA[	Quit ##class(AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator).%New(..ProductRepository, ..SequenceNrGenerator, ..StockReservatieRepository)
 ]]></Implementation>
 </Method>
 </Class>
Index: AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml
===================================================================
diff -u -r44581 -r44673
--- AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml	(.../AxInventSyncCreator.cls.xml)	(revision 44581)
+++ AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml	(.../AxInventSyncCreator.cls.xml)	(revision 44673)
@@ -3,6 +3,11 @@
 <Class name="AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator">
 <Super>TECH.RegisteredObject,TECH.Mockable</Super>
 
+<Property name="ProductRepository">
+<Type>Prod.ProductRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="SequenceNrGenerator">
 <Type>AXimpl.ConfigId</Type>
 <Private>1</Private>
@@ -14,12 +19,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>SequenceNrGenerator:AXimpl.ConfigId,StockReservatieRepository:Prod.StockReservatieRepository</FormalSpec>
+<FormalSpec>ProductRepository:Prod.ProductRepository,SequenceNrGenerator:AXimpl.ConfigId,StockReservatieRepository:Prod.StockReservatieRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..ProductRepository = $$$Inject(ProductRepository, ##class(Prod.ProductRepository).%New())
 	Set ..StockReservatieRepository = $$$Inject(StockReservatieRepository, ##class(Prod.StockReservatieRepository).%New())
 	Set ..SequenceNrGenerator = $$$Inject(SequenceNrGenerator, ##class(AXimpl.ConfigId).%New())
 	
@@ -28,23 +34,48 @@
 </Method>
 
 <Method name="MaakInventSync">
-<FormalSpec>PRNr:%String,PRNrSoprPrincipieel:%String="",SoprContractId:%String=""</FormalSpec>
+<FormalSpec>PRNr:%String,PRNrSoprPrincipaal:%String="",SoprContractId:%String=""</FormalSpec>
 <ReturnType>AXif.Dynamics.InventoryOut.MessageParts.AxdEntityInventSync</ReturnType>
 <Implementation><![CDATA[
-	#dim StockProduct As Prod.StockReservatie = ..StockReservatieRepository.GeefViaID(PRNr)
-	#dim StockProductSoprPrincipieel As Prod.StockReservatie = $$$If($$$HasLength(PRNrSoprPrincipieel),..StockReservatieRepository.GeefViaID(PRNrSoprPrincipieel),"")
+	#dim WVStock, FysStock As %String
 	
 	Set InventSyncProduct = ##class(AXif.Dynamics.InventoryOut.MessageParts.AxdEntityInventSync).%New()
+	
+	If (..StockReservatieRepository.BestaatViaID(PRNr)){
+		#dim StockProduct As Prod.StockReservatie = ..StockReservatieRepository.GeefViaID(PRNr)
+		Set WVStock = StockProduct.WVStock
+		Set FysStock = StockProduct.FysStock
+	} Else {
+		Set WVStock = "0"
+		Set FysStock = "0"
+	}
+	
+	Set InventSyncProduct.class = "entity"
 	Set InventSyncProduct.ConfigId = ""
-	Set InventSyncProduct.ItemId = $$$If($$$HasLength(StockProductSoprPrincipieel),StockProductSoprPrincipieel.Product.IdentNummer,StockProduct.Product.IdentNummer)
-	Set InventSyncProduct.QtyHLX = +StockProduct.WVStock
-	Set InventSyncProduct.QtyVH = +StockProduct.FysStock
+	Set InventSyncProduct.ItemId = ..GeefIdentNummer(PRNr, PRNrSoprPrincipaal)
+	Set InventSyncProduct.QtyHLX = +WVStock
+	Set InventSyncProduct.QtyVH = +FysStock
 	Set InventSyncProduct.SequenceNr = ..SequenceNrGenerator.GeefVolgendProductVoorraadSyncBerichtId()
-	Set InventSyncProduct.SOPRContractId = $$$If($$$HasLength(SoprContractId),SoprContractId,"")
+	Set InventSyncProduct.SOPRContractId = SoprContractId
 	
 	Quit InventSyncProduct
 ]]></Implementation>
 </Method>
+
+<Method name="GeefIdentNummer">
+<FormalSpec>PRNr:%String,PRNrSoprPrincipaal:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Product As Prod.Product
+	If (..ProductRepository.BestaatViaID(PRNrSoprPrincipaal)){
+		Set Product = ..ProductRepository.GeefViaID(PRNrSoprPrincipaal)
+	} Else {
+		Set Product = ..ProductRepository.GeefViaID(PRNr)
+	}
+	Quit Product.IdentNummer
+]]></Implementation>
+</Method>
 </Class>