Index: APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml
===================================================================
diff -u -r74440 -r74548
--- APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml	(.../DnaCodeServiceHelper.cls.xml)	(revision 74440)
+++ APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml	(.../DnaCodeServiceHelper.cls.xml)	(revision 74548)
@@ -92,8 +92,7 @@
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim ProductTypeAPI As DOM.PM.ProductTypeAPI = ##class(DOM.DomeinContext).Instance().GeefProductTypeAPI()
-	#dim CategorTLM As %Boolean = ((ProductTypeAPI.IsLegraboxProduct(DnaCode.ProductNummer) || ProductTypeAPI.IsMerivoboxProduct(DnaCode.ProductNummer) || ProductTypeAPI.IsTandemboxProduct(DnaCode.ProductNummer)))
+	#dim CategorTLM As %Boolean = ((..ProductTypeAPI.IsLegraboxProduct(DnaCode.ProductNummer) || ..ProductTypeAPI.IsMerivoboxProduct(DnaCode.ProductNummer) || ..ProductTypeAPI.IsTandemboxProduct(DnaCode.ProductNummer)))
 		
 	Quit (..MESService.IsActiefVoorMes(DnaCode.Lijn) && CategorTLM && (DnaCode.AfdrukTijdstip = DnaCode.AanmaakTijdstip))
 ]]></Implementation>
@@ -223,8 +222,7 @@
 		Set DnaCode.IsWegwerpPallet = Batch.GeefIsWegwerpPallet(Toelevering.GeefID())
 		Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch()
 		Set DnaCode.Lijn = Batch.GeefLijn()
-		#dim ProductTypeAPI As DOM.PM.ProductTypeAPI = ##class(DOM.DomeinContext).Instance().GeefProductTypeAPI()
-		#dim CategorTLM As %Boolean = ((ProductTypeAPI.IsLegraboxProduct(DnaCode.ProductNummer) || ProductTypeAPI.IsMerivoboxProduct(DnaCode.ProductNummer) || ProductTypeAPI.IsTandemboxProduct(DnaCode.ProductNummer)))
+		#dim CategorTLM As %Boolean = ((..ProductTypeAPI.IsLegraboxProduct(DnaCode.ProductNummer) || ..ProductTypeAPI.IsMerivoboxProduct(DnaCode.ProductNummer) || ..ProductTypeAPI.IsTandemboxProduct(DnaCode.ProductNummer)))
 		If (..MESService.IsActiefVoorMes(DnaCode.Lijn) && CategorTLM) {
 			Set DnaCode.AfdrukTijdstip = DnaCode.AanmaakTijdstip
 		}
Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper/MagDnaCodeBijgewerktWorden/Test.cls.xml
===================================================================
diff -u -r74262 -r74548
--- vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper/MagDnaCodeBijgewerktWorden/Test.cls.xml	(.../Test.cls.xml)	(revision 74262)
+++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper/MagDnaCodeBijgewerktWorden/Test.cls.xml	(.../Test.cls.xml)	(revision 74548)
@@ -117,7 +117,10 @@
 	
 	Set ..DnaCode1.AfdrukTijdstip = 444444
 	
-	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New()
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
+	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New(,,ProductTypeApiMock)
 	#dim Resultaat As %Boolean = DnaCodeServiceHelper.MagDnaCodeBijgewerktWorden(..DnaCode1, ProductID, Herafdruk, SequentieNummer)
 	
 	Do $$$AssertFalse(Resultaat)
@@ -149,10 +152,13 @@
 	Set ..DnaCode1.AanmaakTijdstip = 444444
 	Set ..DnaCode1.AfdrukTijdstip = 444444
 	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
 	#dim MesServiceMock = ##class(vhTest.Mock.APPS.Halux.PPS.MES.MESService).%New()
 	Do MesServiceMock.IndienMethodCall("IsActiefVoorMes", ..DnaCode1.Lijn).DanReturn($$$True)
 	
-	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New(,,,,,, MesServiceMock)
+	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New(,,ProductTypeApiMock,,,, MesServiceMock)
 	#dim Resultaat As %Boolean = DnaCodeServiceHelper.MagDnaCodeBijgewerktWorden(..DnaCode1, ProductID, Herafdruk, SequentieNummer)
 	
 	Do $$$AssertTrue(Resultaat)
@@ -169,10 +175,13 @@
 	Set ..DnaCode1.AanmaakTijdstip = 444444
 	Set ..DnaCode1.AfdrukTijdstip = 444445
 	
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.impl.ProductTypeAPIimpl).%New()
+	Do ProductTypeApiMock.IndienMethodCall("IsLegraboxProduct", $$$ElkeWaarde).DanReturn($$$True)
+	
 	#dim MesServiceMock = ##class(vhTest.Mock.APPS.Halux.PPS.MES.MESService).%New()
 	Do MesServiceMock.IndienMethodCall("IsActiefVoorMes", ..DnaCode1.Lijn).DanReturn($$$True)
 	
-	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New(,,,,,, MesServiceMock)
+	Set DnaCodeServiceHelper = ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New(,,ProductTypeApiMock,,,, MesServiceMock)
 	#dim Resultaat As %Boolean = DnaCodeServiceHelper.MagDnaCodeBijgewerktWorden(..DnaCode1, ProductID, Herafdruk, SequentieNummer)
 	
 	Do $$$AssertFalse(Resultaat)
Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml
===================================================================
diff -u -r66820 -r74548
--- vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 66820)
+++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 74548)
@@ -40,6 +40,7 @@
 	Do ..ProductTypeApiStub.IndienMethodCall("GeefProductTypePrefix", $$$ElkeWaarde).DanReturn("L")
 	Do ..ProductTypeApiStub.IndienMethodCall("IsLegraboxProduct", 1000).DanReturn($$$True)
 	Do ..ProductTypeApiStub.IndienMethodCall("IsTandemboxProduct", 1000).DanReturn($$$True)
+	Do ..ProductTypeApiStub.IndienMethodCall("IsMerivoboxProduct", 1000).DanReturn($$$True)
 	Do ..ProductTypeApiStub.IndienMethodCall("IsTAORboxProduct", 1000).DanReturn($$$True)
 	Do ..ProductTypeApiStub.IndienMethodCall("IsAntislipmatProduct", $$$ElkeWaarde).DanReturn($$$False)
 	Set ..DnaCodeGeneratorStub = ##class(vhTest.Mock.APPS.Halux.AAP.DnaCodeGenerator).%New()