Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml
===================================================================
diff -u -r74602 -r74712
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml	(.../ProductOptiesGenerator.cls.xml)	(revision 74602)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml	(.../ProductOptiesGenerator.cls.xml)	(revision 74712)
@@ -77,6 +77,7 @@
 	Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade), "-" _ "Korttekst", Product.GeefKorttekst()))
 	#dim Taal As DOM.enu.Taal = ##class(DOM.enu.Taal).Nederlands()
 	Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade), "-" _ "Langtekst", Product.GeefLangtekst(Taal)))
+	Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade), "-" _ "GenericProductId", ..ProductApi.GeefIdentNummerVoorProductId(Product.GeefGenerischProductID())))
 	Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade), "-" _ "Dossiercode", Product.GeefDossierCode()))
 	
 	Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade), "-" _ "FSC-claim", ..GeefFSCLogoURL(Product)))
Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml
===================================================================
diff -u -r74606 -r74712
--- vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml	(.../Test.cls.xml)	(revision 74606)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml	(.../Test.cls.xml)	(revision 74712)
@@ -33,6 +33,11 @@
 <Default>111111</Default>
 </Parameter>
 
+<Parameter name="DummyGenericProductId">
+<Type>%String</Type>
+<Default>1.2.3.4</Default>
+</Parameter>
+
 <Parameter name="DummyDnaCode">
 <Type>%String</Type>
 <Default>DummyDnaCode</Default>
@@ -98,9 +103,11 @@
 	Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", ##class(DOM.PM.enu.Variant).MatStandaard()_ "_" _##class(DOM.PM.Maatwerk.Calc.Common.enu.GekoppeldIKType).MatX()).DanReturn($$$False)
 	Do HalffabItemsBoomMock.VerwachtMethodCall("GeefHalffabItem", $$$ElkeWaarde).DanReturn(##class(DOM.PM.Maatwerk.Calc.HF.BewerktHalffabItem).%New("", "Dummy", ""))
 	Do ProductMock.VerwachtMethodCall("GeefHalffabItemsBoom", "").DanReturn(HalffabItemsBoomMock)
+	Do ProductMock.VerwachtMethodCall("GeefGenerischProductID").DanReturn("1234")
 	
 	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..#DummyProductId).DanReturn(ProductMock)
+	Do ProductApiMock.VerwachtMethodCall("GeefIdentNummerVoorProductId", "1234").DanReturn(..#DummyGenericProductId)
 	
 	#dim DnaCodeServiceMock As vhTest.Mock.APPS.Halux.AAP.DnaCodeService = ..GeefDnaCodeServiceMock(..#SequentieNummer, ..#DummyProductId, ..#DummyDnaCode)
 	#dim IngegevenKenmerkenSpaceStepHelperMock As vhTest.Mock.DOM.PM.Maatwerk.Calc.Common.impl.IngegevenKenmerkenSpaceStepHelper = ..GeefIngegevenKenmerkenSpaceStepHelper($$$False, ..LbxKenmerken)
@@ -117,26 +124,27 @@
 	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeServiceMock, IngegevenKenmerkenSpaceStepHelperMock, , HoutCertificaatServiceMock, ProductTypeApiMock)
 	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringStub, ..UitvoeringInfo)
 	
-	Do $$$AssertEquals(Resultaat.Size, 19)
+	Do $$$AssertEquals(Resultaat.Size, 20)
 	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 ..AssertOptie(Resultaat.GetAt(10), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-TOBSynchroLinkageLength", "null")	
-	Do ..AssertOptie(Resultaat.GetAt(11), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SideStabiliserLength", "null")	
-	Do ..AssertOptie(Resultaat.GetAt(12), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SideStabiliserLength", "null")
-	Do ..AssertOptie(Resultaat.GetAt(13), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SideStabiliserLinkageLength", "null")	
-	Do ..AssertOptie(Resultaat.GetAt(14), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-DesignElementFrontLength", "null")
-	Do ..AssertOptie(Resultaat.GetAt(15), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-DistanceTrimLength", "null")	
-	Do ..AssertOptie(Resultaat.GetAt(16), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-FrontPanelLength", "null")	
-	Do ..AssertOptie(Resultaat.GetAt(17), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-GalleryFrontLength", "null")
-	Do ..AssertOptie(Resultaat.GetAt(18), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-CrossGalleryLength", "null")
-	Do ..AssertOptie(Resultaat.GetAt(19), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-CrossGalleryLowerLength", "null")	
+	Do ..AssertOptie(Resultaat.GetAt(7), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-GenericProductId", ..#DummyGenericProductId)
+	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 ..AssertOptie(Resultaat.GetAt(11), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-TOBSynchroLinkageLength", "null")	
+	Do ..AssertOptie(Resultaat.GetAt(12), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SideStabiliserLength", "null")	
+	Do ..AssertOptie(Resultaat.GetAt(13), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SideStabiliserLength", "null")
+	Do ..AssertOptie(Resultaat.GetAt(14), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SideStabiliserLinkageLength", "null")	
+	Do ..AssertOptie(Resultaat.GetAt(15), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-DesignElementFrontLength", "null")
+	Do ..AssertOptie(Resultaat.GetAt(16), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-DistanceTrimLength", "null")	
+	Do ..AssertOptie(Resultaat.GetAt(17), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-FrontPanelLength", "null")	
+	Do ..AssertOptie(Resultaat.GetAt(18), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-GalleryFrontLength", "null")
+	Do ..AssertOptie(Resultaat.GetAt(19), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-CrossGalleryLength", "null")
+	Do ..AssertOptie(Resultaat.GetAt(20), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-CrossGalleryLowerLength", "null")	
 	
 	Do ProductMock.Verifieer()
 	Do ProductApiMock.Verifieer()
@@ -159,9 +167,11 @@
 	Set HalffabItemsBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
 	Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", $$$ElkeWaarde).DanReturn($$$False)
 	Do ProductMock.VerwachtMethodCall("GeefHalffabItemsBoom", "").DanReturn(HalffabItemsBoomMock)
+	Do ProductMock.VerwachtMethodCall("GeefGenerischProductID").DanReturn("1234")
 	
 	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..#DummyProductId).DanReturn(ProductMock)
+	Do ProductApiMock.VerwachtMethodCall("GeefIdentNummerVoorProductId", "1234").DanReturn(..#DummyGenericProductId)
 	
 	#dim DnaCodeServiceMock As vhTest.Mock.APPS.Halux.AAP.DnaCodeService = ..GeefDnaCodeServiceMock(..#SequentieNummer, ..#DummyProductId, ..#DummyDnaCode)
 	#dim IngegevenKenmerkenSpaceStepHelperMock As vhTest.Mock.DOM.PM.Maatwerk.Calc.Common.impl.IngegevenKenmerkenSpaceStepHelper = ..GeefIngegevenKenmerkenSpaceStepHelper($$$False, ..LbxKenmerken)
@@ -178,8 +188,8 @@
 	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeServiceMock, IngegevenKenmerkenSpaceStepHelperMock,, HoutCertificaatServiceMock, ProductTypeApiMock)
 	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringStub, ..UitvoeringInfo)
 	
-	Do $$$AssertEquals(Resultaat.Size, 9)
-	Do ..AssertOptie(Resultaat.GetAt(9), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Vhoss-info", "123.A.789")		
+	Do $$$AssertEquals(Resultaat.Size, 10)
+	Do ..AssertOptie(Resultaat.GetAt(10), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Vhoss-info", "123.A.789")		
 	
 	Do ProductMock.Verifieer()
 	Do ProductApiMock.Verifieer()
@@ -199,9 +209,11 @@
 	Set HalffabItemsBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
 	Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", $$$ElkeWaarde).DanReturn($$$False)
 	Do ProductMock.VerwachtMethodCall("GeefHalffabItemsBoom", "").DanReturn(HalffabItemsBoomMock)
+	Do ProductMock.VerwachtMethodCall("GeefGenerischProductID").DanReturn("1234")
 	
 	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..#DummyProductId).DanReturn(ProductMock)
+	Do ProductApiMock.VerwachtMethodCall("GeefIdentNummerVoorProductId", "1234").DanReturn(..#DummyGenericProductId)
 	
 	#dim DnaCode1 As DOM.Halux.AAP.DnaCode = ..GeefDnaCode(..#DummyDnaCode)
 	#dim DnaCode2 As DOM.Halux.AAP.DnaCode = ..GeefDnaCode(DnaCodeSst)
@@ -220,7 +232,7 @@
 	Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeServiceMock, IngegevenKenmerkenSpaceStepHelperMock,,, ProductTypeApiMock)
 	#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringStub, ..UitvoeringInfo)
 	
-	Do $$$AssertEquals(Resultaat.Size, 10)
+	Do $$$AssertEquals(Resultaat.Size, 11)
 	Do ..AssertOptie(Resultaat.GetAt(3), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-DNA-code-SST", DnaCodeSst)	
 		
 	Do ProductMock.Verifieer()
@@ -240,9 +252,11 @@
 	Set HalffabItemsBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
 	Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", $$$ElkeWaarde).DanReturn($$$False)
 	Do ProductMock.VerwachtMethodCall("GeefHalffabItemsBoom", "").DanReturn(HalffabItemsBoomMock)
+	Do ProductMock.VerwachtMethodCall("GeefGenerischProductID").DanReturn("1234")
 	
 	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..#DummyProductId).DanReturn(ProductMock)
+	Do ProductApiMock.VerwachtMethodCall("GeefIdentNummerVoorProductId", "1234").DanReturn(..#DummyGenericProductId)
 	
 	#dim DnaCode1 As DOM.Halux.AAP.DnaCode = ..GeefDnaCode(..#DummyDnaCode)
 	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)