Index: APPS/Halux/Docs/EtiketBuilder.cls.xml
===================================================================
diff -u -r30074 -r30735
--- APPS/Halux/Docs/EtiketBuilder.cls.xml	(.../EtiketBuilder.cls.xml)	(revision 30074)
+++ APPS/Halux/Docs/EtiketBuilder.cls.xml	(.../EtiketBuilder.cls.xml)	(revision 30735)
@@ -3,6 +3,23 @@
 <Class name="APPS.Halux.Docs.EtiketBuilder">
 <Super>%RegisteredObject</Super>
 
+<Property name="EtiketPrinterBepaler">
+<Type>APPS.Halux.Docs.EtiketPrinterBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..EtiketPrinterBepaler = ##class(APPS.Halux.Docs.EtiketPrinterBepaler).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="MaakMaatwerkProductViaOrder">
 <FormalSpec>OrderID:%String,OrderLijnVolgummer:%String,Aantal:%Integer,VoorkeurPrinter:%String=""</FormalSpec>
 <ReturnType>BL.Etiket.LadeKlantEtiket</ReturnType>
@@ -120,17 +137,9 @@
 </Method>
 
 <Method name="PrinterInstellen">
-<FormalSpec>Etiket:BL.Etiket.LadeKlantEtiket,VoorkeurPrinter:%String=""</FormalSpec>
+<FormalSpec>Etiket:BL.Etiket.LadeKlantEtiket,VoorkeurPrinter:%String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[
-	Set Etiket.Device = "OVHALUX2"
-	If (VoorkeurPrinter = "HALUX") {
-		If (Etiket.Layout["5x10") { Set Etiket.Device = "HALUX_productie" }
-		Else { Set Etiket.Device = "HALUX_productie_TAOR" }
-	}
-	ElseIf $Length(VoorkeurPrinter){ Set Etiket.Device = VoorkeurPrinter }
-	ElseIf (Etiket.Layout["5x10") { Set Etiket.Device ="OVHALUX1" }
-	ElseIf (Etiket.Layout["InVhoss") { Set Etiket.Device = "Halux_Productie_Keller" }
+<Implementation><![CDATA[	Set Etiket.Device = ..EtiketPrinterBepaler.Bepaal(Etiket.Layout, .VoorkeurPrinter)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/Halux/Docs/EtiketPrinterBepaler.cls.xml
===================================================================
diff -u
--- APPS/Halux/Docs/EtiketPrinterBepaler.cls.xml	(revision 0)
+++ APPS/Halux/Docs/EtiketPrinterBepaler.cls.xml	(revision 30735)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.Halux.Docs.EtiketPrinterBepaler">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="Bepaal">
+<FormalSpec>Layout:TECH.String,VoorkeurPrinter:TECH.String=""</FormalSpec>
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[
+	#dim Device As TECH.String = "OVHALUX2"
+	If (VoorkeurPrinter = "HALUX") {
+		If (Layout["5x10") {
+			Set Device = "HALUX_productie"
+		} Else {
+			Set Device = "HALUX_productie_TAOR"
+		}
+	}
+	ElseIf $Length(VoorkeurPrinter) {
+		Set Device = VoorkeurPrinter
+	}
+	ElseIf (Layout["5x10") {
+		Set Device ="OVHALUX1"
+	}
+	ElseIf (Layout["InVhoss") {
+		Set Device = "Halux_Productie_Keller"
+	}
+	Quit Device
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>