diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index fbb3ec51600..00baf722bd7 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -584,8 +584,8 @@ if ($id > 0 || ! empty($ref))
{
print '
';
- // Bouton expedier sans gestion des stocks
- if (! $conf->stock->enabled && ! $commande->brouillon)
+ // Bouton expedier sans gestion des stocks
+ if (! $conf->stock->enabled && ($commande->statut > 0 && $commande->statut < 3))
{
if ($user->rights->expedition->creer)
{
@@ -604,8 +604,8 @@ if ($id > 0 || ! empty($ref))
}
- // Bouton expedier avec gestion des stocks
- if ($commande->statut > 0 && $commande->statut < 3)
+ // Bouton expedier avec gestion des stocks
+ if ($conf->stock->enabled && ($commande->statut > 0 && $commande->statut < 3))
{
if ($user->rights->expedition->creer)
{