diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index d801ec29e61..4cc3d0210bb 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -512,14 +512,14 @@ if ($socid > 0)
 	$title .= ' - '.$fourn->name;
 }
 
-if ($search_status)
+/*if ($search_status)
 {
 	if ($search_status == '1,2') $title .= ' - '.$langs->trans("SuppliersOrdersToProcess");
 	elseif ($search_status == '3,4') $title .= ' - '.$langs->trans("SuppliersOrdersAwaitingReception");
 	elseif ($search_status == '1,2,3') $title .= ' - '.$langs->trans("StatusOrderToProcessShort");
 	elseif ($search_status == '6,7') $title .= ' - '.$langs->trans("StatusOrderCanceled");
-	elseif (is_numeric($search_status)) $title .= ' - '.$commandestatic->LibStatut($search_status);
-}
+	elseif (is_numeric($search_status) && $search_status >= 0) $title .= ' - '.$commandestatic->LibStatut($search_status);
+}*/
 if ($search_billed > 0) $title .= ' - '.$langs->trans("Billed");
 
 //$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index f5e40806f5a..cee4a1495db 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -582,22 +582,28 @@ if ($action == "delete") {
 			$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);
-			$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]};
-			$sql .= " WHERE ref='(PROV-POS".$db->escape($_SESSION["takeposterminal"])."-".$db->escape($place).")'";
-			$resql3 = $db->query($sql);
-
-			$invoice->update_price(1);
-			if ($resql1 && $resql2 && $resql3)
-			{
-				$db->commit();
-			} else {
-				$db->rollback();
+			$resdeletelines = 1;
+			foreach($invoice->lines as $line){
+				$tmpres = $invoice->deleteline($line->id);
+				if ($tmpres < 0) {
+					$resdeletelines = 0;
+					break;
+				}
 			}
 
+			$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]};
+			$sql .= " WHERE ref='(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'";
+			$resql1 = $db->query($sql);
+
+			if ($resdeletelines && $resql1)
+            {
+            	$db->commit();
+            }
+            else
+            {
+            	$db->rollback();
+            }
+
 			$invoice->fetch($placeid);
 		}
 	}