Index: WSimpl/Halux/AAP/AfdrukService/EtiketAfdrukkenHelper.cls.xml
===================================================================
diff -u -r66421 -r66422
--- WSimpl/Halux/AAP/AfdrukService/EtiketAfdrukkenHelper.cls.xml	(.../EtiketAfdrukkenHelper.cls.xml)	(revision 66421)
+++ WSimpl/Halux/AAP/AfdrukService/EtiketAfdrukkenHelper.cls.xml	(.../EtiketAfdrukkenHelper.cls.xml)	(revision 66422)
@@ -160,11 +160,15 @@
 <FormalSpec>DnaCode:DOM.Halux.AAP.DnaCode</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (##class(TECH.StringUtils).StartsWith(DnaCode.DnaCode, "A")) {
+	#dim IsMerivo As %Boolean = ##class(TECH.StringUtils).StartsWith(DnaCode.DnaCode, "A")
+	#dim IsTaor As %Boolean = ##class(TECH.StringUtils).StartsWith(DnaCode.DnaCode, "H")
+	#dim DummyBypassGebruiken As %Boolean = ##class(TECH.Config.ConfigMgr).Instance().GetString("DummyLaderegistraties")
+	
+	If IsMerivo {
 		Quit ##class(APPS.Halux.common.enu.Werkpost).Pers2()
 	}
 	
-	If (##class(TECH.Config.ConfigMgr).Instance().GetString("DummyLaderegistraties") && ##class(TECH.StringUtils).StartsWith(DnaCode.DnaCode, "H")) {
+	If (DummyBypassGebruiken && IsTaor) {
 		Quit "TAO"
 	}