Index: APPS/Halux/common/enu/Werkpost.cls.xml
===================================================================
diff -u -r31214 -r31859
--- APPS/Halux/common/enu/Werkpost.cls.xml	(.../Werkpost.cls.xml)	(revision 31214)
+++ APPS/Halux/common/enu/Werkpost.cls.xml	(.../Werkpost.cls.xml)	(revision 31859)
@@ -15,6 +15,10 @@
 <Default>,Z1,Z3,P1,P2,LP1,LP2,KMHA,KMOL</Default>
 </Parameter>
 
+<Parameter name="DISPLAYLIST">
+<Default>,Zaag1,Zaag3,Pers1,Pers2,LegraPers1,LegraPers2,KartonHalux,KartonOrgalux</Default>
+</Parameter>
+
 <Method name="Zaag1">
 <ClassMethod>1</ClassMethod>
 <CodeMode>expression</CodeMode>
Index: APPS/Halux/PPS/TBXZaag/impl/EtiketHelper.cls.xml
===================================================================
diff -u -r29059 -r31859
--- APPS/Halux/PPS/TBXZaag/impl/EtiketHelper.cls.xml	(.../EtiketHelper.cls.xml)	(revision 29059)
+++ APPS/Halux/PPS/TBXZaag/impl/EtiketHelper.cls.xml	(.../EtiketHelper.cls.xml)	(revision 31859)
@@ -5,14 +5,6 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
 
-<Parameter name="DeviceLabelApplicator">
-<Default>Halux_Zaag_Appl</Default>
-</Parameter>
-
-<Parameter name="DeviceLabelBackup">
-<Default>Halux_Zaag_Backup</Default>
-</Parameter>
-
 <Parameter name="ProductieTemplateAppl">
 <Default>TBX Zaag Productie 5x10 Hermes</Default>
 </Parameter>
@@ -31,14 +23,14 @@
 
 <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>
+<FormalSpec>ZaagOpdracht:APPS.Halux.PPS.TBXZaag.Opdrachten,Output2Lijn:APPS.Halux.PPS.TBXZaag.enu.Output2Lijn,Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice,Werkpost:APPS.Halux.common.enu.Werkpost</FormalSpec>
 <ReturnType>BL.Sys.LabelPrinter</ReturnType>
 <Implementation><![CDATA[
-	#dim LabelPrinter As %String =..GeefLabelPrinter(Device)
+	#dim LabelPrinter As %String =..GeefLabelPrinter(Device,Werkpost)
 
 	Set blPrint=##class(BL.PPS.TBX.DocsV1).%New()
 	Do blPrint.Init(ZaagOpdracht.Batch.%Id(), "", LabelPrinter)
-	Do blPrint.ZetLabelLayout(..GeefLabelLayoutProductie(Device))
+	Do blPrint.ZetLabelLayout(..GeefLabelLayoutProductie(Device,Werkpost))
 	Do blPrint.ZetHogePrioriteit()
 	Do blPrint.ZetExtraLabelInfo("Z:"_ZaagOpdracht.%Id()_" P:"_ZaagOpdracht.Product.%Id())
 	#dim ProductAPI As DOM.PM.ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
@@ -66,7 +58,7 @@
 
 <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>
+<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,Werkpost:APPS.Halux.common.enu.Werkpost</FormalSpec>
 <ReturnType>BL.Sys.LabelPrinter</ReturnType>
 <Implementation><![CDATA[
 	Set blLabelPrinter=##class(BL.Sys.LabelPrinter).%New()
@@ -98,16 +90,13 @@
 <FormalSpec>Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If Device = ##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelApplicator() 
-	{
+	#dim Layout As %String = ""
+	If Device = ##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelApplicator() {
 		Set Layout = ..#ProductieTemplateAppl
-	}
-	Else
-	{
+	} Else {
 		Set Layout = ..#ProductieTemplateBackup
 	}
-	
-	Quit $G(Layout)
+	Quit Layout
 ]]></Implementation>
 </Method>
 
@@ -116,37 +105,24 @@
 <FormalSpec>Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If Device = ##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelApplicator() 
-	{
+	#dim Layout As %String = ""
+	If Device = ##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelApplicator() {
 		Set Layout = ..#ManueelTemplateAppl
-	}
-	Else
-	{
+	} Else {
 		Set Layout = ..#ManueelTemplateBackup
 	}
-	
-	Quit $G(Layout)
+	quit Layout
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLabelPrinter">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice</FormalSpec>
+<FormalSpec>Device:APPS.Halux.PPS.TBXZaag.enu.PrintDevice,Werkpost:APPS.Halux.common.enu.Werkpost</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim Printer As %String
-	If Device = ##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelApplicator() 
-	{
-		Set Printer = ..#DeviceLabelApplicator
-	}
-	ElseIf Device = ##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LabelBackup() 
-	{
-		Set Printer = ..#DeviceLabelBackup
-	}Else{
-		Set Printer = "HALUX_PRODUCTIE"	
-	}
+	quit:Device="" "HALUX_PRODUCTIE"
 	
-	Quit Printer
+	quit ^RES("LABELPRINTER","PI","ZAAG_ETIKET","D",##class(APPS.Halux.common.enu.Werkpost).LogicalToDisplay(Werkpost)_"_"_##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LogicalToDisplay(Device))
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/Halux/PPS/TBXZaag/impl/Werkpost.cls.xml
===================================================================
diff -u -r29059 -r31859
--- APPS/Halux/PPS/TBXZaag/impl/Werkpost.cls.xml	(.../Werkpost.cls.xml)	(revision 29059)
+++ APPS/Halux/PPS/TBXZaag/impl/Werkpost.cls.xml	(.../Werkpost.cls.xml)	(revision 31859)
@@ -22,7 +22,7 @@
 </Parameter>
 
 <Method name="%OnNew">
-<FormalSpec>Werkpost:%String</FormalSpec>
+<FormalSpec>Werkpost:APPS.Halux.common.enu.Werkpost</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
@@ -112,7 +112,7 @@
 		set Exception = ##class(TECH.Exceptions.ObjectExpectedException).%New("Zaagopdracht wrong ID:"_ZaagID)
 		do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
-	Quit ##class(APPS.Halux.PPS.TBXZaag.impl.EtiketHelper).AfdrukkenOpdracht(ZaagOpdracht,Output2Lijn,Device)
+	Quit ##class(APPS.Halux.PPS.TBXZaag.impl.EtiketHelper).AfdrukkenOpdracht(ZaagOpdracht,Output2Lijn,Device,..Werkpost)
 ]]></Implementation>
 </Method>
 
@@ -121,7 +121,7 @@
 <ReturnType>BL.Sys.LabelPrinter</ReturnType>
 <Implementation><![CDATA[
 	Set Log=..Logger.Debug("PrintLabelManueel", "Details:"_Titel_", Bodem:"_BodemKleur_";"_BodemHoogte_";"_BodemLengte_";"_BodemBewerking_", Rug:"_RugKleur_";"_RugHoogte_";"_RugLengte_", Output2Lijn:"_Output2Lijn_", Device:"_Device)
-	Quit ##class(APPS.Halux.PPS.TBXZaag.impl.EtiketHelper).AfdrukkenManueel(Titel,BodemKleur,BodemHoogte,BodemLengte,BodemBewerking,RugKleur,RugHoogte,RugLengte,Output2Lijn,Device)
+	Quit ##class(APPS.Halux.PPS.TBXZaag.impl.EtiketHelper).AfdrukkenManueel(Titel,BodemKleur,BodemHoogte,BodemLengte,BodemBewerking,RugKleur,RugHoogte,RugLengte,Output2Lijn,Device,..Werkpost)
 ]]></Implementation>
 </Method>
 
@@ -189,7 +189,7 @@
 
 <UDLText name="T">
 <Content><![CDATA[
-//Do ..iWerkpost.BeschadigingViaOpdracht(rsOpdrachten.GetData(1),##class(APPS.Halux.PPS.TBXZaag.enu.BodemRug).BodemRug(),"B","unittest","DI") ; met rework
+// Do ..iWerkpost.BeschadigingViaOpdracht(rsOpdrachten.GetData(1),##class(APPS.Halux.PPS.TBXZaag.enu.BodemRug).BodemRug(),"B","unittest","DI") ; met rework
 
 ]]></Content>
 </UDLText>
Index: APPS/Halux/PPS/TBXZaag/impl/WerkpostVoorLBX.cls.xml
===================================================================
diff -u -r29059 -r31859
--- APPS/Halux/PPS/TBXZaag/impl/WerkpostVoorLBX.cls.xml	(.../WerkpostVoorLBX.cls.xml)	(revision 29059)
+++ APPS/Halux/PPS/TBXZaag/impl/WerkpostVoorLBX.cls.xml	(.../WerkpostVoorLBX.cls.xml)	(revision 31859)
@@ -153,7 +153,7 @@
 <ReturnType>BL.Sys.LabelPrinter</ReturnType>
 <Implementation><![CDATA[
 	Do ..Logger.Debug("PrintLabelManueel", "Details:"_Titel_", Bodem:"_BodemKleur_";"_BodemHoogte_";"_BodemLengte_";"_BodemBewerking_", Rug:"_RugKleur_";"_RugHoogte_";"_RugLengte_", Output2Lijn:"_Output2Lijn_", Device:"_Device)
-	Quit ##class(APPS.Halux.PPS.TBXZaag.impl.EtiketHelper).AfdrukkenManueel(Titel,BodemKleur,BodemHoogte,BodemLengte,BodemBewerking,RugKleur,RugHoogte,RugLengte,Output2Lijn,Device)
+	Quit ##class(APPS.Halux.PPS.TBXZaag.impl.EtiketHelper).AfdrukkenManueel(Titel,BodemKleur,BodemHoogte,BodemLengte,BodemBewerking,RugKleur,RugHoogte,RugLengte,Output2Lijn,Device,..Werkpost)
 ]]></Implementation>
 </Method>
 
Index: vhDeploy/Deploy20151207xInstellenPrinter.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20151207xInstellenPrinter.cls.xml	(revision 0)
+++ vhDeploy/Deploy20151207xInstellenPrinter.cls.xml	(revision 31859)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20151207xInstellenPrinter">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Instellen Printer</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	set ^RES("LABELPRINTER","PI","ZAAG_ETIKET","D",##class(APPS.Halux.common.enu.Werkpost).LogicalToDisplay("Z1")_"_"_##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LogicalToDisplay("LA"))="Halux_Zaag_Appl"
+	set ^RES("LABELPRINTER","PI","ZAAG_ETIKET","D",##class(APPS.Halux.common.enu.Werkpost).LogicalToDisplay("Z1")_"_"_##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LogicalToDisplay("LB"))="Halux_Zaag_Backup"
+	set ^RES("LABELPRINTER","PI","ZAAG_ETIKET","D",##class(APPS.Halux.common.enu.Werkpost).LogicalToDisplay("Z3")_"_"_##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LogicalToDisplay("LA"))="Halux_ZaagL3_Appl"
+	set ^RES("LABELPRINTER","PI","ZAAG_ETIKET","D",##class(APPS.Halux.common.enu.Werkpost).LogicalToDisplay("Z3")_"_"_##class(APPS.Halux.PPS.TBXZaag.enu.PrintDevice).LogicalToDisplay("LB"))="Halux_Zaag_Backup"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/Halux/PPS/TBXZaag/enu/PrintDevice.cls.xml
===================================================================
diff -u -r29059 -r31859
--- APPS/Halux/PPS/TBXZaag/enu/PrintDevice.cls.xml	(.../PrintDevice.cls.xml)	(revision 29059)
+++ APPS/Halux/PPS/TBXZaag/enu/PrintDevice.cls.xml	(.../PrintDevice.cls.xml)	(revision 31859)
@@ -13,21 +13,21 @@
 <Default>,LA,LB</Default>
 </Parameter>
 
+<Parameter name="DISPLAYLIST">
+<Default>,Applicator,Backup</Default>
+</Parameter>
+
 <Method name="LabelApplicator">
 <ClassMethod>1</ClassMethod>
 <CodeMode>expression</CodeMode>
-<Implementation><![CDATA[
-"LA"
-
+<Implementation><![CDATA["LA"
 ]]></Implementation>
 </Method>
 
 <Method name="LabelBackup">
 <ClassMethod>1</ClassMethod>
 <CodeMode>expression</CodeMode>
-<Implementation><![CDATA[
-"LB"
-
+<Implementation><![CDATA["LB"
 ]]></Implementation>
 </Method>
 </Class>