Index: vhTest/Fake/AXimpl/Dynamics/InventoryOut/Converter/BouwsteenIteratorFactory.cls.xml
===================================================================
diff -u
--- vhTest/Fake/AXimpl/Dynamics/InventoryOut/Converter/BouwsteenIteratorFactory.cls.xml	(revision 0)
+++ vhTest/Fake/AXimpl/Dynamics/InventoryOut/Converter/BouwsteenIteratorFactory.cls.xml	(revision 45308)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory">
+<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.BouwsteenIteratorFactory</Super>
+
+<Method name="Maak">
+<FormalSpec>ProductId:%String</FormalSpec>
+<ReturnType>AXimpl.Admin.DOM.PM.BouwsteenIterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/BouwsteenIteratorFactory.cls.xml
===================================================================
diff -u
--- vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/BouwsteenIteratorFactory.cls.xml	(revision 0)
+++ vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/BouwsteenIteratorFactory.cls.xml	(revision 45308)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory">
+<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.BouwsteenIteratorFactory,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Maak">
+<FormalSpec>ProductId:%String</FormalSpec>
+<ReturnType>AXimpl.Admin.DOM.PM.BouwsteenIterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Maak",ProductId)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/Dynamics/InventoryOut/Converter/BouwsteenIteratorFactory.cls.xml
===================================================================
diff -u
--- AXimpl/Dynamics/InventoryOut/Converter/BouwsteenIteratorFactory.cls.xml	(revision 0)
+++ AXimpl/Dynamics/InventoryOut/Converter/BouwsteenIteratorFactory.cls.xml	(revision 45308)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory">
+<Super>TECH.Mockable</Super>
+
+<Property name="ProductApi">
+<Type>DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ProductApi:DOM.PM.ProductAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ProductApi = ProductApi
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Maak">
+<FormalSpec>ProductId:%String</FormalSpec>
+<ReturnType>AXimpl.Admin.DOM.PM.BouwsteenIterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(..ProductApi.GeefProduct(ProductId))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml
===================================================================
diff -u -r45233 -r45308
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 45233)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 45308)
@@ -18,7 +18,7 @@
 	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("abc",1))
+	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)
@@ -30,16 +30,19 @@
 	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)
+	Do ProductApiStub.IndienMethodCall("GeefProduct","9000001").DanReturn(ProductStub)
 	
-	#dim BouwsteenDummy As AXimpl.Admin.DOM.PM.Bouwsteen = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
+	Set BouwsteenDummy = ##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)
+	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)
+	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
 	
@@ -54,15 +57,15 @@
 	#dim UitleveringID = $$$DummyInteger_"_1234"
 	
 	Set Request = ##class(AXimpl.Request).%New("Inventory/ReceptieAfgemeld", UitleveringID)
-	Set RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "abc1")
+	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)
 	
 	Set Bonlijnen = ##class(%ListOfObjects).%New()
-	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("abc",1))
+	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))
@@ -74,16 +77,19 @@
 	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)
+	Do ProductApiStub.IndienMethodCall("GeefProduct","9000001").DanReturn(ProductStub)
 	
-	#dim BouwsteenDummy As AXimpl.Admin.DOM.PM.Bouwsteen = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
-	Set BouwsteenDummy.ProductId = "abc1"
+	Set BouwsteenDummy = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
+	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 Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, OrderApiStub, ProductApiStub, BouwsteenIterator)
+	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)
+	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
 	
@@ -134,21 +140,21 @@
 ]]></Implementation>
 </Method>
 
-<Method name="aTest: uitlevering met 2 producten met elk 1 inventsync">
+<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", "abc1,def2")
+	Set RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "9000001,9000002")
 	
 	#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)
 	
 	Set Bonlijnen = ##class(%ListOfObjects).%New()
-	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("abc",1))
-	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("def",2))
+	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("900000",1))
+	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("900000",2))
 	
 	Set StandaardBon = ##class(vhTest.Mock.DOM.VKP.Bon).%New()
 	Do StandaardBon.IndienMethodCall("GeefBonLijnIterator").DanReturn(##class(TECH.ListIterator).%New(Bonlijnen))
@@ -161,17 +167,27 @@
 	Set ProductStub2 = ##class(vhTest.Mock.DOM.PM.Product).%New()
 	
 	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("GeefProduct","abc1").DanReturn(ProductStub1)
-	Do ProductApiStub.IndienMethodCall("GeefProduct","def2").DanReturn(ProductStub2)
+	Do ProductApiStub.IndienMethodCall("GeefProduct","9000001").DanReturn(ProductStub1)
+	Do ProductApiStub.IndienMethodCall("GeefProduct","9000002").DanReturn(ProductStub2)
 	
-	#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 BouwsteenDummy1 = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
+	Set BouwsteenDummy1.ProductId = "9000001"
+	Set Bouwstenen1 = ##class(%ListOfDataTypes).%New()
+	Do Bouwstenen1.Insert(BouwsteenDummy1)
+	#dim BouwsteenIterator1 As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(TECH.ListIterator).%New(Bouwstenen1)
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, OrderApiStub, ProductApiStub, BouwsteenIterator)
+	Set BouwsteenDummy2 = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
+	Set BouwsteenDummy2.ProductId = "9000002"
+	Set Bouwstenen2 = ##class(%ListOfDataTypes).%New()
+	Do Bouwstenen2.Insert(BouwsteenDummy2)
+	#dim BouwsteenIterator2 As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(TECH.ListIterator).%New(Bouwstenen2)
 	
+	Set BouwsteenIteratorFactory = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New(ProductApiStub)
+	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)
+	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
 	
@@ -193,7 +209,7 @@
 	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("abc",1))
+	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))
@@ -205,16 +221,19 @@
 	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
 	
 	Set ProductApi = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApi.IndienMethodCall("GeefProduct","abc1").DanReturn(ProductApiStub)
+	Do ProductApi.IndienMethodCall("GeefProduct","9000001").DanReturn(ProductApiStub)
 	
-	#dim BouwsteenDummy As AXimpl.Admin.DOM.PM.Bouwsteen = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
+	Set BouwsteenDummy = ##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, ProductApi, BouwsteenIterator)
+	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)
+	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
 	
Index: AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter.cls.xml
===================================================================
diff -u -r45233 -r45308
--- AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter.cls.xml	(.../ReceptieAfmeldenConverter.cls.xml)	(revision 45233)
+++ AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter.cls.xml	(.../ReceptieAfmeldenConverter.cls.xml)	(revision 45308)
@@ -28,8 +28,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="BouwsteenIteratorFactory">
+<Type>AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>InventoryOutConverter:AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter,DataMOrderApi:DOM.VKP.impl.DataM.DataMOrderAPI,ProductApi:DOM.PM.ProductAPI,BouwsteenIterator:AXimpl.Admin.DOM.PM.BouwsteenIterator</FormalSpec>
+<FormalSpec>InventoryOutConverter:AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter,DataMOrderApi:DOM.VKP.impl.DataM.DataMOrderAPI,ProductApi:DOM.PM.ProductAPI,BouwsteenIteratorFactory:AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -38,7 +43,7 @@
 	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 ..BouwsteenIterator = BouwsteenIterator
+	Set ..BouwsteenIteratorFactory = $$$Inject(BouwsteenIteratorFactory, ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -72,7 +77,7 @@
 				Do ..AxdEntityHeader.ProdRAF.Insert(ProdRaf)
 				
 				#dim Product As DOM.PM.Product = ..ProductApi.GeefProduct(Lijn.GeefProductID())
-				Set ..BouwsteenIterator = $$$LazyLoad(..BouwsteenIterator, ##class(AXimpl.Admin.DOM.PM.BouwsteenIterator).%New(Product))
+				Set ..BouwsteenIterator = ..BouwsteenIteratorFactory.Maak(Lijn.GeefProductID())
 				
 				While ..BouwsteenIterator.HasNext(){
 					#dim Bouwsteen As AXimpl.Admin.DOM.PM.Bouwsteen = ..BouwsteenIterator.Next()