diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 3a39632d783..0d3980318a4 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -121,10 +121,12 @@ class AdherentType extends CommonObject
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type (";
-		$sql.= "libelle";
+		$sql.= " morphy";
+		$sql.= ", libelle";
 		$sql.= ", entity";
 		$sql.= ") VALUES (";
-		$sql.= "'".$this->db->escape($this->label)."'";
+		$sql.= "'".$this->db->escape($this->morphy)."'";
+		$sql.= ", '".$this->db->escape($this->label)."'";
 		$sql.= ", ".$conf->entity;
 		$sql.= ")";
 
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 7a8aa91afda..4e7903e3b4e 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -173,7 +173,9 @@ if ($action == 'valid' && $user->rights->facture->creer)
 	}
 	elseif (! empty($conf->stock->enabled) && $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"]} != "1")
 	{
-	    $invoice->validate($user, '', $conf->global->{'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"]});
+		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
+		dol_syslog("Validate invoice with stock change into warehouse id ".$constantforkey);
+	    $invoice->validate($user, '', $conf->global->$cosntantforkey);
 	}
 	else
 	{
@@ -297,12 +299,28 @@ if ($action == "deleteline") {
 }
 
 if ($action == "delete") {
-    if ($placeid > 0) { //If invoice exists
+	// $placeid is the invoice id (it differs from place) and is defined if the place is set and the ref of invoice is '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')', so the fetch at begining of page works.
+	if ($placeid > 0) {
         $result = $invoice->fetch($placeid);
-        if ($result > 0)
+
+        if ($result > 0 && $invoice->statut == Facture::STATUS_DRAFT)
         {
-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "facturedet where fk_facture='".$placeid."'";
-            $resql = $db->query($sql);
+        	$db->begin();
+
+        	// We delete the lines
+        	$sql = "DELETE FROM " . MAIN_DB_PREFIX . "facturedet_extrafields where fk_object = ".$placeid;
+        	$resql1 = $db->query($sql);
+        	$sql = "DELETE FROM " . MAIN_DB_PREFIX . "facturedet where fk_facture = ".$placeid;
+            $resql2 = $db->query($sql);
+
+            if ($resql1 && $resql2)
+            {
+            	$db->commit();
+            }
+            else
+            {
+            	$db->rollback();
+            }
 
             $invoice->fetch($placeid);
         }
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index 4dc481a98cf..46cbdd595d9 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -398,8 +398,9 @@ function Refresh() {
 }
 
 function New() {
-	console.log("New");
-	var r = confirm('<?php echo $langs->trans("ConfirmDeletionOfThisPOSSale"); ?>');
+	// If we go here,it means $conf->global->TAKEPOS_BAR_RESTAURANT is not defined
+	console.log("New with place = <?php echo $place; ?>, js place="+place);
+	var r = confirm('<?php echo ($place > 0 ? $langs->trans("ConfirmDeletionOfThisPOSSale") : $langs->trans("ConfirmDiscardOfThisPOSSale")); ?>');
 	if (r == true) {
     	$("#poslines").load("invoice.php?action=delete&place="+place, function() {
     		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
@@ -664,7 +665,7 @@ if (empty($conf->global->TAKEPOS_BAR_RESTAURANT))
 else
 {
     // BAR RESTAURANT specific menu
-    $menus[$r++]=array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Floors").'</div>', 'action'=>'Floors();');
+    $menus[$r++]=array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action'=>'Floors();');
 }
 
 $menus[$r++]=array('title'=>'<span class="far fa-building paddingrightonly"></span><div class="trunc">'.$langs->trans("Customer").'</div>', 'action'=>'Customer();');