Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml
===================================================================
diff -u -r73609 -r73748
--- vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml	(.../Test.cls.xml)	(revision 73609)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml	(.../Test.cls.xml)	(revision 73748)
@@ -98,17 +98,16 @@
 	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeServiceMock, IngegevenKenmerkenSpaceStepHelperMock, , HoutCertificaatServiceMock)
 	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringStub, ..UitvoeringInfo)
 	
-	Do $$$AssertEquals(Resultaat.Size, 10)
-	Do ..AssertOptie(Resultaat.GetAt(1), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-DNA-code", ..#DummyDnaCode)
-	Do ..AssertOptie(Resultaat.GetAt(2), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-PIN", ..#DummyDnaCode)
-	Do ..AssertOptie(Resultaat.GetAt(3), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SHORTPIN", "ode")	
-	Do ..AssertOptie(Resultaat.GetAt(4), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Inventtransid", ..#DummyInventTransId)	
-	Do ..AssertOptie(Resultaat.GetAt(5), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Axconfigid", ..#DummyAxConfigId)	
-	Do ..AssertOptie(Resultaat.GetAt(6), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Korttekst", ..#DummyKorttekst)	
-	Do ..AssertOptie(Resultaat.GetAt(7), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Langtekst", ..#DummyLangtekst)
-	Do ..AssertOptie(Resultaat.GetAt(8), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Dossiercode", ..#DummyDossierCode)
-	Do ..AssertOptie(Resultaat.GetAt(9), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-FSC-claim", "null")	
-	Do ..AssertOptie(Resultaat.GetAt(10), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Vhoss-info", "null")		
+	Do $$$AssertEquals(Resultaat.Size, 9)
+	Do ..AssertOptie(Resultaat.GetAt(1), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-PIN", ..#DummyDnaCode)
+	Do ..AssertOptie(Resultaat.GetAt(2), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SHORTPIN", "ode")	
+	Do ..AssertOptie(Resultaat.GetAt(3), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Inventtransid", ..#DummyInventTransId)	
+	Do ..AssertOptie(Resultaat.GetAt(4), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Axconfigid", ..#DummyAxConfigId)	
+	Do ..AssertOptie(Resultaat.GetAt(5), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Korttekst", ..#DummyKorttekst)	
+	Do ..AssertOptie(Resultaat.GetAt(6), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Langtekst", ..#DummyLangtekst)
+	Do ..AssertOptie(Resultaat.GetAt(7), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Dossiercode", ..#DummyDossierCode)
+	Do ..AssertOptie(Resultaat.GetAt(8), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-FSC-claim", "null")	
+	Do ..AssertOptie(Resultaat.GetAt(9), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Vhoss-info", "null")		
 	
 	Do ProductMock.Verifieer()
 	Do ProductApiMock.Verifieer()
@@ -137,8 +136,8 @@
 	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeServiceMock, IngegevenKenmerkenSpaceStepHelperMock)
 	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringStub, ..UitvoeringInfo)
 	
-	Do $$$AssertEquals(Resultaat.Size, 10)
-	Do ..AssertOptie(Resultaat.GetAt(10), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Vhoss-info", "123.A.789")		
+	Do $$$AssertEquals(Resultaat.Size, 9)
+	Do ..AssertOptie(Resultaat.GetAt(9), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Vhoss-info", "123.A.789")		
 	
 	Do ProductMock.Verifieer()
 	Do ProductApiMock.Verifieer()
@@ -169,8 +168,8 @@
 	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeServiceMock, IngegevenKenmerkenSpaceStepHelperMock)
 	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringStub, ..UitvoeringInfo)
 	
-	Do $$$AssertEquals(Resultaat.Size, 11)
-	Do ..AssertOptie(Resultaat.GetAt(4), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-DNA-code-SST", DnaCodeSst)	
+	Do $$$AssertEquals(Resultaat.Size, 10)
+	Do ..AssertOptie(Resultaat.GetAt(3), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-DNA-code-SST", DnaCodeSst)	
 		
 	Do ProductMock.Verifieer()
 	Do ProductApiMock.Verifieer()
Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml
===================================================================
diff -u -r73593 -r73748
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml	(.../ProductOptiesGenerator.cls.xml)	(revision 73593)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml	(.../ProductOptiesGenerator.cls.xml)	(revision 73748)
@@ -86,7 +86,6 @@
 	#dim DnaCode As %String = ..DnaCodeService.GeefDnaCodeViaToeleveringIdEnSequentieNummerEnProductNummerEnRecent(UitvoeringInfo.ToeleveringID, UitvoeringInfo.SequentieNummer, Product.GeefID())
 	#dim DnaCodeIngekort As %String = $Extract(DnaCode, $Length(DnaCode) - 2, $Length(DnaCode))
 	
-	Do LijstOpties.Insert(..GeefOptieVoorLade(UitvoeringInfo.SequentieNummerLade, "-" _ "DNA-code", DnaCode))
 	Do LijstOpties.Insert(..GeefOptieVoorLade(UitvoeringInfo.SequentieNummerLade, "-" _ "PIN", DnaCode))
 	Do LijstOpties.Insert(..GeefOptieVoorLade(UitvoeringInfo.SequentieNummerLade, "-" _ "SHORTPIN", DnaCodeIngekort))