Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ToeleveringAantalRollenOptiesGenerator.cls.xml
===================================================================
diff -u -r71884 -r71894
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ToeleveringAantalRollenOptiesGenerator.cls.xml	(.../ToeleveringAantalRollenOptiesGenerator.cls.xml)	(revision 71884)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ToeleveringAantalRollenOptiesGenerator.cls.xml	(.../ToeleveringAantalRollenOptiesGenerator.cls.xml)	(revision 71894)
@@ -21,13 +21,33 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GenerereerOptiesAantallenPerRolVoorBatch">
+<FormalSpec>Batch:APPS.Halux.common.Batch</FormalSpec>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	Set Opties = ##class(%ListOfObjects).%New()
+	Set AantallenPerRol = ##class(TECH.KeyValue.UniqueList).%New()
+	#dim ToeleveringIterator As TECH.Iterator = Batch.GeefToeleveringIterator()
+	
+	While (ToeleveringIterator.HasNext()) {		
+		#dim Toelevering As DOM.AKP.Toelevering = ToeleveringIterator.Next()	
+		Do ..BepaalAantallenPerRolVoorToelevering(.AantallenPerRol, Toelevering)
+	}
+	
+	Do ##class(TECH.ListUtils).AppendList(Opties, ..GeefOptiesVoorAantallenPerRol(AantallenPerRol))
+	
+	Quit Opties
+]]></Implementation>
+</Method>
+
 <Method name="GenereerOptiesVoorLade">
 <FormalSpec>Toelevering:DOM.AKP.Toelevering</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
 	Set Opties = ##class(%ListOfObjects).%New()
+	Set AantallenPerRol = ##class(TECH.KeyValue.UniqueList).%New()
 	
-	#dim AantallenPerRol As TECH.KeyValue.UniqueList = ..GeefAantallenPerRol(Toelevering)	
+	Do ..BepaalAantallenPerRolVoorToelevering(.AantallenPerRol, Toelevering)	
 	Do ##class(TECH.ListUtils).AppendList(Opties, ..GeefOptiesVoorAantallenPerRol(AantallenPerRol))
 	
 	Quit Opties
@@ -52,12 +72,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAantallenPerRol">
-<FormalSpec>Toelevering:DOM.AKP.Toelevering</FormalSpec>
+<Method name="BepaalAantallenPerRolVoorToelevering">
+<FormalSpec><![CDATA[&AantallenPerRol:TECH.KeyValue.UniqueList,Toelevering:DOM.AKP.Toelevering]]></FormalSpec>
 <Private>1</Private>
-<ReturnType>TECH.KeyValue.UniqueList</ReturnType>
 <Implementation><![CDATA[
-	Set AantallenPerRol = ##class(TECH.KeyValue.UniqueList).%New()
 	#dim ProductLijnIterator As TECH.Iterator = Toelevering.GeefTypeToeleveringLijnIterator(##class(DOM.AKP.enu.ToeleveringLijnType).Product())
 	
 	While (ProductLijnIterator.HasNext()) {
@@ -72,8 +90,6 @@
 			Do ##class(TECH.ExceptionHandler).Throw(NewException)
 		}
 	}
-	
-	Quit AantallenPerRol
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/BatchNaarObjectiveDataGenerator.cls.xml
===================================================================
diff -u -r71844 -r71894
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/BatchNaarObjectiveDataGenerator.cls.xml	(.../BatchNaarObjectiveDataGenerator.cls.xml)	(revision 71844)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/BatchNaarObjectiveDataGenerator.cls.xml	(.../BatchNaarObjectiveDataGenerator.cls.xml)	(revision 71894)
@@ -97,7 +97,13 @@
 <Method name="GenereerAlgemeneInfoOptiesVoorBatch">
 <FormalSpec>Batch:APPS.Halux.common.Batch</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
-<Implementation><![CDATA[	Quit ..AlgemeneInfoOptiesGenerator.GenereerAlgemeneOptiesVoorBatch(Batch)
+<Implementation><![CDATA[
+	Set Opties = ##class(%ListOfObjects).%New()
+	
+	Do ##class(TECH.ListUtils).AppendList(Opties, ..AlgemeneInfoOptiesGenerator.GenereerAlgemeneOptiesVoorBatch(Batch))
+	Do ##class(TECH.ListUtils).AppendList(Opties, ..ToeleveringAantalRollenOptiesGenerator.GenerereerOptiesAantallenPerRolVoorBatch(Batch))
+	
+	Quit Opties
 ]]></Implementation>
 </Method>