Index: APPS/Halux/PPS/TBXZaag/impl/EtiketHelper.cls.xml
===================================================================
diff -u -r2805 -r2808
--- APPS/Halux/PPS/TBXZaag/impl/EtiketHelper.cls.xml	(.../EtiketHelper.cls.xml)	(revision 2805)
+++ APPS/Halux/PPS/TBXZaag/impl/EtiketHelper.cls.xml	(.../EtiketHelper.cls.xml)	(revision 2808)
@@ -13,17 +13,22 @@
 <Default>Halux_Zaag_Backup</Default>
 </Parameter>
 
-<Parameter name="ManueelTemplate">
-<Default>HALUX PPS TBXZaag Manueel 5x10</Default>
+<Parameter name="ManueelTemplateAppl">
+<Default>TBX Productie 5x10 Hermes</Default>
 </Parameter>
 
-<Method name="IsHogePrioriteit">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>Device</FormalSpec>
-<Implementation><![CDATA[	Quit:(Device=..#DeviceLabelApplicator)||(Device=..#DeviceLabelBackup)
-]]></Implementation>
-</Method>
+<Parameter name="ManueelTemplateBackup">
+<Default>TBX Productie 5x10</Default>
+</Parameter>
 
+<Parameter name="ProductieTemplateAppl">
+<Default>TBX ZaagManueel 5x10 Hermes</Default>
+</Parameter>
+
+<Parameter name="ProductieTemplateBackup">
+<Default>TBX ZaagManueel 5x10</Default>
+</Parameter>
+
 <Method name="AfdrukkenOpdracht">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ZaagOpdracht:APPS.Halux.PPS.TBXZaag.Opdrachten,Output2Lijn:APPS.Halux.PPS.TBXZaag.enu.Output2Lijn,Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
@@ -32,6 +37,8 @@
 
 	Set blPrint=##class(BL.PPS.TBX.DocsV1).%New()
 	Do blPrint.Init(ZaagOpdracht.Batch.%Id(), "", LabelPrinter)
+	Do blPrint.ZetLabelLayout(..GeefLabelLayoutProductie(Device))
+	Do blPrint.ZetHogePrioriteit()
 	Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
 	Set Product=ProductAPI.GeefProduct(ZaagOpdracht.Product.%Id())
 	Set SequenceNr=ZaagOpdracht.Queue.Sequence
@@ -57,8 +64,8 @@
 <Method name="AfdrukkenManueel">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Subtitel:%String,BodemKleur:%String,BodemHoogte:%Integer,BodemLengte:%Float,BodemBewerking:DOM.PM.enu.TBXBodemBewerking,RugKleur:%String,RugHoogte:%Integer,RugLengte:%Float,Output2Lijn:APPS.Halux.PPS.TBXZaag.enu.Output2Lijn,Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
+<ReturnType>BL.Sys.LabelPrinter</ReturnType>
 <Implementation><![CDATA[
-	Set LabelPrinter=..GeefLabelPrinter(Device)
 	Set blLabelPrinter=##class(BL.Sys.LabelPrinter).%New()
 	Do blLabelPrinter.ZetHogePrioriteit()
 	
@@ -74,13 +81,53 @@
 	Set dtoLabel.RugLengte=RugLengte
 	Set dtoLabel.Output2Lijn=Output2Lijn
 	
-	Set dtoLabel.Layout=..#ManueelTemplate
-	Set dtoLabel.Device=LabelPrinter
+	Set dtoLabel.Layout=..GeefLabelLayoutManueel(Device)
+	Set dtoLabel.Device=..GeefLabelPrinter(Device)
+	
+	Do blLabelPrinter.Add(dtoLabel)
+	Do blLabelPrinter.Print2Bartender(dtoLabel)
+	Quit blLabelPrinter
+]]></Implementation>
+</Method>
 
-	Do blLabelPrinter.PrintDirect2Bartender(dtoLabel)
+<Method name="GeefLabelLayoutProductie">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If Device = ##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelApplicator() 
+	{
+		Set Layout = ..#ProductieTemplateAppl
+	}
+	Else
+	{
+		Set Layout = ..#ProductieTemplateBackup
+	}
+	
+	Quit $G(Layout)
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLabelLayoutManueel">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If Device = ##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelApplicator() 
+	{
+		Set Layout = ..#ManueelTemplateAppl
+	}
+	Else
+	{
+		Set Layout = ..#ManueelTemplateBackup
+	}
+	
+	Quit $G(Layout)
+]]></Implementation>
+</Method>
+
 <Method name="GeefLabelPrinter">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>