Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/BatchNaarObjectiveDataGenerator.cls.xml
===================================================================
diff -u -r71495 -r71498
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/BatchNaarObjectiveDataGenerator.cls.xml	(.../LBX/BatchNaarObjective/BatchNaarObjectiveDataGenerator.cls.xml)	(revision 71495)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/BatchNaarObjectiveDataGenerator.cls.xml	(.../common/BatchNaarObjective/BatchNaarObjectiveDataGenerator.cls.xml)	(revision 71498)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective.BatchNaarObjectiveDataGenerator">
+<Class name="APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.BatchNaarObjectiveDataGenerator">
 <Abstract>1</Abstract>
 <Super>TECH.RegisteredObject</Super>
 
@@ -15,7 +15,7 @@
 </Property>
 
 <Property name="ProductOptiesGenerator">
-<Type>%String</Type>
+<Type>APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator</Type>
 <Private>1</Private>
 </Property>
 
@@ -73,12 +73,14 @@
 <Abstract>1</Abstract>
 <FormalSpec>Toelevering:DOM.AKP.Toelevering,UitvoeringInfo:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfo</FormalSpec>
 <Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GenereerKenmerkenOpties">
 <Abstract>1</Abstract>
 <FormalSpec>Toelevering:DOM.AKP.Toelevering,UitvoeringInfo:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfo</FormalSpec>
 <Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: vhTest/Mock/APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective.cls.xml
===================================================================
diff -u -r71471 -r71498
--- vhTest/Mock/APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective.cls.xml	(.../BatchNaarObjective.cls.xml)	(revision 71471)
+++ vhTest/Mock/APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective.cls.xml	(.../BatchNaarObjective.cls.xml)	(revision 71498)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <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>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
FishEye: Tag 71498 refers to a dead (removed) revision in file `APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective/BatchNaarObjectiveDataGenerator.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
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 ! 
Index: APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective/BatchNaarObjectiveDataGeneratorLbx.cls.xml
===================================================================
diff -u -r71496 -r71498
--- APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective/BatchNaarObjectiveDataGeneratorLbx.cls.xml	(.../BatchNaarObjectiveDataGeneratorLbx.cls.xml)	(revision 71496)
+++ APPS/Halux/PPS/Document/impl/LBX/BatchNaarObjective/BatchNaarObjectiveDataGeneratorLbx.cls.xml	(.../BatchNaarObjectiveDataGeneratorLbx.cls.xml)	(revision 71498)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective.BatchNaarObjectiveDataGeneratorLbx">
-<Super>APPS.Halux.PPS.Document.impl.LBX.BatchNaarObjective.BatchNaarObjectiveDataGenerator</Super>
+<Super>APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.BatchNaarObjectiveDataGenerator</Super>
 
 <Property name="RollenEnStuklijstOptiesGenerator">
 <Type>APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.RollenEnStuklijstOptiesGenerator</Type>