Index: BL/Sys/LabelPrinter.cls.xml
===================================================================
diff -u -r60008 -r63222
--- BL/Sys/LabelPrinter.cls.xml	(.../LabelPrinter.cls.xml)	(revision 60008)
+++ BL/Sys/LabelPrinter.cls.xml	(.../LabelPrinter.cls.xml)	(revision 63222)
@@ -314,6 +314,7 @@
 <Method name="Print2Bartender">
 <Description>
 afdrukken van de gedefineerde etiketten per device en layout</Description>
+<FormalSpec>Batch:APPS.Halux.common.impl.BatchImpl=""</FormalSpec>
 <Implementation><![CDATA[
    
 	#dim BartDevice As %String = $O(..Data(""))
@@ -322,7 +323,7 @@
 		#dim BartLayout As %String = $O(..Data(BartDevice,""))
 		While BartLayout '= "" 
 		{
-			Do ..Print2BartenderOnDeviceWithLayout(BartDevice,BartLayout)
+			Do ..Print2BartenderOnDeviceWithLayout(BartDevice,BartLayout,Batch)
 			Set BartLayout = $O(..Data(BartDevice,BartLayout))
 		}
 		Set BartDevice = $O(..Data(BartDevice))
@@ -331,12 +332,12 @@
 </Method>
 
 <Method name="Print2BartenderOnDeviceWithLayout">
-<FormalSpec>BartDevice:%String,BartLayout:%String</FormalSpec>
+<FormalSpec>BartDevice:%String,BartLayout:%String,Batch:APPS.Halux.common.impl.BatchImpl=""</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim File As %String = ""
 	Try {
-		Set File = ..CreateFile(BartDevice,BartLayout)
+		Set File = ..CreateFile(BartDevice,##class(BL.Sys.LabelPrinter.TemplateVervangerVoorDnacode).%New().VervangLayoutVoorDnacodeProductielijn(BartLayout, Batch))
 		Do ..WriteFile(File,BartDevice,BartLayout)
 	} Catch E{
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -412,7 +413,7 @@
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
 	#dim File As %CacheString = 0
-	
+	Do ##class(Tools.Wlip).%New(127).String(BartLayout)
 	do ..BepaalBestandNaam(BartDevice,BartLayout)
 	
 	#dim SubFolder As %String = ..GeefSubFolder(BartDevice)
@@ -440,7 +441,7 @@
 		Set TrayString = " /Tray=""Bypass Tray"""
 	}
 	
-	Use File
+	Use File	
 	Write "%BTW% /AF="""_..#BartenderLayoutPath_BartLayout_".btw"" /PRN="""_BartDevice_""""_TrayString_" /R=3 /P  /D=<Trigger File Name> /CLOSE",$C(13,10)
 	Write "%END%",$C(13,10)
 
Index: APPS/Halux/PPS/impl/AansturingActie/common/KlantEtiket/EtiketPrinter.cls.xml
===================================================================
diff -u -r61728 -r63222
--- APPS/Halux/PPS/impl/AansturingActie/common/KlantEtiket/EtiketPrinter.cls.xml	(.../EtiketPrinter.cls.xml)	(revision 61728)
+++ APPS/Halux/PPS/impl/AansturingActie/common/KlantEtiket/EtiketPrinter.cls.xml	(.../EtiketPrinter.cls.xml)	(revision 63222)
@@ -46,7 +46,7 @@
 
 	
 	Do ..VoegToeEtiketten()
-	Do ..blLabelPrinter.Print2Bartender()
+	Do ..blLabelPrinter.Print2Bartender(Batch)
 ]]></Implementation>
 </Method>
 
Index: BL/Sys/LabelPrinter/TemplateVervangerVoorDnacode.cls.xml
===================================================================
diff -u
--- BL/Sys/LabelPrinter/TemplateVervangerVoorDnacode.cls.xml	(revision 0)
+++ BL/Sys/LabelPrinter/TemplateVervangerVoorDnacode.cls.xml	(revision 63222)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="BL.Sys.LabelPrinter.TemplateVervangerVoorDnacode">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="VervangLayoutVoorDnacodeProductielijn">
+<FormalSpec>BartLayout:%String,Batch:APPS.Halux.common.impl.BatchImpl</FormalSpec>
+<Implementation><![CDATA[
+	#dim Resultaat As %String = BartLayout
+	//Set:($isObject(Batch) && (Batch.Lijn = ##class(APPS.Halux.common.enu.ProductieLijn).Een())) Resultaat = Resultaat_"_DNA"
+	//Set:($isObject(Batch) && (Batch.Lijn = ##class(APPS.Halux.common.enu.ProductieLijn).Twee())) Resultaat = Resultaat_"_DNA"
+	//Set:($isObject(Batch) && (Batch.Lijn = ##class(APPS.Halux.common.enu.ProductieLijn).Drie())) Resultaat = Resultaat_"_DNA"
+	//Set:($isObject(Batch) && (Batch.Lijn = ##class(APPS.Halux.common.enu.ProductieLijn).Vier())) Resultaat = Resultaat_"_DNA"
+	Quit Resultaat
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>