diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index b0259ea3349..f79081f77d1 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -261,6 +261,12 @@ if ($_POST['action'] == 'add' && $user->rights->commande->creer)
 
 }
 
+if ($_GET["action"] == 'classifybilled')
+{
+	$commande->fetch($comid);
+	$commande->classer_facturee();
+}
+
 // Positionne ref commande client
 if ($_POST['action'] == 'set_ref_client' && $user->rights->commande->creer)
 {
@@ -1760,6 +1766,19 @@ else
 							}
 						}
 					}
+					
+					if ($conf->facture->enabled && $commande->statut > 0  && ! $commande->facturee)
+					{	
+						if ($user->rights->facture->creer)
+						{
+							print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$commande->element.'&amp;originid='.$commande->id.'&amp;socid='.$commande->socid.'">'.$langs->trans("CreateBill").'</a>';
+						}
+						
+						if ($user->rights->commande->creer)
+						{
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$commande->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
+						}
+					}
 
 					// Close
 					if ($commande->statut == 1 || $commande->statut == 2)
diff --git a/htdocs/lib/order.lib.php b/htdocs/lib/order.lib.php
index a2424da7c1c..892fa72d54b 100644
--- a/htdocs/lib/order.lib.php
+++ b/htdocs/lib/order.lib.php
@@ -54,7 +54,7 @@ function commande_prepare_head($commande)
 		$head[$h][2] = 'shipping';
 		$h++;
 	}
-
+/*
 	// Commande a facturer
 	if ($conf->facture->enabled)
 	{
@@ -63,7 +63,7 @@ function commande_prepare_head($commande)
 		$head[$h][2] = 'accountancy';
 		$h++;
 	}
-
+*/
 	if ($conf->use_preview_tabs)
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/commande/apercu.php?id='.$commande->id;