From fd393218d34c3cf50c403ccc968b7c29c8abbfbd Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 14 Mar 2019 17:07:49 +0100
Subject: [PATCH 1/3] FIX you should prefer "elseif" than "else if"

---
 htdocs/takepos/ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/ajax.php b/htdocs/takepos/ajax.php
index db8b3fdff56..9586e71fd18 100644
--- a/htdocs/takepos/ajax.php
+++ b/htdocs/takepos/ajax.php
@@ -49,7 +49,7 @@ if ($action=="getProducts") {
     echo json_encode($prods);
 }
 
-else if ($action=="search") {
+elseif ($action=="search") {
     $sql = 'SELECT * FROM '.MAIN_DB_PREFIX.'product';
     $sql .= ' WHERE entity IN ('.getEntity('product').')';
     $sql .= ' AND tosell = 1';

From a40cba194f68588ff10d223b7225403db79b264d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 14 Mar 2019 17:24:42 +0100
Subject: [PATCH 2/3] FIX wrong url

---
 htdocs/takepos/takepos.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index 8e7053b8242..47584a8c2a7 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -446,11 +446,11 @@ $menus[$r++]=array('title'=>$langs->trans("FreeZone"),
 $menus[$r++]=array('title'=>$langs->trans("Customer"),
 					'action'=>'Customer();');
 $menus[$r++]=array('title'=>$langs->trans("BackOffice"),
-                   'action'=>'window.open(\''.DOL_URL_ROOT.'\', \'backoffice\');');
+					'action'=>'window.open(\''.(empty(DOL_URL_ROOT)?'/':DOL_URL_ROOT).'\', \'_self\');');
 $menus[$r++]=array('title'=>$langs->trans("ValidateBill"),
 					'action'=>'CloseBill();');
 $menus[$r++]=array('title'=>$langs->trans("Logout"),
-                   'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
+					'action'=>'window.location.href=\''.(empty(DOL_URL_ROOT)?'/':DOL_URL_ROOT).'user/logout.php\';');
 
 //BAR RESTAURANT specified menu
 if($conf->global->TAKEPOS_BAR_RESTAURANT){

From 56104e6d8962acc76be6128831c9206684cd562e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Thu, 14 Mar 2019 17:58:32 +0100
Subject: [PATCH 3/3] FIX regression

---
 htdocs/takepos/takepos.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index 47584a8c2a7..740978e7db6 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -450,7 +450,7 @@ $menus[$r++]=array('title'=>$langs->trans("BackOffice"),
 $menus[$r++]=array('title'=>$langs->trans("ValidateBill"),
 					'action'=>'CloseBill();');
 $menus[$r++]=array('title'=>$langs->trans("Logout"),
-					'action'=>'window.location.href=\''.(empty(DOL_URL_ROOT)?'/':DOL_URL_ROOT).'user/logout.php\';');
+					'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
 
 //BAR RESTAURANT specified menu
 if($conf->global->TAKEPOS_BAR_RESTAURANT){