Index: AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter.cls.xml
===================================================================
diff -u -r45308 -r45312
--- AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter.cls.xml	(.../ReceptieAfmeldenConverter.cls.xml)	(revision 45308)
+++ AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter.cls.xml	(.../ReceptieAfmeldenConverter.cls.xml)	(revision 45312)
@@ -13,11 +13,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="ProductApi">
-<Type>DOM.PM.ProductAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="DataMOrderApi">
 <Type>DOM.VKP.impl.DataM.DataMOrderAPI</Type>
 <Private>1</Private>
@@ -34,16 +29,15 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>InventoryOutConverter:AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter,DataMOrderApi:DOM.VKP.impl.DataM.DataMOrderAPI,ProductApi:DOM.PM.ProductAPI,BouwsteenIteratorFactory:AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory</FormalSpec>
+<FormalSpec>InventoryOutConverter:AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter,DataMOrderApi:DOM.VKP.impl.DataM.DataMOrderAPI,BouwsteenIteratorFactory:AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..InventoryOutConverter = $$$Inject(InventoryOutConverter, ##class(AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New())
-	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.DomeinContext).Instance().GeefProductAPI())
 	Set ..DataMOrderApi = $$$Inject(DataMOrderApi, ##class(DOM.DomeinContext).Instance().GeefOrderAPI())
-	Set ..BouwsteenIteratorFactory = $$$Inject(BouwsteenIteratorFactory, ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New())
+	Set ..BouwsteenIteratorFactory = $$$Inject(BouwsteenIteratorFactory, ##class(AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -76,7 +70,6 @@
 				
 				Do ..AxdEntityHeader.ProdRAF.Insert(ProdRaf)
 				
-				#dim Product As DOM.PM.Product = ..ProductApi.GeefProduct(Lijn.GeefProductID())
 				Set ..BouwsteenIterator = ..BouwsteenIteratorFactory.Maak(Lijn.GeefProductID())
 				
 				While ..BouwsteenIterator.HasNext(){
Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml
===================================================================
diff -u -r45308 -r45312
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 45308)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 45312)
@@ -3,77 +3,94 @@
 <Class name="vhUnitTest.AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter.Convert.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: Standaardgedrag met 1 InventSync van 1 productlijn">
+<Property name="UitleveringId">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="GUID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Request">
+<Type>AXimpl.Request</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="RequestInventoryOut">
+<Type>AXimpl.Request</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderApiStub">
+<Type>vhTest.Mock.DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
-	#dim UitleveringID = $$$DummyInteger_"_1234"
+	Do ##super()
 	
-	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer("01.05.2016")
+	Set ..UitleveringId = "0_1234"
+	Set ..GUID = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
+	Set ..Request = ##class(AXimpl.Request).%New("Inventory/ReceptieAfgemeld", ..UitleveringId)
+	Set ..RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "9000001")
+]]></Implementation>
+</Method>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super()
 	
-	Set Request = ##class(AXimpl.Request).%New("Inventory/ReceptieAfgemeld", UitleveringID)
-	Set RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "abc1")
-	
+	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer("01.05.2016")
+	Set ..OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Standaardgedrag met 1 InventSync van 1 productlijn">
+<Implementation><![CDATA[
 	#dim Antwoord As AXif.Dynamics.Inventory.MessageParts = ..MaakInventSyncAntwoord(1)
 	
 	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
-	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(RequestInventoryOut),$$$ElkeWaarde).DanReturn(Antwoord)
+	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(Antwoord)
 	
-	Set Bonlijnen = ##class(%ListOfDataTypes).%New()
-	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("900000",1))
-	Set StandaardBon = ##class(vhTest.Mock.DOM.VKP.Bon).%New()
-	Do StandaardBon.IndienMethodCall("GeefBonLijnIterator").DanReturn(##class(TECH.ListIterator).%New(Bonlijnen))
-	Do StandaardBon.IndienMethodCall("GeefID").DanReturn($$$DummyInteger)
+	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(1))
 	
-	Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
-	Do OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(StandaardBon)
-	
-	
 	Set ProductStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
 	
 	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Do ProductApiStub.IndienMethodCall("GeefProduct","9000001").DanReturn(ProductStub)
 	
 	Set BouwsteenDummy = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
-	Set BouwsteenDummy.ProductId = "abc1"
+	Set BouwsteenDummy.ProductId = "9000001"
 	Set Bouwstenen = ##class(%ListOfDataTypes).%New()
 	Do Bouwstenen.Insert(BouwsteenDummy)
 	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(TECH.ListIterator).%New(Bouwstenen)
 	
 	Set BouwsteenIteratorFactory = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New(ProductApiStub)
 	Do BouwsteenIteratorFactory.IndienMethodCall("Maak","9000001").DanReturn(BouwsteenIterator)
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, OrderApiStub, ProductApiStub, BouwsteenIteratorFactory)
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, BouwsteenIteratorFactory)
 	
-	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
-	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),1)
-	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.GetAt(1).ProdId,"0_1234_2016050109150")
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.GetAt(1).ProdId,"123456_1234_20160501")
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),1)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: antwoord met 2 InventSync van 1 productlijn">
 <Implementation><![CDATA[
-	#dim UitleveringID = $$$DummyInteger_"_1234"
-	
-	Set Request = ##class(AXimpl.Request).%New("Inventory/ReceptieAfgemeld", UitleveringID)
-	Set RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "9000001")
-	
 	#dim Antwoord As AXif.Dynamics.Inventory.MessageParts = ..MaakInventSyncAntwoord(2)
 	
 	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
-	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(RequestInventoryOut),$$$ElkeWaarde).DanReturn(Antwoord)
+	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(Antwoord)
 	
-	Set Bonlijnen = ##class(%ListOfObjects).%New()
-	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("900000",1))
+	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(1))	
 	
-	Set StandaardBon = ##class(vhTest.Mock.DOM.VKP.Bon).%New()
-	Do StandaardBon.IndienMethodCall("GeefBonLijnIterator").DanReturn(##class(TECH.ListIterator).%New(Bonlijnen))
-	Do StandaardBon.IndienMethodCall("GeefID").DanReturn("123456")
-	
-	Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
-	Do OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(StandaardBon)	
-	
 	Set ProductStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
 	
 	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
@@ -88,10 +105,9 @@
 	Set BouwsteenIteratorFactory = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New(ProductApiStub)
 	Do BouwsteenIteratorFactory.IndienMethodCall("Maak","9000001").DanReturn(BouwsteenIterator)
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, OrderApiStub, ProductApiStub, BouwsteenIteratorFactory)
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, BouwsteenIteratorFactory)
 	
-	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
-	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),1)
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),2)
@@ -100,40 +116,17 @@
 
 <Method name="Test: uitlevering met 0 producten">
 <Implementation><![CDATA[
-	#dim UitleveringID = $$$DummyInteger_"_1234"
-	
-	Set Request = ##class(AXimpl.Request).%New("Inventory/ReceptieAfgemeld", UitleveringID)
-	Set RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", $$$DummyInteger)
-	
 	#dim Antwoord As AXif.Dynamics.Inventory.MessageParts = ..MaakInventSyncAntwoord(0)
 	
 	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
-	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(RequestInventoryOut),$$$ElkeWaarde).DanReturn(Antwoord)
+	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(Antwoord)
 	
-	Set Bonlijnen = ##class(%ListOfObjects).%New()
+	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(0))
 	
-	Set StandaardBon = ##class(vhTest.Mock.DOM.VKP.Bon).%New()
-	Do StandaardBon.IndienMethodCall("GeefBonLijnIterator").DanReturn(##class(TECH.ListIterator).%New(Bonlijnen))
-	Do StandaardBon.IndienMethodCall("GeefID").DanReturn("123456")
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub)
 	
-	Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
-	Do OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(StandaardBon)
-	
-	Set ProductStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
-	
-	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("GeefProduct","abc1").DanReturn(ProductStub)
-	
-	#dim BouwsteenDummy As AXimpl.Admin.DOM.PM.Bouwsteen = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
-	Set BouwsteenDummy.ProductId = "abc1"
-	Set Bouwstenen = ##class(%ListOfDataTypes).%New()
-	Do Bouwstenen.Insert(BouwsteenDummy)
-	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(TECH.ListIterator).%New(Bouwstenen)
-	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, OrderApiStub, ProductApiStub, BouwsteenIterator)
-	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
-	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),0)
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),0)
@@ -142,27 +135,14 @@
 
 <Method name="Test: uitlevering met 2 producten met elk 1 inventsync">
 <Implementation><![CDATA[
-	#dim UitleveringID = $$$DummyInteger_"_1234"
-	
-	Set Request = ##class(AXimpl.Request).%New("Inventory/ReceptieAfgemeld", UitleveringID)
-	Set RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "9000001,9000002")
-	
 	#dim Antwoord As AXif.Dynamics.Inventory.MessageParts = ..MaakInventSyncAntwoord(2)
+	Set ..RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "9000001,9000002")
 	
 	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
-	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(RequestInventoryOut),$$$ElkeWaarde).DanReturn(Antwoord)
+	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(Antwoord)
 	
-	Set Bonlijnen = ##class(%ListOfObjects).%New()
-	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("900000",1))
-	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("900000",2))
+	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(2))
 	
-	Set StandaardBon = ##class(vhTest.Mock.DOM.VKP.Bon).%New()
-	Do StandaardBon.IndienMethodCall("GeefBonLijnIterator").DanReturn(##class(TECH.ListIterator).%New(Bonlijnen))
-	Do StandaardBon.IndienMethodCall("GeefID").DanReturn("123456")
-	
-	Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
-	Do OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(StandaardBon)
-	
 	Set ProductStub1 = ##class(vhTest.Mock.DOM.PM.Product).%New()
 	Set ProductStub2 = ##class(vhTest.Mock.DOM.PM.Product).%New()
 	
@@ -186,10 +166,9 @@
 	Do BouwsteenIteratorFactory.IndienMethodCall("Maak","9000001").DanReturn(BouwsteenIterator1)
 	Do BouwsteenIteratorFactory.IndienMethodCall("Maak","9000002").DanReturn(BouwsteenIterator2)
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, OrderApiStub, ProductApiStub, BouwsteenIteratorFactory)
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, BouwsteenIteratorFactory)
 	
-	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
-	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),2)
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),2)
@@ -198,44 +177,30 @@
 
 <Method name="Test: InventSync geeft error -&gt; opeten">
 <Implementation><![CDATA[
-	#dim UitleveringID = $$$DummyInteger_"_1234"
-	
-	Set Request = ##class(AXimpl.Request).%New("Inventory/ReceptieAfgemeld", UitleveringID)
-	Set RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", $$$DummyInteger)
-	
 	#dim Antwoord As AXif.Dynamics.Inventory.MessageParts = ..MaakInventSyncAntwoord(2)
 	
 	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
-	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(RequestInventoryOut),$$$ElkeWaarde).DanException($$$DummyException)
+	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanException($$$DummyException)
 	
-	Set Bonlijnen = ##class(%ListOfObjects).%New()
-	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("900000",1))
+	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(1))
 	
-	Set StandaardBon = ##class(vhTest.Mock.DOM.VKP.Bon).%New()
-	Do StandaardBon.IndienMethodCall("GeefBonLijnIterator").DanReturn(##class(TECH.ListIterator).%New(Bonlijnen))
-	Do StandaardBon.IndienMethodCall("GeefID").DanReturn("123456")
+	Set ProductStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
 	
-	Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
-	Do OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(StandaardBon)
+	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiStub.IndienMethodCall("GeefProduct","9000001").DanReturn(ProductStub)
 	
-	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
-	
-	Set ProductApi = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApi.IndienMethodCall("GeefProduct","9000001").DanReturn(ProductApiStub)
-	
 	Set BouwsteenDummy = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
-	Set BouwsteenDummy.ProductId = "abc1"
+	Set BouwsteenDummy.ProductId = "9000001"
 	Set Bouwstenen = ##class(%ListOfDataTypes).%New()
 	Do Bouwstenen.Insert(BouwsteenDummy)
 	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(TECH.ListIterator).%New(Bouwstenen)
 	
 	Set BouwsteenIteratorFactory = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New(ProductApiStub)
 	Do BouwsteenIteratorFactory.IndienMethodCall("Maak","9000001").DanReturn(BouwsteenIterator)
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, OrderApiStub, ProductApi, BouwsteenIteratorFactory)
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, BouwsteenIteratorFactory)
 	
-	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
-	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),1)
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),0)
@@ -262,6 +227,26 @@
 	Quit Antwoord
 ]]></Implementation>
 </Method>
+
+<Method name="MaakBonEnLijnen">
+<FormalSpec>AantalLijnen:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>vhTest.Mock.DOM.VKP.Bon</ReturnType>
+<Implementation><![CDATA[
+	Set Bonlijnen = ##class(%ListOfObjects).%New()
+	
+	#dim ii As %Integer
+	For ii=1:1:AantalLijnen {
+		Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("900000",ii))
+	}
+	
+	Set StandaardBon = ##class(vhTest.Mock.DOM.VKP.Bon).%New()
+	Do StandaardBon.IndienMethodCall("GeefBonLijnIterator").DanReturn(##class(TECH.ListIterator).%New(Bonlijnen))
+	Do StandaardBon.IndienMethodCall("GeefID").DanReturn("123456")
+	
+	Quit StandaardBon
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXimpl/Dynamics/InventoryOut/Converter/BouwsteenIteratorFactory.cls.xml
===================================================================
diff -u -r45308 -r45312
--- AXimpl/Dynamics/InventoryOut/Converter/BouwsteenIteratorFactory.cls.xml	(.../BouwsteenIteratorFactory.cls.xml)	(revision 45308)
+++ AXimpl/Dynamics/InventoryOut/Converter/BouwsteenIteratorFactory.cls.xml	(.../BouwsteenIteratorFactory.cls.xml)	(revision 45312)
@@ -15,7 +15,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..ProductApi = ProductApi
+	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.DomeinContext).Instance().GeefProductAPI())
 	
 	Quit $$$OK
 ]]></Implementation>