diff --git a/gastsystem/index.php b/gastsystem/index.php
index 33eb9dd..af55be7 100644
--- a/gastsystem/index.php
+++ b/gastsystem/index.php
@@ -9,8 +9,8 @@
 		<meta http-equiv="content-type" content="text/html; charset=utf-8">
 		<meta name="author" content="Stefan Pichel">
 		
-		<link rel="stylesheet" href="css/gueststyle.css?v=1.5.8" />
-		<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.8" />
+		<link rel="stylesheet" href="css/gueststyle.css?v=1.5.9" />
+		<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.9" />
 		<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
 		<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
 		<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
@@ -105,7 +105,7 @@
     <div data-role="footer" data-theme="b" id="thefooter1"> 
 		<div class="ui-grid-a">
 			<div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div>
-			<div class="ui-block-b grid_right" id="versioninfo">1.5.8&nbsp;&nbsp;</div>
+			<div class="ui-block-b grid_right" id="versioninfo">1.5.9&nbsp;&nbsp;</div>
 		</div><!-- /grid-a -->
 	</div> 
 </div>
diff --git a/gastsystem/install.php b/gastsystem/install.php
index 08694ef..fbe83ba 100644
--- a/gastsystem/install.php
+++ b/gastsystem/install.php
@@ -90,10 +90,10 @@ if (isset($_POST['code'])) {
 } else {
 	echo "<html>";
 	echo "<head><title>Installation Gastsystem</title>";
-	echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.8">';
+	echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.9">';
 	echo "</head>";
 	echo "<body><div class=surround>";
-	echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.8</span><br><br>";
+	echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.9</span><br><br>";
 	echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />";
 	echo "<br><input type=submit value='Installation starten' class=installbtn />";
 	echo "</form></div></html>";
diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe
index 84ac4d2..55e75a3 100644
Binary files a/printserver/OrderSprinterPrintserver.exe and b/printserver/OrderSprinterPrintserver.exe differ
diff --git a/spider/install/installer.php b/spider/install/installer.php
index 3a65be8..6c0ac26 100644
--- a/spider/install/installer.php
+++ b/spider/install/installer.php
@@ -85,7 +85,7 @@ class Installer {
 		}
 		Database::dropTables($pdo);
 		Database::createEmptyTables($pdo, $prefix);
-		Database::setVersion($pdo,$prefix,"1.5.8");
+		Database::setVersion($pdo,$prefix,"1.5.9");
 		Database::setAccessPassword($pdo,$prefix,$adminpass);
 		Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
 		return array("status" => "OK","msg" => "Installation successful");
diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe
index 84ac4d2..55e75a3 100644
Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ
diff --git a/webapp/bar.html b/webapp/bar.html
index 4fdad9d..c1442d0 100644
--- a/webapp/bar.html
+++ b/webapp/bar.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
  
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@@ -13,8 +13,8 @@
    <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
    <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
    <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
-   <script src="utilities.js?v=1.5.8"></script>
-   <script src="kitchenbar.js?v=1.5.8"></script>
+   <script src="utilities.js?v=1.5.9"></script>
+   <script src="kitchenbar.js?v=1.5.9"></script>
 <style>
 
 #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
diff --git a/webapp/bill.html b/webapp/bill.html
index d16bdc8..b38b013 100644
--- a/webapp/bill.html
+++ b/webapp/bill.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
  
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/feedback.html b/webapp/feedback.html
index 0bc0266..4ecbc7e 100644
--- a/webapp/feedback.html
+++ b/webapp/feedback.html
@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
  
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/index.html b/webapp/index.html
index 9de677b..18ca774 100644
--- a/webapp/index.html
+++ b/webapp/index.html
@@ -9,8 +9,8 @@
 		<meta http-equiv="content-type" content="text/html; charset=utf-8">
 		<meta name="author" content="Stefan Pichel">
 
-		<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
-		<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.8">
+		<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
+		<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.9">
 
 		<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
 		<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@@ -229,7 +229,7 @@ function handleResultOfInstallCheck(is_installed) {
 	if (is_installed == "Yes") {
 		useInstallation();
 	} else {
-		setTimeout(function(){document.location.href = "install.html?v=1.5.8"},500);
+		setTimeout(function(){document.location.href = "install.html?v=1.5.9"},500);
 	}
 }
 
diff --git a/webapp/install.html b/webapp/install.html
index afcac24..a413959 100644
--- a/webapp/install.html
+++ b/webapp/install.html
@@ -794,7 +794,7 @@ El servicio web OrderSprinter no requiere una conexión a Internet. Sin embargo,
     <tr id=updateline>
     	<td>&nbsp;</td>
     	<td align=center>
-      	<button id="updatebtn">Update -> 1.5.8</button>
+      	<button id="updatebtn">Update -> 1.5.9</button>
 	<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
       	</td>
       	<td>&nbsp;</td>
diff --git a/webapp/install/installer.php b/webapp/install/installer.php
index 37d0bd3..7694beb 100644
--- a/webapp/install/installer.php
+++ b/webapp/install/installer.php
@@ -414,7 +414,7 @@ $zones[] = $timezone_identifiers[$i];
 echo json_encode($zones);
 } else if ($command == 'update') {
 set_time_limit(60*30);
-$installerVersion = "1.5.8";
+$installerVersion = "1.5.9";
 
 $admin = new InstallAdmin();
 $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
diff --git a/webapp/kitchen.html b/webapp/kitchen.html
index 74633ef..e054535 100644
--- a/webapp/kitchen.html
+++ b/webapp/kitchen.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
  
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@@ -13,8 +13,8 @@
    <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
    <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
    <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
-   <script src="utilities.js?v=1.5.8"></script>
-   <script src="kitchenbar.js?v=1.5.8"></script>
+   <script src="utilities.js?v=1.5.9"></script>
+   <script src="kitchenbar.js?v=1.5.9"></script>
 <style>
 
 #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
diff --git a/webapp/manager.html b/webapp/manager.html
index 79e6dc5..553af61 100644
--- a/webapp/manager.html
+++ b/webapp/manager.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
  
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@@ -13,10 +13,10 @@
    <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
   <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
    <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
-   <script src="utilities.js?v=1.5.8"></script>
-   <script src="elements/tablemap.js?v=1.5.8"></script>
-   <script src="elements/roommap.js?v=1.5.8"></script>
-   <script src="elements/groundplan.js?v=1.5.8"></script>
+   <script src="utilities.js?v=1.5.9"></script>
+   <script src="elements/tablemap.js?v=1.5.9"></script>
+   <script src="elements/roommap.js?v=1.5.9"></script>
+   <script src="elements/groundplan.js?v=1.5.9"></script>
    
    <link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
    <script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
@@ -453,6 +453,8 @@ var MAN_FOOD_CAT = ["Speisen","Food","Comidas"];
 var MAN_DRINKS_CAT = ["Getränke","Drinks","Bebidas"];
 var MAN_CHANGE_ROLE_AREA = ["Rolle und Tischbereich ändern","Change role and area","Cambiar region y role"];
 var MAN_PRINTPICKUPS = ["Drucke Abholbons","Pickup receipts","Imprimir tickets de recogidos"];
+var MAN_PRINTPICKUPS_ALWAYS = ["Immer","Always","Siempre"];
+var MAN_PRINTPICKUPS_TOGO = ["Nur für Außer-Haus-Bestellungen","Only für to-go orders","Solo para To go"];
 var MAN_PRINTPICKUP_HINT = ["Abholbons funktionieren nur in Kombination mit Arbeitsbons!","Pickup receipts only work with work receipts!","Tiquets de recogidos solo on tickets de trabajo!"];
 
 var lang = 0;
@@ -770,7 +772,6 @@ function setLanguage(l) {
 	$("#pollworksdtxt").html(MAN_POLLWORKSD[l]);
 	$("#pollclosingstxt").html(MAN_POLLCLOSINGS[l]);
 	$("#pollpickupstxt").html(MAN_POLLPICKUPS[l]);
-	$("#printpickupthint").html(MAN_PRINTPICKUP_HINT[l]);
 	$("#showpickupsnotxt").html(MAN_SHOWPICKUPSNO[l]);
 }
 
@@ -904,7 +905,7 @@ function insertGeneralConfigItems(configResult) {
 		$("#partOfBeepOrdered").html(createYesNo("beepordered",MAN_BEEP_ORDERED, values.beepordered));
 		$("#partOfRestaurantmode").html(createYesNo("restaurantmode",MAN_RESTAURANT_MODE, values.restaurantmode));
 		$("#partOfDblog").html(createYesNo("dblog",MAN_DBLOG, values.dblog));
-		$("#partOfPrintpickups").html(createYesNo("printpickups",MAN_PRINTPICKUPS, values.printpickups));
+		$("#partOfPrintpickups").html(createPickupConfigPart(values.printpickups));
 		$("#partOfForceprint").html(createYesNo("forceprint",MAN_FORCE_PRINT, values.forceprint));
 		$("#partOfPrintextras").html(createYesNo("printextras",MAN_PRINT_EXTRAS, values.printextras));
 		$("#partOfPriceinlist").html(createYesNo("priceinlist",MAN_PRICE_IN_LIST, values.priceinlist));
@@ -1269,6 +1270,30 @@ function createWorkflowConfigPart(workflow) {
     return html;
 }
 
+function createPickupConfigPart(workflow) {
+ 	var html = '<div class="ui-field-contain">';
+    html += '<label for="printpickups">' + MAN_PRINTPICKUPS[lang] + ':</label>';
+    html += '<select name="printpickups" id="printpickups" data-theme="e">';
+    	
+    if (workflow == 0) {
+    	html += '<option value="0" selected>' + MAN_NO[lang] + '</option>';
+    	html += '<option value="1">' + MAN_PRINTPICKUPS_ALWAYS[lang] + '</option>';
+	html += '<option value="2">' + MAN_PRINTPICKUPS_TOGO[lang] + '</option>';
+    } else if (workflow == 1) {
+    	html += '<option value="0">' + MAN_NO[lang] + '</option>';
+    	html += '<option value="1" selected>' + MAN_PRINTPICKUPS_ALWAYS[lang] + '</option>';
+	html += '<option value="2">' + MAN_PRINTPICKUPS_TOGO[lang] + '</option>';
+    } else if (workflow == 2){
+    	html += '<option value="0">' + MAN_NO[lang] + '</option>';
+    	html += '<option value="1">' + MAN_PRINTPICKUPS_ALWAYS[lang] + '</option>';
+	html += '<option value="2" selected>' + MAN_PRINTPICKUPS_TOGO[lang] + '</option>';
+    }
+    html += '</select></div>';
+    
+    html += "<p style='padding-left: 50px;padding-right: 50px;'><i>" + MAN_PRINTPICKUP_HINT[lang] + "</i></p>";
+    return html;
+}
+
 function createDefaultViewPart(item) {
  	var html = '<div class="ui-field-contain">';
     html += '<label for="defaultview">' + MAN_DEFAULTVIEW[lang] + ':</label>';
@@ -1421,7 +1446,7 @@ function initRestoreFileUpload() {
 			} else {
 				alert("Import war erfolgreich.");
 				setTimeout(function(){
-					document.location.href = "index.html?v=1.5.8";
+					document.location.href = "index.html?v=1.5.9";
 				},250);
 			}
 		},
@@ -1975,9 +2000,9 @@ function handleUpdateCheckResult(answer) {
 	
 	var millis=getMillis();
 	setTimeout(function(){
-		document.location.href = "install.html?v=1.5.8&mode=onlyupdate&n=" + millis;
+		document.location.href = "install.html?v=1.5.9&mode=onlyupdate&n=" + millis;
 	},250);
-	document.location.href = "install.html?v=1.5.8&mode=onlyupdate&n=" + millis;
+	document.location.href = "install.html?v=1.5.9&mode=onlyupdate&n=" + millis;
 }
 
 function handleUpdateReplace(answer) {
@@ -2128,6 +2153,15 @@ function bindSelectionsWithActions() {
 		$("#configpart").trigger("create");
 		bindSelectionsWithActions();
 	});
+	$("#printpickups").off("change").on("change", function(e) {
+		e.stopImmediatePropagation();
+		e.preventDefault();
+		var newSel = $("#printpickups").find(":selected").val();
+		$("#partOfPrintpickups").html(createPickupConfigPart(newSel));
+		setVisibilityDueToWorkflow();
+		$("#configpart").trigger("create");
+		bindSelectionsWithActions();
+	});
 	$("#defaultview").off("change").on("change", function (e) {
 		e.stopImmediatePropagation();
 		e.preventDefault();
@@ -3589,7 +3623,7 @@ $(document).on("pageinit", "#admin-page", function () {
 					<div id="partOfPaymentConfig" style="display:none;"></div>
 					<div id="partOfWorkflowConfig"></div>
 					<div id="partOfPrintpickups"></div>
-						<i id=printpickupthint style="padding-left: 50px;padding-right: 50px;">Hinweis: nu bei Arbeitsbons</i>
+
 					<div data-role="fieldcontain">
 						<label for="showpickupsno"><span id="showpickupsnotxt">Max Abholjobs</span></label>
 						<input type="text" value="" data-mini="true" placeholder="2" id="showpickupsno" data-theme="c" class="genConfigEl"/>
diff --git a/webapp/paydesk.html b/webapp/paydesk.html
index 913b4db..64e4480 100644
--- a/webapp/paydesk.html
+++ b/webapp/paydesk.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/php/admin.php b/webapp/php/admin.php
index 031103a..89a70d1 100644
--- a/webapp/php/admin.php
+++ b/webapp/php/admin.php
@@ -1370,7 +1370,7 @@ class Admin {
 				$view = "preferences.html";
 			}
 			
-			echo json_encode($view . "?v=1.5.8");
+			echo json_encode($view . "?v=1.5.9");
 		}
 	}
 	
@@ -1586,31 +1586,31 @@ class Admin {
 			
 			if (!self::isOnlyRatingUser($rights, $right_rating, true)) {	
 			    if ($_SESSION['modus'] == 0) {
-				if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.8"); }
+				if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.9"); }
 			    } else {
-				if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.8"); }
+				if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.9"); }
 			    }
-			    if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.8"); }
-			    if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.8"); }
-			    if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.8"); }
+			    if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.9"); }
+			    if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.9"); }
+			    if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.9"); }
 			    if ($_SESSION['modus'] == 0) {
-				if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.8"); }
+				if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.9"); }
 			    }
-			    if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.8"); }
-			    if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.8"); }
-			    if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.8");	}
-			    if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.8"); }
-			    if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.8"); }
-			    if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.8"); }
-			    if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.8"); }
-			    if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.8"); }
-			    if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.8"); }
-			    if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.8"); }
-			    $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.8");
-			    if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.8"); }
+			    if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.9"); }
+			    if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.9"); }
+			    if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.9");	}
+			    if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.9"); }
+			    if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.9"); }
+			    if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.9"); }
+			    if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.9"); }
+			    if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.9"); }
+			    if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.9"); }
+			    if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.9"); }
+			    $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.9");
+			    if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.9"); }
 			    
-			    $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.8");
-			    $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.8");
+			    $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.9");
+			    $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.9");
 			}
 			
 			$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
diff --git a/webapp/php/customers.php b/webapp/php/customers.php
index f9b241c..65bd299 100644
--- a/webapp/php/customers.php
+++ b/webapp/php/customers.php
@@ -853,7 +853,7 @@ class Customers {
 		$txt = "<head>";
 		$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
 		$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
-		$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.8">';
+		$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.9">';
 		$txt .= "</head>";
 		return $txt;
 	}
diff --git a/webapp/php/debug.php b/webapp/php/debug.php
index 181d406..6007ea5 100644
--- a/webapp/php/debug.php
+++ b/webapp/php/debug.php
@@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
 	if (strlen($status) > 150) {
 		$status = substr($status, 0,149);
 	}
-	$version = "1.5.8";
+	$version = "1.5.9";
 	
 	$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
 } else {
diff --git a/webapp/php/printqueue.php b/webapp/php/printqueue.php
index 302a43f..89d9a74 100644
--- a/webapp/php/printqueue.php
+++ b/webapp/php/printqueue.php
@@ -172,7 +172,7 @@ class PrintQueue {
 	 * Insert a "work" (food or drink) job into the printjob queue. The POS Print Server will
 	 * pick these jobs and delete them after successful printing
 	 */
-	public static function queueWorkPrintJob($pdo,$table,$timestamp,$prods,$kind,$printer,$username) {
+	public static function queueWorkPrintJob($pdo,$table,$timestamp,$prods,$kind,$printer,$username,$isTogo) {
 		$workId = Workreceipts::getNextWorkReceiptId($pdo);
 
 		$table .= " ($username)";
@@ -198,8 +198,16 @@ class PrintQueue {
 
 		CommonUtils::log($pdo,"QUEUE","Create work job with id=$idOfWorkJob for tableid $table from user $username of kind $kind for printer=$printer");
 		
+		$printAPickupReceipt = false;
 		$printpickups = CommonUtils::getConfigValue($pdo, "printpickups", 0);
 		if ($printpickups == 1) {
+			$printAPickupReceipt = true;
+		} else if ($printpickups == 2) {
+			if ($isTogo) {
+				$printAPickupReceipt = true;
+			}
+		}
+		if ($printAPickupReceipt) {
 			$sql = "INSERT INTO `%printjobs%` (`content`,`type`,`printer`) VALUES (?,?,?)";
 			CommonUtils::execSql($pdo, $sql, array($content,self::$PICKUP,1));
 		}
diff --git a/webapp/php/queuecontent.php b/webapp/php/queuecontent.php
index 9fe6e7d..5b5b37a 100644
--- a/webapp/php/queuecontent.php
+++ b/webapp/php/queuecontent.php
@@ -616,7 +616,11 @@ class QueueContent {
 			}
 		}
 		
-		PrintQueue::queueWorkPrintJob($pdo, $tablename, $germanTime, $resultarray, $kind, $printer, $user);
+		$isTogo = false;
+		if (is_null($theTableid)) {
+			$isTogo = true;
+		}
+		PrintQueue::queueWorkPrintJob($pdo, $tablename, $germanTime, $resultarray, $kind, $printer, $user,$isTogo);
 	}
 	
 	private function getJsonLastMadeItems($kind) {
diff --git a/webapp/php/utilities/version.php b/webapp/php/utilities/version.php
index b113336..11097c4 100644
--- a/webapp/php/utilities/version.php
+++ b/webapp/php/utilities/version.php
@@ -1012,7 +1012,7 @@ class Version {
 			self::execSql($pdo, "ALTER TABLE %roles% ADD right_pickups INT(1) NULL AFTER right_customers");
 			self::execSql($pdo, "ALTER TABLE %histuser% ADD right_pickups INT(1) NULL AFTER right_customers");
 
-			self::execSqlWithParam($pdo, "UPDATE %roles% SET right_pickups=?", array(00));
+			self::execSqlWithParam($pdo, "UPDATE %roles% SET right_pickups=?", array(0));
 			self::execSqlWithParam($pdo, "UPDATE %histuser% SET right_pickups=?", array(0));
 
 			self::execSql($pdo, "OPTIMIZE TABLE %roles%");
@@ -1025,6 +1025,14 @@ class Version {
 		}
 	}
 	
+	public static function upd_1508_1509($pdo, $prefix, $dbname) {
+		try {			
+			return array(true);
+		} catch (PDOException $e) {
+			return array(false,$e);
+		}
+	}
+	
 	public static $updateOrder = array(
 	    "1.3.0" => array("upd_1300_1301","1.3.1"),
 	    "1.3.1" => array("upd_1301_1302","1.3.2"),
@@ -1080,7 +1088,8 @@ class Version {
 	    "1.5.4"  => array("upd_1504_1505","1.5.5"),
 	    "1.5.5"  => array("upd_1505_1506","1.5.6"),
 	    "1.5.6"  => array("upd_1506_1507","1.5.7"),
-	    "1.5.7"  => array("upd_1507_1508","1.5.8")
+	    "1.5.7"  => array("upd_1507_1508","1.5.8"),
+	    "1.5.8"  => array("upd_1508_1509","1.5.9")
 	);
 	
 	// RE;*   also for install process no check is required
diff --git a/webapp/pickups.html b/webapp/pickups.html
index 947bab3..7ed68d7 100644
--- a/webapp/pickups.html
+++ b/webapp/pickups.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
@@ -13,7 +13,7 @@
    <script src="php/3rdparty/jquery-1.11.3.min.js"></script> 
    <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
 
-   <script src="utilities.js?v=1.5.8"></script>
+   <script src="utilities.js?v=1.5.9"></script>
 
     <link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
 	<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
diff --git a/webapp/preferences.html b/webapp/preferences.html
index 6fbbc61..11ccaaf 100644
--- a/webapp/preferences.html
+++ b/webapp/preferences.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
  
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/products.html b/webapp/products.html
index 7e9e10f..72d1041 100644
--- a/webapp/products.html
+++ b/webapp/products.html
@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/rating.html b/webapp/rating.html
index 84a6cb7..effd542 100644
--- a/webapp/rating.html
+++ b/webapp/rating.html
@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/reports.html b/webapp/reports.html
index a6ad0f9..724c48a 100644
--- a/webapp/reports.html
+++ b/webapp/reports.html
@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/reservation.html b/webapp/reservation.html
index f5ff7d9..d06a1a4 100644
--- a/webapp/reservation.html
+++ b/webapp/reservation.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html
index f4f8f41..8814f03 100644
--- a/webapp/supplydesk.html
+++ b/webapp/supplydesk.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
  
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/tasks.html b/webapp/tasks.html
index 4be9b3a..ee7a194 100644
--- a/webapp/tasks.html
+++ b/webapp/tasks.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
@@ -13,7 +13,7 @@
    <script src="php/3rdparty/jquery-1.11.3.min.js"></script> 
    <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
 
-   <script src="utilities.js?v=1.5.8"></script>
+   <script src="utilities.js?v=1.5.9"></script>
 
     <link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
 	<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
diff --git a/webapp/timetracking.html b/webapp/timetracking.html
index 62cd2b0..e933050 100644
--- a/webapp/timetracking.html
+++ b/webapp/timetracking.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/waiter.html b/webapp/waiter.html
index 327c0d6..8b5cce0 100644
--- a/webapp/waiter.html
+++ b/webapp/waiter.html
@@ -4,8 +4,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
     <meta name="author" content="Stefan Pichel">
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.8">
-	<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.9">
+	<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.9">
 	<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
