Index: BL/Sys/FOP/CommonTasks.cls.xml
===================================================================
diff -u -r66104 -r66511
--- BL/Sys/FOP/CommonTasks.cls.xml	(.../CommonTasks.cls.xml)	(revision 66104)
+++ BL/Sys/FOP/CommonTasks.cls.xml	(.../CommonTasks.cls.xml)	(revision 66511)
@@ -267,24 +267,24 @@
 	Set PapierSoort=$$$UCase(PapierSoort)
 	Set ReturnWhat=$$$UCase(ReturnWhat)
 	
-	If ((PrinterName="LEVBON_DI") || (PrinterName="LEVBON_EXPORT")) Do            ; Extra A4-lade blanco/wit papier o.a. voor "Rechtstreekse leveringen" 
-	. Set PSMediaType =$Case(PapierSoort, "GEEL":"(colored)", "LOGO":"(plain)", "BLANCO":"(plain)"  , :"(plain)" )   ; Not tested yet !!! 
-	. Set PSTraySelect=$Case(PapierSoort, "GEEL":"0"        , "LOGO":"1"      , "BLANCO":"2"        , :"1"       )
-	Else  If PrinterName?1(1"LEVBON_PS") Do   ; HP Laserjet M602 
+	If PrinterName?1(1"LEVBON_PS") Do   ; HP Laserjet M602   (Moet nog vervangen worden in 2022) 
 	. Set PSMediaType =$Case(PapierSoort, "GEEL":"(colored)", "LOGO":"(plain)",  "BLANCO":"(plain)" , :"(plain)" )   ; Not tested yet !!! 
 	. Set PSTraySelect=$Case(PapierSoort, "GEEL":"4"        , "LOGO":"1"      ,  "BLANCO":"0"       , :"0"       )   ; LET OP: Op deze printer stuurt TrayNr '2' dezelfde lade aan als TrayNr '4' maar het gedrag bij lege lade werkt NIET correct bij TrayNr='2' !!! 
-	Else  If PrinterName="PRT001" Do         ; HP-printer voor Halux
-	. Set PSMediaType =$Case(PapierSoort, "GEEL":"(colored)", :"(plain)" )   ; Not tested yet !!! 
-	. Set PSTraySelect=$Case(PapierSoort, "GEEL":"1"        , "BLANCO":"0"    ,"ADMIN_TRAY_2":"0", "ADMIN_TRAY_3":"1"         , "LOGO":"4"      , :"0"       )
-	Else  If PrinterName="HX_TAOR_BATCH_PS" Do         ; HP-printer voor Halux TAOR batches
-	. Set PSMediaType =$Case(PapierSoort, "GEEL":"(colored)", :"(plain)" )   ; Not tested yet !!! 
-	. Set PSTraySelect=$Case(PapierSoort, "GEEL":"1"        , "BLANCO":"0"    ,"MANUEEL":"3"     , :"0"  )
-	Else  If PrinterName="LEVBON_GLS2" Do    ; HP Enterprise M605
+	Else  If PrinterName?1(1"LEVBON".E) Do    ; HP Enterprise M608
 	. Set PSMediaType =$Case(PapierSoort, "GEEL":"(colored)", "LOGO":"(preprinted)", "BLANCO":"(plain)", :"(plain)" )   ; Not tested yet !!! 
 	. Set PSTraySelect=$Case(PapierSoort, "GEEL":"0"        , "LOGO":"1"           , "BLANCO":"2"      , :"2"       )
-	Else  If PrinterName?1(1"LEVBON".E) Do   ; bvb LEVBON_ORGALUX en LEVBON_TERUGNAME 
-	. Set PSMediaType =$Case(PapierSoort, "GEEL":"(colored)", "LOGO":"(preprinted)", "BLANCO":"(plain)",  :"(plain)" )   ; Not tested yet !!! 
-	. Set PSTraySelect=$Case(PapierSoort, "GEEL":"0"        , "LOGO":"1"           , "BLANCO":"2"      ,  :"2"       )
+	
+	Else  If PrinterName="PRT001" Do          ; HP-printer M608 voor Halux
+	. Set PSMediaType =$Case(PapierSoort, "GEEL":"(colored)", "LOGO":"(preprinted)", "BLANCO":"(plain)", :"(plain)" )   ; Not tested yet !!! 
+	. Set PSTraySelect=$Case(PapierSoort, "GEEL":"0"        , "LOGO":"1"           , "BLANCO":"2"    ,"ADMIN_TRAY_2":"2", "ADMIN_TRAY_3":"0"    , :"2"   )
+	Else  If PrinterName="HX_TAOR_BATCH_PS" Do   ; HP-printer M608 voor Halux TAOR batches
+	. Set PSMediaType =$Case(PapierSoort, "GEEL":"(colored)", "LOGO":"(preprinted)", "BLANCO":"(plain)" , :"(plain)" )   ; Not tested yet !!! 
+	. Set PSTraySelect=$Case(PapierSoort, "GEEL":"0"        , "LOGO":"1"           , "BLANCO":"2"        ,"MANUEEL":"3"     , :"2"  )
+	
+	Else  If PrinterName="TEST" Do    ; HP Enterprise M608
+	. Set PSMediaType =$Case(PapierSoort, "GEEL":"(colored)", "LOGO":"(preprinted)", "BLANCO":"(plain)", :"(plain)" )   ; Not tested yet !!! 
+	. Set PSTraySelect=$Case(PapierSoort, "GEEL":"0"        , "LOGO":"1"           , "BLANCO":"2"      , :"2"       )
+	
 	Else  If PrinterName?1(1"KYOCERAFS4000",1"KYOCERA".E) Do   ; o.a. facturen met OMR 
 	. Set PSMediaType =$Case(PapierSoort, "GEEL":"(color)"  , "LOGO":"(plain)", "MANUEEL":"(manual)", :"(plain)" )   ; Not tested yet !!! 
 	. Set PSTraySelect=$Case(PapierSoort, "GEEL":"1"        , "LOGO":"2"      , "MANUEEL":"3"       , :"2"       )