Index: APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml
===================================================================
diff -u -r66775 -r66777
--- APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml	(.../DnaCodeServiceHelper.cls.xml)	(revision 66775)
+++ APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml	(.../DnaCodeServiceHelper.cls.xml)	(revision 66777)
@@ -3,16 +3,26 @@
 <Class name="APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper">
 <Super>TECH.Mockable</Super>
 
+<Property name="DnaCodeGenerator">
+<Type>APPS.Halux.AAP.DnaCodeGenerator</Type>
+</Property>
+
+<Property name="ProductTypeAPI">
+<Type>DOM.PM.impl.ProductTypeAPIimpl</Type>
+</Property>
+
 <Property name="ProductApi">
 <Type>DOM.PM.ProductAPI</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ProductApi:DOM.PM.ProductAPI=""</FormalSpec>
+<FormalSpec>DnaCodeGenerator:APPS.Halux.AAP.DnaCodeGenerator="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",ProductAPI:DOM.PM.ProductAPI=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New())
+	Set ..DnaCodeGenerator = $$$Inject(DnaCodeGenerator, ##class(APPS.Halux.AAP.DnaCodeGenerator).%New())
+	Set ..ProductTypeAPI = $$$Inject(ProductTypeAPI, ##class(DOM.PM.impl.ProductTypeAPIimpl).%New())
+	Set ..ProductApi = $$$Inject(ProductAPI, ##class(DOM.PM.impl.ProductAPI).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -22,8 +32,8 @@
 <FormalSpec>ToeleveringLijn:DOM.AKP.ProductToeleveringLijn,Batch:APPS.Halux.common.impl.BatchImpl=""</FormalSpec>
 <ReturnType>DOM.Halux.AAP.DnaCode</ReturnType>
 <Implementation><![CDATA[
-	;#dim ProductID As %String = ToeleveringLijn.GeefProductID()
-	;#dim Toelevering As DOM.AKP.Toelevering= ToeleveringLijn.GeefToelevering()
+	#dim ProductID As %String = ToeleveringLijn.GeefProductID()
+	#dim Toelevering As DOM.AKP.Toelevering= ToeleveringLijn.GeefToelevering()
 	#dim DnaCode As DOM.Halux.AAP.DnaCode = ..MaakGeneriekeDnaCodeVoorToeleveringLijn(ToeleveringLijn, Batch)
 
 	Quit DnaCode
@@ -64,7 +74,7 @@
 	
 	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode.ProductNummer = ProductID
-	;Set DnaCode.DnaCode = ..DnaCodeGenerator.GenereerDnaCode(..ProductTypeAPI.GeefProductTypePrefix(ProductID))
+	Set DnaCode.DnaCode = ..DnaCodeGenerator.GenereerDnaCode(..ProductTypeAPI.GeefProductTypePrefix(ProductID))
 	Set DnaCode.Toelevering = Toelevering.GeefID()
 	Set DnaCode.KlantNummer = Toelevering.GeefKlantID()
 	Set DnaCode.ParentDnaCode = ""