diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index b96fd57916d..8618c729592 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1829,6 +1829,8 @@ class Facture extends CommonInvoice
 
             if ($error == 0)
             {
+            	$this->brouillon = 1;
+            	$this->statut = 0;
                 $this->db->commit();
                 return 1;
             }
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 71673aca078..28dee6f9383 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1180,7 +1180,7 @@ class Form
             $sql.= ", pl.label as label_translated";
         }
 		// Price by quantity
-		if (! empty($conf->global->PRODUIT_PRICE_BY_QTY))
+		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
 		{
 			$sql.= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";
 			if ($price_level >= 1) $sql.= " AND price_level=".$price_level;