From 8c8c7a1fce7901b7144ff3efd592020c65e1373f Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 27 Apr 2007 22:59:53 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20le=20choix=20de=20la=20m=E9thode=20d'exp?=
 =?UTF-8?q?=E9dition=20=E9tait=20mal=20g=E9r=E9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/admin/expedition.php | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 9a9178fb917..a43adddfa71 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -277,18 +277,24 @@ if(is_dir($dir))
 
 			print $module->description;
 
-			print '</td><td align="center">';
+			print '</td><td colspan="2" align="center">';
 
 			if (in_array($module->id, $mods))
 			{
-				print img_tick();
-				print '</td><td align="center">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmethod&amp;statut=0&amp;module='.$name.'&amp;moduleid='.$module->id.'">'.$langs->trans("Disable").'</a>';
+				if ($conf->global->EXPEDITION_ADDON != $name)
+				{
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmethod&amp;statut=0&amp;module='.$name.'&amp;moduleid='.$module->id.'">';
+					print img_tick($langs->trans("Disable"));
+					print '</a>';
+				}
+				else
+				{
+					print img_tick($langs->trans("Activated"));
+				}
 
 			}
 			else
 			{
-				print '&nbsp;</td><td align="center">';
 				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmethod&amp;statut=1&amp;module='.$name.'&amp;moduleid='.$module->id.'">'.$langs->trans("Activate").'</a>';
 			}
 
@@ -296,9 +302,9 @@ if(is_dir($dir))
 
 			// Default
 			print '<td align="center">';
-			if ($conf->global->EXPEDITION_ADDON == "$name")
+			if ($conf->global->EXPEDITION_ADDON == $name)
 			{
-				print img_tick();
+				print img_tick($langs->trans("Activate"));
 			}
 			else
 			{
@@ -389,7 +395,7 @@ if(is_dir($dir))
 			if (in_array($name, $def))
 			{
 				print "<td align=\"center\">\n";
-				if ($conf->global->EXPEDITION_ADDON_PDF != "$name")
+				if ($conf->global->EXPEDITION_ADDON_PDF != $name)
 				{
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
 					print img_tick($langs->trans("Disable"));
@@ -397,7 +403,7 @@ if(is_dir($dir))
 				}
 				else
 				{
-					print img_tick($langs->trans("Enabled"));
+					print img_tick($langs->trans("Activated"));
 				}
 				print "</td>";
 			}
@@ -410,7 +416,7 @@ if(is_dir($dir))
 
 			// Defaut
 			print "<td align=\"center\">";
-			if ($conf->global->EXPEDITION_ADDON_PDF == "$name")
+			if ($conf->global->EXPEDITION_ADDON_PDF == $name)
 			{
 				print img_tick($langs->trans("Default"));
 			}