Index: BL/Sys/LabelPrinter.cls.xml
===================================================================
diff -u -r63222 -r73871
--- BL/Sys/LabelPrinter.cls.xml	(.../LabelPrinter.cls.xml)	(revision 63222)
+++ BL/Sys/LabelPrinter.cls.xml	(.../LabelPrinter.cls.xml)	(revision 73871)
@@ -314,7 +314,6 @@
 <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(""))
@@ -323,7 +322,7 @@
 		#dim BartLayout As %String = $O(..Data(BartDevice,""))
 		While BartLayout '= "" 
 		{
-			Do ..Print2BartenderOnDeviceWithLayout(BartDevice,BartLayout,Batch)
+			Do ..Print2BartenderOnDeviceWithLayout(BartDevice,BartLayout)
 			Set BartLayout = $O(..Data(BartDevice,BartLayout))
 		}
 		Set BartDevice = $O(..Data(BartDevice))
@@ -332,12 +331,12 @@
 </Method>
 
 <Method name="Print2BartenderOnDeviceWithLayout">
-<FormalSpec>BartDevice:%String,BartLayout:%String,Batch:APPS.Halux.common.impl.BatchImpl=""</FormalSpec>
+<FormalSpec>BartDevice:%String,BartLayout:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim File As %String = ""
 	Try {
-		Set File = ..CreateFile(BartDevice,##class(BL.Sys.LabelPrinter.TemplateVervangerVoorDnacode).%New().VervangLayoutVoorDnacodeProductielijn(BartLayout, Batch))
+		Set File = ..CreateFile(BartDevice,BartLayout)
 		Do ..WriteFile(File,BartDevice,BartLayout)
 	} Catch E{
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -350,6 +349,45 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBartenderLabelData">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim DataToQuit as %String = ""
+  	#dim BartDevice As %String = $O(..Data(""))
+	While BartDevice '= "" 
+	{
+		#dim BartLayout As %String = $O(..Data(BartDevice,""))
+		While BartLayout '= "" 
+		{
+			Set DataToQuit = ..GeefBartenderLabelDataWithLayout(BartDevice,BartLayout)
+			Set BartLayout = $O(..Data(BartDevice,BartLayout))
+		}
+		Set BartDevice = $O(..Data(BartDevice))
+	}
+	Quit DataToQuit
+]]></Implementation>
+</Method>
+
+<Method name="GeefBartenderLabelDataWithLayout">
+<FormalSpec>BartDevice:%String,BartLayout:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Io as TECH.IO = ##class(TECH.IO).%New()
+	Do Io.Redirect()
+	#dim File As %String = Io.GeefLocatie()
+	; Set File = ..CreateFile(BartDevice,BartLayout)
+	Write "%BTW% /AF="""_BartLayout_".btw"" /PRN="""_BartDevice_""""_" /R=3 /P  /D=<Trigger File Name> /CLOSE",$C(13,10)
+	Write "%END%",$C(13,10)	
+
+	Do ..WriteFile(File,BartDevice,BartLayout)
+	Do Io.Reset()
+	#dim Result as %String = Io.GeefStream().Read()
+	Do Io.KuisOp()
+	Quit Result
+]]></Implementation>
+</Method>
+
 <Method name="WriteFile">
 <FormalSpec>FileName:%String,BartDevice:%String,BartLayout:%String</FormalSpec>
 <Private>1</Private>
@@ -413,7 +451,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)
@@ -436,12 +474,12 @@
 	if BartDevice = "ORGALUX2 KLEUR" s BartDevice=..FullDevicePad(BartDevice)
 	
 	#dim TrayString As %String = ""
-	If (($$$UCase(BartDevice)="\\PRINT01\P001") && (BartLayout="Klant Magazijn Reketiket A4 2x6")) {
+	If (($$$UCase(BartDevice)="\\PRINT01-PRD\P001") && (BartLayout="Klant Magazijn Reketiket A4 2x6")) {
 		Set BartDevice = "P001"
 		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)