Index: APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml
===================================================================
diff -u -r66868 -r67956
--- APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml	(.../DnaCodeServiceHelper.cls.xml)	(revision 66868)
+++ APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml	(.../DnaCodeServiceHelper.cls.xml)	(revision 67956)
@@ -66,13 +66,17 @@
 
 <Method name="MagDnaCodeBijgewerktWorden">
 <FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode,ProductID:%String,Herafdruk:%Boolean,SequentieNummer:%String=""</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim Resultaat As %Boolean
 	If (($$$HasLength(SequentieNummer) && $$$HasLength(DnaCode.SequentieNummer)) && $$$Not(##class(TECH.StringUtils).StartsWith(DnaCode.DnaCode, "H"))) {
 		Set Resultaat = ((DnaCode.ProductNummer = ProductID) && (DnaCode.SequentieNummer = SequentieNummer)) || ..IsSpaceStepGeneriekProduct(DnaCode, ProductID)
 	} Else {
 		Set Resultaat = ((DnaCode.ProductNummer = ProductID) || ..IsSpaceStepGeneriekProduct(DnaCode, ProductID))
 	}
+	If Resultaat {
+		Set Resultaat = ((DnaCode.AfdrukTijdstip = "") || Herafdruk)
+	}
 	Quit Resultaat
 ]]></Implementation>
 </Method>
@@ -81,6 +85,13 @@
 <FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode,ProductID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	#dim ZelfdeDossierCode As %Boolean
+	try {
+		Set ZelfdeDossierCode = (DnaCode.LadeCode = ..ProductAPI.GeefProduct(ProductID).GeefDottedDossierCode())
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Set ZelfdeDossierCode = $$$False
+	}
 	Quit:(DnaCode.ProductNummer = ##class(DOM.PM.Maatwerk.enu.GenerischProductID).LBXSSTV1()) $$$True
 	Quit:(DnaCode.ProductNummer = ##class(DOM.PM.Maatwerk.enu.GenerischProductID).TBXSSTV1()) $$$True
 	Quit:(DnaCode.ProductNummer = ##class(DOM.PM.Maatwerk.enu.GenerischProductID).TAORSSTV1()) $$$True