Index: vhTest/Mock/APPS/Halux/common/Batch.cls.xml
===================================================================
diff -u -r57037 -r62410
--- vhTest/Mock/APPS/Halux/common/Batch.cls.xml	(.../Batch.cls.xml)	(revision 57037)
+++ vhTest/Mock/APPS/Halux/common/Batch.cls.xml	(.../Batch.cls.xml)	(revision 62410)
@@ -45,8 +45,9 @@
 </Method>
 
 <Method name="GeefIsWegwerpPallet">
+<FormalSpec>ToeleveringId:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefIsWegwerpPallet")
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefIsWegwerpPallet",ToeleveringId)
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r62253 -r62410
--- APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62253)
+++ APPS/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 62410)
@@ -165,7 +165,7 @@
 			If DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Nieuw() {
 				Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch()
 				Set DnaCode.Lijn = Batch.GeefLijn()
-				Set DnaCode.IsWegwerpPallet = Batch.GeefIsWegwerpPallet()
+				Set DnaCode.IsWegwerpPallet = Batch.GeefIsWegwerpPallet(Toelevering.GeefID())
 				Do ..DnaCodeRepository.Bewaar(DnaCode)
 			}
 		}
@@ -195,7 +195,7 @@
 	}
 	If $IsObject(Batch) {
 		Set DnaCode.BatchId = Batch.GeefID()
-		Set DnaCode.IsWegwerpPallet = Batch.GeefIsWegwerpPallet()
+		Set DnaCode.IsWegwerpPallet = Batch.GeefIsWegwerpPallet(Toelevering.GeefID())
 		Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch()
 		Set DnaCode.Lijn = Batch.GeefLijn()
 	}
Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml
===================================================================
diff -u -r62240 -r62410
--- vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 62240)
+++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 62410)
@@ -40,7 +40,7 @@
 	Set ..Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New(..LijnId)
 	Do ..Batch.IndienMethodCall("GeefLijn").DanReturn(..LijnId)
 	Do ..Batch.IndienMethodCall("GeefID").DanReturn(..#BatchId)
-	Do ..Batch.IndienMethodCall("GeefIsWegwerpPallet").DanReturn($$$True)
+	Do ..Batch.IndienMethodCall("GeefIsWegwerpPallet",1).DanReturn($$$True)
 	
 	Set ..ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Set ProductStub = ##class(vhTest.Mock.DOM.PM.MaatwerkProduct).%New()
Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeBijwerkenMetBatchGegevens/Test.cls.xml
===================================================================
diff -u -r57085 -r62410
--- vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeBijwerkenMetBatchGegevens/Test.cls.xml	(.../Test.cls.xml)	(revision 57085)
+++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeBijwerkenMetBatchGegevens/Test.cls.xml	(.../Test.cls.xml)	(revision 62410)
@@ -44,7 +44,7 @@
 	Set Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
 	Do Batch.IndienMethodCall("GeefToeleveringIterator",).DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Toelevering))
 	Do Batch.IndienMethodCall("GeefLijn",).DanReturn("L1")
-	Do Batch.IndienMethodCall("GeefIsWegwerpPallet").DanReturn($$$True)
+	Do Batch.IndienMethodCall("GeefIsWegwerpPallet",Toelevering.GeefID()).DanReturn($$$True)
 
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaToeleveringId",Toelevering.GeefID()).DanReturn(..DnaCodeIteratorDrieStuks)
@@ -71,7 +71,8 @@
 	Set Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
 	Do Batch.IndienMethodCall("GeefToeleveringIterator",).DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Toelevering, Toelevering2))
 	Do Batch.IndienMethodCall("GeefLijn",).DanReturn("L1")
-	Do Batch.IndienMethodCall("GeefIsWegwerpPallet").DanReturn($$$True)
+	Do Batch.IndienMethodCall("GeefIsWegwerpPallet",Toelevering.GeefID()).DanReturn($$$True)
+	Do Batch.IndienMethodCall("GeefIsWegwerpPallet",Toelevering2.GeefID()).DanReturn($$$False)
 
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaToeleveringId",Toelevering.GeefID()).DanReturn(..DnaCodeIteratorDrieStuks)
Index: APPS/Halux/common/impl/BatchImpl.cls.xml
===================================================================
diff -u -r57874 -r62410
--- APPS/Halux/common/impl/BatchImpl.cls.xml	(.../BatchImpl.cls.xml)	(revision 57874)
+++ APPS/Halux/common/impl/BatchImpl.cls.xml	(.../BatchImpl.cls.xml)	(revision 62410)
@@ -670,17 +670,17 @@
 </Method>
 
 <Method name="GeefIsWegwerpPallet">
+<FormalSpec>ToeleveringId:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim IsWegwerppallet As %Boolean = $$$False
 	
 	#dim ToeleveringIterator As TECH.Iterator = ..GeefToeleveringIterator()
-	// Kijkt enkel naar de Klant van de 1e toelevering => Klanten die wegwerppalletten willen worden apart in batches gestoken
-	If (ToeleveringIterator.HasNext()) {
+	While (ToeleveringIterator.HasNext()) {
 		#dim Toelevering As DOM.AKP.Toelevering = ToeleveringIterator.Next()
 		#dim Klant As DOM.VKP.Klant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(Toelevering.GeefKlantID())
 		#dim KlantOrderInstellingen As DOM.VKP.KlantOrderInstellingen = Klant.GeefKlantOrderInstellingen()
-		If (KlantOrderInstellingen.MoetOpWegwerppallet()) {
+		If (KlantOrderInstellingen.MoetOpWegwerppallet() && (ToeleveringId = Toelevering.GeefID())) {
 			Set IsWegwerppallet = $$$True
 		}
 	}
Index: APPS/Halux/common/Batch.cls.xml
===================================================================
diff -u -r57037 -r62410
--- APPS/Halux/common/Batch.cls.xml	(.../Batch.cls.xml)	(revision 57037)
+++ APPS/Halux/common/Batch.cls.xml	(.../Batch.cls.xml)	(revision 62410)
@@ -179,6 +179,7 @@
 
 <Method name="GeefIsWegwerpPallet">
 <Abstract>1</Abstract>
+<FormalSpec>ToeleveringId:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 </Method>
 </Class>