Index: APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective.cls.xml
===================================================================
diff -u -r71497 -r71498
--- APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective.cls.xml	(.../BatchNaarObjective.cls.xml)	(revision 71497)
+++ APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective.cls.xml	(.../BatchNaarObjective.cls.xml)	(revision 71498)
@@ -9,7 +9,7 @@
 </Property>
 
 <Property name="BatchNaarObjectiveDataGenerator">
-<Type>APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective.BatchNaarObjectiveDataGenerator</Type>
+<Type>APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.BatchNaarObjectiveDataGenerator</Type>
 <Private>1</Private>
 </Property>
 
@@ -19,7 +19,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ToeleveringApi:DOM.AKP.ToeleveringAPI="",BatchNaarObjectiveDataGenerator:APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective.BatchNaarObjectiveDataGenerator=""</FormalSpec>
+<FormalSpec>ToeleveringApi:DOM.AKP.ToeleveringAPI="",BatchNaarObjectiveDataGenerator:APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.BatchNaarObjectiveDataGenerator=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -59,15 +59,14 @@
 		#dim Batch As APPS.Halux.common.Batch  = ##class(APPS.ApplicatieContext).Instance().GeefProductieAPI().GeefBatchService().GeefBatch(BatchId)
 		#dim ToeleveringenIterator As TECH.Iterator = Batch.GeefToeleveringIterator()
 		#dim UitvoeringInfoLijstIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(UitvoeringInfoLijst)
-		//Temp
-		#dim Index As %Integer = 0
+		#dim IndexToelevering As %Integer = 0
 		
 		If (..MESService.IsActiefVoorMes(Batch.GeefLijn(), 1)) {
 			While ToeleveringenIterator.HasNext() {
 				#dim ToeleveringId As %String = ToeleveringenIterator.Next().GeefID()
 				#dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringApi.GeefToelevering(ToeleveringId)
-				Set Index = Index + 1
-				#dim BatchData As APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.dto.BatchNaarObjectiveData = ..BatchNaarObjectiveDataGenerator.GenereerBatchDataVoorToelevering(Batch, Toelevering, Index)
+				Set IndexToelevering = IndexToelevering + 1
+				#dim BatchData As APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.dto.BatchNaarObjectiveData = ..BatchNaarObjectiveDataGenerator.GenereerBatchDataVoorToelevering(Batch, Toelevering, IndexToelevering)
 				Set BatchData.Opties = ##class(%ListOfObjects).%New()
 				
 				// LBX !