diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 856cf1de0d2..33ea50dfb0f 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 4e7903e3b4e..0f0498bc8a8 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -161,6 +161,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
 		$invoice->update($user);
 	}
 
+	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
 	if ($invoice->statut != Facture::STATUS_DRAFT)
 	{
 		dol_syslog("Sale already validated");
@@ -171,11 +172,11 @@ if ($action == 'valid' && $user->rights->facture->creer)
 		dol_syslog("Sale without lines");
 		dol_htmloutput_errors($langs->trans("NoLinesToBill", "TakePos"), null, 1);
 	}
-	elseif (! empty($conf->stock->enabled) && $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"]} != "1")
+	elseif (! empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")
 	{
 		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
 		dol_syslog("Validate invoice with stock change into warehouse id ".$constantforkey);
-	    $invoice->validate($user, '', $conf->global->$cosntantforkey);
+		$invoice->validate($user, '', $conf->global->$constantforkey);
 	}
 	else
 	{
@@ -717,8 +718,17 @@ if ($invoice->socid != $conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takep
     $soc = new Societe($db);
     if ($invoice->socid > 0) $soc->fetch($invoice->socid);
     else $soc->fetch($conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]});
-    print '<p style="font-size:120%;" class="right">';
+    print '<!-- Show customer --><p style="font-size:120%;" class="right">';
     print $langs->trans("Customer").': '.$soc->name;
+
+	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
+	if (! empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")
+	{
+		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
+		$warehouse = new Entrepot($db);
+		$warehouse->fetch($conf->global->$constantforkey);
+		print '<br>'.$langs->trans("Warehouse").': '.$warehouse->ref;
+	}
     print '</p>';
 
         // Module Adherent