Index: APPS/Halux/Planning/impl/AutoBatch/Maker/InpakToeleveringen.cls.xml
===================================================================
diff -u -r59685 -r59945
--- APPS/Halux/Planning/impl/AutoBatch/Maker/InpakToeleveringen.cls.xml	(.../InpakToeleveringen.cls.xml)	(revision 59685)
+++ APPS/Halux/Planning/impl/AutoBatch/Maker/InpakToeleveringen.cls.xml	(.../InpakToeleveringen.cls.xml)	(revision 59945)
@@ -4,24 +4,41 @@
 <Super>APPS.Halux.Planning.impl.AutoBatchMaker</Super>
 
 <Method name="MaakBatches">
-<FormalSpec>AantalToolSetsNodig:%String</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="APPS.Halux.Planning.dto.MaatwerkBatch"</ReturnTypeParams>
 <Implementation><![CDATA[
 	#dim MaatwerkBatches As list of APPS.Halux.Planning.dto.MaatwerkBatch = ##class(%ListOfObjects).%New()
+	#dim ToeleveringenIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(..Toeleveringen)
 	
-	#dim Batch As APPS.Halux.common.Batch = ##class(APPS.Halux.common.BatchFactory).MaakNieuweLegeBatch(..Datum, ##class(APPS.Halux.common.enu.Categorie).Inpak())
-	Do Batch.VoegToeToeleveringen(..Toeleveringen)
+	While (ToeleveringenIterator.HasNext()) {
+		Do MaatwerkBatches.Insert(..MaakBatchVoorToelevering(ToeleveringenIterator.Next()))
+	}
+	
+	Quit MaatwerkBatches
+]]></Implementation>
+</Method>
+
+<Method name="MaakBatchVoorToelevering">
+<FormalSpec>Toelevering:DOM.AKP.Toelevering</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.Halux.Planning.dto.MaatwerkBatch</ReturnType>
+<Implementation><![CDATA[
+	#dim Batch As APPS.Halux.common.Batch = ##class(APPS.Halux.common.BatchFactory).MaakNieuweLegeBatch(..Datum, ..GeefCategorie())
+	Do Batch.VoegToeToelevering(Toelevering)
 	Do Batch.ZetStatus(##class(APPS.Halux.common.enu.BatchStatus).Auto())
-	Do Batch.ZetLijn(..BatchService.GeefInitieleLijnVoorToelevering(..Toeleveringen.GetAt(1)))
+	Do Batch.ZetLijn(..BatchService.GeefInitieleLijnVoorToelevering(Toelevering))
 	Do Batch.Save()
 	
-	#dim MaatwerkBatch As APPS.Halux.Planning.dto.MaatwerkBatch = ..BatchService.GeefMaatwerkBatch(Batch)
-	Do MaatwerkBatches.Insert(MaatwerkBatch)
-	
-	Quit MaatwerkBatches
+	Quit ..BatchService.GeefMaatwerkBatch(Batch)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefCategorie">
+<Private>1</Private>
+<ReturnType>APPS.Halux.common.enu.Categorie</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.Halux.common.enu.Categorie).Inpak()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/Halux/Planning/impl/AutoBatch/Maker/ProductOpMaatToeleveringen.cls.xml
===================================================================
diff -u -r59685 -r59945
--- APPS/Halux/Planning/impl/AutoBatch/Maker/ProductOpMaatToeleveringen.cls.xml	(.../ProductOpMaatToeleveringen.cls.xml)	(revision 59685)
+++ APPS/Halux/Planning/impl/AutoBatch/Maker/ProductOpMaatToeleveringen.cls.xml	(.../ProductOpMaatToeleveringen.cls.xml)	(revision 59945)
@@ -4,24 +4,41 @@
 <Super>APPS.Halux.Planning.impl.AutoBatchMaker</Super>
 
 <Method name="MaakBatches">
-<FormalSpec>AantalToolSetsNodig:%String</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="APPS.Halux.Planning.dto.MaatwerkBatch"</ReturnTypeParams>
 <Implementation><![CDATA[
 	#dim MaatwerkBatches As list of APPS.Halux.Planning.dto.MaatwerkBatch = ##class(%ListOfObjects).%New()
+	#dim ToeleveringenIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(..Toeleveringen)
 	
-	#dim Batch As APPS.Halux.common.Batch = ##class(APPS.Halux.common.BatchFactory).MaakNieuweLegeBatch(..Datum, ##class(APPS.Halux.common.enu.Categorie).ProductOpMaat())
-	Do Batch.VoegToeToeleveringen(..Toeleveringen)
+	While (ToeleveringenIterator.HasNext()) {
+		Do MaatwerkBatches.Insert(..MaakBatchVoorToelevering(ToeleveringenIterator.Next()))
+	}
+	
+	Quit MaatwerkBatches
+]]></Implementation>
+</Method>
+
+<Method name="MaakBatchVoorToelevering">
+<FormalSpec>Toelevering:DOM.AKP.Toelevering</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.Halux.Planning.dto.MaatwerkBatch</ReturnType>
+<Implementation><![CDATA[
+	#dim Batch As APPS.Halux.common.Batch = ##class(APPS.Halux.common.BatchFactory).MaakNieuweLegeBatch(..Datum, ..GeefCategorie())
+	Do Batch.VoegToeToelevering(Toelevering)
 	Do Batch.ZetStatus(##class(APPS.Halux.common.enu.BatchStatus).Auto())
-	Do Batch.ZetLijn(..BatchService.GeefInitieleLijnVoorToelevering(..Toeleveringen.GetAt(1)))
+	Do Batch.ZetLijn(..BatchService.GeefInitieleLijnVoorToelevering(Toelevering))
 	Do Batch.Save()
 	
-	#dim MaatwerkBatch As APPS.Halux.Planning.dto.MaatwerkBatch = ..BatchService.GeefMaatwerkBatch(Batch)
-	Do MaatwerkBatches.Insert(MaatwerkBatch)
-	
-	Quit MaatwerkBatches
+	Quit ..BatchService.GeefMaatwerkBatch(Batch)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefCategorie">
+<Private>1</Private>
+<ReturnType>APPS.Halux.common.enu.Categorie</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.Halux.common.enu.Categorie).ProductOpMaat()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/Halux/Planning/impl/AutoBatch/Maker/OnbepaaldToeleveringen.cls.xml
===================================================================
diff -u -r59685 -r59945
--- APPS/Halux/Planning/impl/AutoBatch/Maker/OnbepaaldToeleveringen.cls.xml	(.../OnbepaaldToeleveringen.cls.xml)	(revision 59685)
+++ APPS/Halux/Planning/impl/AutoBatch/Maker/OnbepaaldToeleveringen.cls.xml	(.../OnbepaaldToeleveringen.cls.xml)	(revision 59945)
@@ -4,24 +4,41 @@
 <Super>APPS.Halux.Planning.impl.AutoBatchMaker</Super>
 
 <Method name="MaakBatches">
-<FormalSpec>AantalToolSetsNodig:%String</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="APPS.Halux.Planning.dto.MaatwerkBatch"</ReturnTypeParams>
 <Implementation><![CDATA[
 	#dim MaatwerkBatches As list of APPS.Halux.Planning.dto.MaatwerkBatch = ##class(%ListOfObjects).%New()
+	#dim ToeleveringenIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(..Toeleveringen)
 	
-	#dim Batch As APPS.Halux.common.Batch = ##class(APPS.Halux.common.BatchFactory).MaakNieuweLegeBatch(..Datum, ##class(APPS.Halux.common.enu.Categorie).Onbepaald())
-	Do Batch.VoegToeToeleveringen(..Toeleveringen)
+	While (ToeleveringenIterator.HasNext()) {
+		Do MaatwerkBatches.Insert(..MaakBatchVoorToelevering(ToeleveringenIterator.Next()))
+	}
+	
+	Quit MaatwerkBatches
+]]></Implementation>
+</Method>
+
+<Method name="MaakBatchVoorToelevering">
+<FormalSpec>Toelevering:DOM.AKP.Toelevering</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.Halux.Planning.dto.MaatwerkBatch</ReturnType>
+<Implementation><![CDATA[
+	#dim Batch As APPS.Halux.common.Batch = ##class(APPS.Halux.common.BatchFactory).MaakNieuweLegeBatch(..Datum, ..GeefCategorie())
+	Do Batch.VoegToeToelevering(Toelevering)
 	Do Batch.ZetStatus(##class(APPS.Halux.common.enu.BatchStatus).Auto())
-	Do Batch.ZetLijn(..BatchService.GeefInitieleLijnVoorToelevering(..Toeleveringen.GetAt(1)))
+	Do Batch.ZetLijn(..BatchService.GeefInitieleLijnVoorToelevering(Toelevering))
 	Do Batch.Save()
 	
-	#dim MaatwerkBatch As APPS.Halux.Planning.dto.MaatwerkBatch = ..BatchService.GeefMaatwerkBatch(Batch)
-	Do MaatwerkBatches.Insert(MaatwerkBatch)
-	
-	Quit MaatwerkBatches
+	Quit ..BatchService.GeefMaatwerkBatch(Batch)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefCategorie">
+<Private>1</Private>
+<ReturnType>APPS.Halux.common.enu.Categorie</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.Halux.common.enu.Categorie).Onbepaald()
+]]></Implementation>
+</Method>
 </Class>