Index: APPS/Halux/common/impl/BatchImpl.cls.xml
===================================================================
diff -u -r56500 -r56700
--- APPS/Halux/common/impl/BatchImpl.cls.xml	(.../BatchImpl.cls.xml)	(revision 56500)
+++ APPS/Halux/common/impl/BatchImpl.cls.xml	(.../BatchImpl.cls.xml)	(revision 56700)
@@ -105,13 +105,6 @@
 <Type>APPS.Halux.Planning.enu.ToeleveringSorteerType</Type>
 </Property>
 
-<Property name="IsWegwerppallet">
-<Type>%Boolean</Type>
-<Calculated>1</Calculated>
-<SqlComputeCode>	Set {*}=##class(APPS.Halux.common.impl.BatchImpl).%OpenId({ID}).IsWegwerppallet()</SqlComputeCode>
-<SqlComputed>1</SqlComputed>
-</Property>
-
 <Method name="%OnNew">
 <FormalSpec>Lijn:APPS.Halux.common.enu.ProductieLijn=""</FormalSpec>
 <Private>1</Private>
@@ -267,8 +260,11 @@
 
 	Set ..ProductieGroep = ##class(APPS.Halux.Planning.impl.BatchService.Utils).%New().GeefProductieGroepen(Toelevering).GetAt(1)
 	Do ..ZetStatus(##class(APPS.Halux.common.enu.BatchStatus).Manueel())
-	If (..GeefGeplandOp() = "") Do ..ZetGeplandOpVroegsteGeplandVanToelevering()
 	
+	//Do ##class(APPS.Halux.AAP.DnaCodeService).%New().DnaCodeBijwerkenMetBatchGegevens($this)
+	
+	If (..GeefGeplandOp() = "") Do ..ZetGeplandOpVroegsteGeplandVanToelevering(Toelevering)
+	
 	Do ..SorteerToeleveringenAutomatischIndienNodig()
 ]]></Implementation>
 </Method>
@@ -630,7 +626,24 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsWegwerppallet">
+<Method name="ZetStatusEnSave">
+<FormalSpec>Status:APPS.Halux.common.enu.BatchStatus</FormalSpec>
+<Implementation><![CDATA[
+	Do ..ZetStatus(Status)
+	Do ..Save()
+]]></Implementation>
+</Method>
+
+<Method name="OnDelete">
+<FormalSpec>oid:%ObjectIdentity</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ##class(APPS.Halux.common.event.BatchEventRaiser).RaiseBatchRemovedEvent(..%Id())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefIsWegwerpPallet">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim IsWegwerppallet As %Boolean = $$$False
@@ -650,23 +663,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetStatusEnSave">
-<FormalSpec>Status:APPS.Halux.common.enu.BatchStatus</FormalSpec>
-<Implementation><![CDATA[
-	Do ..ZetStatus(Status)
-	Do ..Save()
-]]></Implementation>
-</Method>
-
-<Method name="OnDelete">
-<FormalSpec>oid:%ObjectIdentity</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do ##class(APPS.Halux.common.event.BatchEventRaiser).RaiseBatchRemovedEvent(..%Id())
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DataLocation>^APPS.Halux.common.BatchD</DataLocation>
@@ -711,9 +707,6 @@
 <Value name="10">
 <Value>ToeleveringSorteerType</Value>
 </Value>
-<Value name="11">
-<Value>IsWegwerppallet</Value>
-</Value>
 </Data>
 <Data name="ToeleveringenIndex">
 <Attribute>ToeleveringenIndex</Attribute>
Index: vhTest/Mock/APPS/Halux/common/Batch.cls.xml
===================================================================
diff -u -r29059 -r56700
--- vhTest/Mock/APPS/Halux/common/Batch.cls.xml	(.../Batch.cls.xml)	(revision 29059)
+++ vhTest/Mock/APPS/Halux/common/Batch.cls.xml	(.../Batch.cls.xml)	(revision 56700)
@@ -3,8 +3,7 @@
 <Class name="vhTest.Mock.APPS.Halux.common.Batch">
 <Description>
 Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
-Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
-Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.Halux.common.Batch,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
@@ -45,6 +44,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefIsWegwerpPallet">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefIsWegwerpPallet")
+]]></Implementation>
+</Method>
+
 <Method name="GeefLijn">
 <ReturnType>APPS.Halux.common.enu.ProductieLijn</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLijn")
@@ -104,11 +109,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="SorteerToeleveringenAutomatisch">
-<Implementation><![CDATA[	do ..VerwerkMethodCall("SorteerToeleveringenAutomatisch")
-]]></Implementation>
-</Method>
-
 <Method name="VerwijderAlleToeleveringen">
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderAlleToeleveringen")
 ]]></Implementation>
Index: vhUnitTest/APPS/Halux/Planning/TestBatchService.cls.xml
===================================================================
diff -u -r56524 -r56700
--- vhUnitTest/APPS/Halux/Planning/TestBatchService.cls.xml	(.../TestBatchService.cls.xml)	(revision 56524)
+++ vhUnitTest/APPS/Halux/Planning/TestBatchService.cls.xml	(.../TestBatchService.cls.xml)	(revision 56700)
@@ -430,7 +430,7 @@
 	#dim Batch As APPS.Halux.common.Batch = BatchService.MaakNieuweLegeBatch(13,##class(APPS.Halux.common.enu.Categorie).Tandembox())
 	Do Batch.Save()
 	
-	Do $$$AssertFalse(Batch.IsWegwerppallet)
+	Do $$$AssertFalse(Batch.GeefIsWegwerpPallet())
 	
 	Do Batch.Delete()
 ]]></Implementation>
@@ -460,7 +460,7 @@
 	Do Batch.VoegToeToelevering(ToeleveringStub)
 	Do Batch.Save()
 	
-	Do $$$AssertFalse(Batch.IsWegwerppallet)
+	Do $$$AssertFalse(Batch.GeefIsWegwerpPallet())
 	
 	Do Batch.Delete()
 ]]></Implementation>
@@ -490,7 +490,7 @@
 	Do Batch.VoegToeToelevering(ToeleveringStub)
 	Do Batch.Save()
 	
-	Do $$$AssertTrue(Batch.IsWegwerppallet)
+	Do $$$AssertTrue(Batch.GeefIsWegwerpPallet())
 	
 	Do Batch.Delete()
 ]]></Implementation>
Index: APPS/Halux/common/Batch.cls.xml
===================================================================
diff -u -r29059 -r56700
--- APPS/Halux/common/Batch.cls.xml	(.../Batch.cls.xml)	(revision 29059)
+++ APPS/Halux/common/Batch.cls.xml	(.../Batch.cls.xml)	(revision 56700)
@@ -161,6 +161,11 @@
 <Method name="Save">
 <Abstract>1</Abstract>
 </Method>
+
+<Method name="GeefIsWegwerpPallet">
+<Abstract>1</Abstract>
+<ReturnType>%Boolean</ReturnType>
+</Method>
 </Class>