diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 93b18e97641..11bc678196a 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1028,7 +1028,7 @@ abstract class CommonDocGenerator
             if(empty($columnText)) return;
             $pdf->SetXY($this->getColumnContentXStart($colKey),$curY); // Set curent position
             $colDef = $this->cols[$colKey];
-            $pdf->writeHTMLCell( $this->getColumnContentWidth($colKey),2,$this->getColumnContentXStart($colKey),$curY, $columnText,'',$colDef['content']['align']);
+            $pdf->writeHTMLCell( $this->getColumnContentWidth($colKey),2,$this->getColumnContentXStart($colKey),$curY, $columnText,0,0,0,true,$colDef['content']['align']);
         }
     }
 
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index d16a846cf4c..9c40a3998f5 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -139,7 +139,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->reception->enabled && $leftmenu=="receptions"', __HANDLER__, 'left', 1303__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/reception/stats/index.php?leftmenu=receptions', 'Statistics', 1, 'receptions', '$user->rights->reception->lire', '', 2, 2, __ENTITY__);
 
 -- Commercial - Proposals
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 1100__+MAX_llx_menu__, 'commercial', 'propals', 5__+MAX_llx_menu__, '/comm/propal/index.php?leftmenu=propals', 'Prop', 0, 'propal', '$user->rights->propale->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 1100__+MAX_llx_menu__, 'commercial', 'propals', 5__+MAX_llx_menu__, '/comm/propal/index.php?leftmenu=propals', 'Proposals', 0, 'propal', '$user->rights->propale->lire', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 1101__+MAX_llx_menu__, 'commercial', '', 1100__+MAX_llx_menu__, '/comm/propal/card.php?action=create&leftmenu=propals', 'NewPropal', 1, 'propal', '$user->rights->propale->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 1102__+MAX_llx_menu__, 'commercial', '', 1100__+MAX_llx_menu__, '/comm/propal/list.php?leftmenu=propals', 'List', 1, 'propal', '$user->rights->propale->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled && $leftmenu=="propals"', __HANDLER__, 'left', 1103__+MAX_llx_menu__, 'commercial', '', 1102__+MAX_llx_menu__, '/comm/propal/list.php?leftmenu=propals&viewstatut=0', 'PropalsDraft', 1, 'propal', '$user->rights->propale->lire', '', 2, 2, __ENTITY__);
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index a37a1d71c61..8306bb40e82 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -48,7 +48,6 @@ if (is_numeric($type)) $type=Categorie::$MAP_ID_TO_CODE[$type];	// For backward
 /*
  * Actions
  */
-print $action;
 if ($action=="SavePrinter1"){
 	$printedcategories=";";
 	if (is_array($printer1)) foreach ($printer1 as $cat){
diff --git a/htdocs/takepos/css/pos.css b/htdocs/takepos/css/pos.css
index 408d8217999..15a2993f593 100644
--- a/htdocs/takepos/css/pos.css
+++ b/htdocs/takepos/css/pos.css
@@ -30,6 +30,8 @@ button.calcbutton {
 	overflow: visible; /* removes extra width in IE */
 	width:24%;
 	height:24%;
+	font-weight: bold;
+	color: #555555;
 }
 
 button.calcbutton2 {
@@ -43,6 +45,8 @@ button.calcbutton2 {
 	overflow: visible; /* removes extra width in IE */
 	width:24%;
 	height:24%;
+	font-weight: bold;
+	color: #555555;
 }
 
 button.calcbutton3 {
@@ -97,6 +101,11 @@ div.wrapper2{
 	text-align: center;
 }
 
+button:active{
+    background:black;
+	color: white;
+}
+
 div.description{
 	position:absolute; /* absolute position (so we can position it where we want)*/
 	bottom:0px; /* position will be on bottom */
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index cd411b2255c..a70980893b2 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -274,7 +274,7 @@ if ($action == "temp" and $placeid != 0) {
 ?>
 <style>
 .selected {
-    color: red;
+    font-weight: bold;
 }
 .order {
     color: limegreen;
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index 752b91bf4d9..4af7a00e46e 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -46,6 +46,10 @@ $langs->loadLangs(array("bills","orders","commercial","cashdesk","receiptprinter
 // Title
 $title='TakePOS - Dolibarr '.DOL_VERSION;
 if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title='TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+$head='<meta name="apple-mobile-web-app-title" content="TakePOS"/>
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="mobile-web-app-capable" content="yes">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
 top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
 ?>
@@ -76,12 +80,12 @@ function PrintCategories(first){
 
 function MoreCategories(moreorless){
 	if (moreorless=="more"){
-		$('#catimg15').animate({opacity: '0.5'}, 100);
+		$('#catimg15').animate({opacity: '0.5'}, 1);
 		$('#catimg15').animate({opacity: '1'}, 100);
 		pagecategories=pagecategories+1;
 	}
 	if (moreorless=="less"){
-		$('#catimg14').animate({opacity: '0.5'}, 100);
+		$('#catimg14').animate({opacity: '0.5'}, 1);
 		$('#catimg14').animate({opacity: '1'}, 100);
 		if (pagecategories==0) return; //Return if no less pages
 		pagecategories=pagecategories-1;
@@ -103,7 +107,7 @@ function MoreCategories(moreorless){
 }
 
 function LoadProducts(position){
-    $('#catimg'+position).animate({opacity: '0.5'}, 100);
+    $('#catimg'+position).animate({opacity: '0.5'}, 1);
 	$('#catimg'+position).animate({opacity: '1'}, 100);
 	currentcat=$('#catdiv'+position).data('rowid');
     if (currentcat=="") return;
@@ -125,12 +129,12 @@ function LoadProducts(position){
 
 function MoreProducts(moreorless){
 	if (moreorless=="more"){
-		$('#proimg31').animate({opacity: '0.5'}, 100);
+		$('#proimg31').animate({opacity: '0.5'}, 1);
 		$('#proimg31').animate({opacity: '1'}, 100);
 		pageproducts=pageproducts+1;
 	}
 	if (moreorless=="less"){
-		$('#proimg30').animate({opacity: '0.5'}, 100);
+		$('#proimg30').animate({opacity: '0.5'}, 1);
 		$('#proimg30').animate({opacity: '1'}, 100);
 		if (pageproducts==0) return; //Return if no less pages
 		pageproducts=pageproducts-1;
@@ -155,7 +159,7 @@ function MoreProducts(moreorless){
 }
 
 function ClickProduct(position){
-    $('#proimg'+position).animate({opacity: '0.5'}, 100);
+    $('#proimg'+position).animate({opacity: '0.5'}, 1);
 	$('#proimg'+position).animate({opacity: '1'}, 100);
 	idproduct=$('#prodiv'+position).data('rowid');
     if (idproduct=="") return;
@@ -318,7 +322,7 @@ $( document ).ready(function() {
 <div id="poslines" style="position:absolute; top:2%; left:0.5%; height:36%; width:31%; overflow: auto;">
 </div>
 
-<div style="position:absolute; top:1%; left:32.5%; height:37%; width:32.5%;">
+<div style="position:absolute; top:1%; left:32.5%; height:37%; width:32.5%; font-size: 0;">
     <button type="button" class="calcbutton" onclick="Edit(7);">7</button>
     <button type="button" class="calcbutton" onclick="Edit(8);">8</button>
     <button type="button" class="calcbutton" onclick="Edit(9);">9</button>
@@ -354,20 +358,19 @@ $menus[$r++]=array('title'=>$langs->trans("ValidateBill"),
 $menus[$r++]=array('title'=>$langs->trans("Logout"),
                    'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
 
-
-							//BAR RESTAURANT specified menu
-
+//BAR RESTAURANT specified menu
 if($conf->global->TAKEPOS_BAR_RESTAURANT){
 	$menus[$r++]=array('title'=>$langs->trans("Floors"),
 					'action'=>'Floors();');
-		if ($conf->global->TAKEPOS_ORDER_PRINTERS){
+	if ($conf->global->TAKEPOS_ORDER_PRINTERS){
 		$menus[$r++]=array('title'=>$langs->trans("Order"),
-						'action'=>'TakeposPrintingOrder();');}
-
-						//add temp ticket button
-					if ($conf->global->TAKEPOS_ORDER_PRINTERS){
-						$menus[$r++]=array('title'=>$langs->trans("Temporary ticket"),
-										'action'=>'TakeposPrintingTemp();');}
+		'action'=>'TakeposPrintingOrder();');
+	}
+	//add temp ticket button
+	if ($conf->global->TAKEPOS_ORDER_PRINTERS){
+		$menus[$r++]=array('title'=>$langs->trans("Temporary ticket"),
+		'action'=>'TakeposPrintingTemp();');
+	}
 }
 
 if ($conf->global->TAKEPOSCONNECTOR){