From a8fba4277fa6511275991a68b4befcbeff16f45b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 13 Aug 2010 17:39:10 +0000
Subject: [PATCH] Fix: Removed duplicate button

---
 htdocs/expedition/shipment.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 '<div class="tabsAction">';
 
-			// 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)
 			{