Index: zTryout/MVI/KOD/Order.cls.xml
===================================================================
diff -u -r33206 -r33271
--- zTryout/MVI/KOD/Order.cls.xml	(.../Order.cls.xml)	(revision 33206)
+++ zTryout/MVI/KOD/Order.cls.xml	(.../Order.cls.xml)	(revision 33271)
@@ -26,7 +26,6 @@
 	Do ##class(BL.Legacy.Order).RebuildIndexKOD(KlantNummer, OrderNummer)
 	//Do ..VerhoogOrderLijnNummer() (?)
 	
-	
 	#dim Order As zTryout.MVI.KOD.Order = ##class(zTryout.MVI.KOD.Order).%New(OrderNummer, KlantNummer)
 
 	Do ..RaiseOrderGemaaktEvent(Order)
Index: zTryout/MVI/UnitTest/KPR/ProductOrderIndex/Test.cls.xml
===================================================================
diff -u -r33171 -r33271
--- zTryout/MVI/UnitTest/KPR/ProductOrderIndex/Test.cls.xml	(.../Test.cls.xml)	(revision 33171)
+++ zTryout/MVI/UnitTest/KPR/ProductOrderIndex/Test.cls.xml	(.../Test.cls.xml)	(revision 33271)
@@ -60,7 +60,6 @@
 
 <Method name="Test: ZetAantal">
 <Implementation><![CDATA[
-	
 	#dim ProductOrderIndex As zTryout.MVI.KPR.ProductOrderIndex = ..MaakProductOrderIndex(..#ProductNummer, ..Datum, ..#OrderNummer, ..#OrderLijnNummer, 25, "", "")
 	Do ProductOrderIndex.ZetAantal(30)
 
Index: zTryout/MVI/UnitTest/KPR/Product/Test.cls.xml
===================================================================
diff -u -r33224 -r33271
--- zTryout/MVI/UnitTest/KPR/Product/Test.cls.xml	(.../Test.cls.xml)	(revision 33224)
+++ zTryout/MVI/UnitTest/KPR/Product/Test.cls.xml	(.../Test.cls.xml)	(revision 33271)
@@ -72,10 +72,23 @@
 	While (Iterator.HasNext()) {
 		#dim ProductOrderIndex As zTryout.MVI.KPR.ProductOrderIndex	= Iterator.Next()
 		
-		w !, "--->" _ ProductOrderIndex.GeefOrderLijnNummer()
+		w !, "---> OrderLijnNummer:" _ ProductOrderIndex.GeefOrderLijnNummer()
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="Test: GeefProductToeleveringIndexIterator">
+<Implementation><![CDATA[
+	#dim Product As zTryout.MVI.KPR.Product = ##class(zTryout.MVI.KPR.Product).%New(568125)
+	#dim Iterator As TECH.Iterator = Product.GeefProductToeleveringIndexIterator()
+	
+	While (Iterator.HasNext()) {
+		#dim ProductToeleveringIndex As zTryout.MVI.KPR.ProductToeleveringIndex	= Iterator.Next()
+		
+		w !, "--->ToeleveringLijnNummer:" _ ProductToeleveringIndex.GeefToeleveringLijnNummer()
+	}
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: zTryout/MVI/UnitTest/KPR/ProductToeleveringIndex/Test.cls.xml
===================================================================
diff -u
--- zTryout/MVI/UnitTest/KPR/ProductToeleveringIndex/Test.cls.xml	(revision 0)
+++ zTryout/MVI/UnitTest/KPR/ProductToeleveringIndex/Test.cls.xml	(revision 33271)
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="zTryout.MVI.UnitTest.KPR.ProductToeleveringIndex.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="ProductNummer">
+<Type>%String</Type>
+<Default>123456</Default>
+</Parameter>
+
+<Parameter name="ToeleveringNummer">
+<Type>%String</Type>
+<Default>111111</Default>
+</Parameter>
+
+<Parameter name="ToeleveringLijnNummer">
+<Type>%String</Type>
+<Default>101</Default>
+</Parameter>
+
+<Property name="Datum">
+<Type>%Date</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductStockType">
+<Type>zTryout.MVI.KPR.Product.enu.ProductStockType.AutoComplete</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+
+	Do ##class(zTryout.MVI.KPR.Product).VerwijderProduct(..#ProductNummer)
+	Do ##class(zTryout.MVI.KPR.Product).MaakProduct(..#ProductNummer)
+	
+	Set ..Datum = $zDateH("02/01/16", 4)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Do ##class(zTryout.MVI.KPR.Product).VerwijderProduct(..#ProductNummer)
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefLeverancier">
+<Implementation><![CDATA[
+	#dim ProductToeleveringIndex As zTryout.MVI.KPR.ProductToeleveringIndex = ..MaakProductToeleveringIndex(..#ProductNummer, ..Datum, ..#ToeleveringNummer, ..#ToeleveringLijnNummer, 25, "", "")
+	
+	Set $Piece(^KPR(..#ProductNummer, ProductToeleveringIndex.GeefSleutel()), "\", 2) = 1234
+	Do $$$AssertEquals(ProductToeleveringIndex.GeefLeverancier(), 1234)
+]]></Implementation>
+</Method>
+
+<Method name="Test: ZetLeverancier">
+<Implementation><![CDATA[
+	#dim ProductToeleveringIndex As zTryout.MVI.KPR.ProductToeleveringIndex = ..MaakProductToeleveringIndex(..#ProductNummer, ..Datum, ..#ToeleveringNummer, ..#ToeleveringLijnNummer, 25, "", "")
+	Do ProductToeleveringIndex.ZetLeverancier(1234)
+
+	#dim Leverancier As %String = $Piece(^KPR(..#ProductNummer, ProductToeleveringIndex.GeefSleutel()), "\", 2)
+	Do $$$AssertEquals(Leverancier, 1234)
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefAantal">
+<Implementation><![CDATA[
+	#dim ProductToeleveringIndex As zTryout.MVI.KPR.ProductToeleveringIndex = ..MaakProductToeleveringIndex(..#ProductNummer, ..Datum, ..#ToeleveringNummer, ..#ToeleveringLijnNummer, 25, "", "")
+	
+	Set $Piece(^KPR(..#ProductNummer, ProductToeleveringIndex.GeefSleutel()), "\", 4) = 30
+	Do $$$AssertEquals(ProductToeleveringIndex.GeefAantal(), 30)
+]]></Implementation>
+</Method>
+
+<Method name="Test: ZetAantal">
+<Implementation><![CDATA[
+	#dim ProductToeleveringIndex As zTryout.MVI.KPR.ProductToeleveringIndex = ..MaakProductToeleveringIndex(..#ProductNummer, ..Datum, ..#ToeleveringNummer, ..#ToeleveringLijnNummer, 25, "", "")
+	Do ProductToeleveringIndex.ZetAantal(30)
+
+	#dim Aantal As %Integer = $Piece(^KPR(..#ProductNummer, ProductToeleveringIndex.GeefSleutel()), "\", 4)
+	Do $$$AssertEquals(Aantal, 30)
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefType">
+<Implementation><![CDATA[
+	#dim ProductToeleveringIndex As zTryout.MVI.KPR.ProductToeleveringIndex = ..MaakProductToeleveringIndex(..#ProductNummer, ..Datum, ..#ToeleveringNummer, ..#ToeleveringLijnNummer, "", "", ..ProductStockType.KOM)
+	
+	Set $Piece(^KPR(..#ProductNummer, ProductToeleveringIndex.GeefSleutel()), "\", 7) = ..ProductStockType.Stock
+	Do $$$AssertEquals(ProductToeleveringIndex.GeefType(), ..ProductStockType.Stock)
+]]></Implementation>
+</Method>
+
+<Method name="Test: ZetType">
+<Implementation><![CDATA[
+	#dim ProductToeleveringIndex As zTryout.MVI.KPR.ProductToeleveringIndex = ..MaakProductToeleveringIndex(..#ProductNummer, ..Datum, ..#ToeleveringNummer, ..#ToeleveringLijnNummer, "", "", ..ProductStockType.KOM)
+	Do ProductToeleveringIndex.ZetType(..ProductStockType.Stock)
+	
+	#dim Type As zTryout.MVI.KPR.Product.enu.ProductStockType = $Piece(^KPR(..#ProductNummer, ProductToeleveringIndex.GeefSleutel()), "\", 7)
+	Do $$$AssertEquals(Type, ..ProductStockType.Stock)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Exceptie wordt geraised indien ProductToeleveringIndex niet bestaat voor Product">
+<Implementation><![CDATA[
+	#dim Omschrijvingen As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen resultaat gevonden voor", "ProductToeleveringIndex", ..#ProductNummer)
+	#dim VerwachteExceptie = ##class(Tools.Test.VerwachteExceptie).%New("zTryout.MVI.Excepties.NietGevondenExceptie", Omschrijvingen)
+
+	Do ..ZetVerwachteExceptie(VerwachteExceptie)
+
+	#dim ProductToeleveringIndex As zTryout.MVI.KPR.ProductToeleveringIndex = ..MaakProductToeleveringIndex(..#ProductNummer, ..Datum, ..#ToeleveringNummer, ..#ToeleveringLijnNummer, "", "", "")
+	#dim Sleutel As %String = ProductToeleveringIndex.GeefSleutel()
+	
+	Do ##class(zTryout.MVI.KPR.ProductToeleveringIndex).VerwijderProductToeleveringIndex(..#ProductNummer, Sleutel)
+	
+	Set ProductToeleveringIndex = ##class(zTryout.MVI.KPR.ProductToeleveringIndex).%New(..#ProductNummer, Sleutel)
+]]></Implementation>
+</Method>
+
+<Method name="MaakProductToeleveringIndex">
+<FormalSpec>ProductNummer:%String,Datum:%Date,ToeleveringNummer:%String,ToeleveringLijnNummer:%String,Aantal:%Integer,Leverweek:%Date,Type:zTryout.MVI.KPR.Product.enu.ProductStockType</FormalSpec>
+<Private>1</Private>
+<ReturnType>zTryout.MVI.KPR.ProductToeleveringIndex</ReturnType>
+<Implementation><![CDATA[
+	#dim ProductToeleveringIndex As zTryout.MVI.KPR.ProductToeleveringIndex = ##class(zTryout.MVI.KPR.ProductToeleveringIndex).MaakProductToeleveringIndex(ProductNummer, Datum, ToeleveringNummer, ToeleveringLijnNummer)
+
+	Do ProductToeleveringIndex.ZetAantal(Aantal)
+	Do ProductToeleveringIndex.ZetLeverweek(Leverweek)
+	Do ProductToeleveringIndex.ZetType(Type)
+	
+	Quit ProductToeleveringIndex
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: zTryout/MVI/KPR/Product.cls.xml
===================================================================
diff -u -r33224 -r33271
--- zTryout/MVI/KPR/Product.cls.xml	(.../Product.cls.xml)	(revision 33224)
+++ zTryout/MVI/KPR/Product.cls.xml	(.../Product.cls.xml)	(revision 33271)
@@ -75,6 +75,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefProductToeleveringIndexIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	#dim ProductToeleveringen As %ListOfObjects = ##class(%ListOfObjects).%New()
+	#dim Sleutel As %String = $Order(^KPR(..ProductNummer, ##class(zTryout.MVI.KPR.ProductToeleveringIndex).#SleutelPrefix))
+
+	While (##class(TECH.StringUtils).StartsWith(Sleutel, ##class(zTryout.MVI.KPR.ProductToeleveringIndex).#SleutelPrefix)) {
+		#dim ProductToeleveringIndex As zTryout.MVI.KPR.ProductToeleveringIndex = ##class(zTryout.MVI.KPR.ProductToeleveringIndex).%New(..ProductNummer, Sleutel)
+		
+		Do ProductToeleveringen.Insert(ProductToeleveringIndex)
+		
+		Set Sleutel = $Order(^KPR(..ProductNummer, Sleutel))
+	}
+	
+	Quit ##class(TECH.ListIterator).%New(ProductToeleveringen)
+]]></Implementation>
+</Method>
+
 <Method name="Valideer">
 <Private>1</Private>
 <Implementation><![CDATA[