diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 2d4e614a21c..b2049d9561f 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -69,10 +69,42 @@ if ($_GET["action"] == 'setmod')
       $commande_addon_var = $_GET["value"];
     }
 }
+if ($_GET["action"] == 'set')
+{
+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_model_pdf (nom) VALUES ('".$_GET["value"]."')";
+
+    if ($db->query($sql))
+    {
+
+    }
+}
+$propale_addon_var_pdf = $conf->global->PROPALE_ADDON_PDF;
 if ($_GET["action"] == 'setpdf')
 {
-  if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF",$_GET["value"])) $commande_addon_var_pdf = $_GET["value"];
+  
+  if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF",$_GET["value"])) 
+  	$commande_addon_var_pdf = $_GET["value"];
+
+	// On active le modele
+    $sql_del = "delete from ".MAIN_DB_PREFIX."commande_model_pdf where nom = '".$_GET["value"]."';";
+    $db->query($sql_del);
+
+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_model_pdf (nom) VALUES ('".$_GET["value"]."')";
+    if ($db->query($sql))
+    {
+
+    }
 }
+if ($_GET["action"] == 'del')
+{
+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_model_pdf WHERE nom='".$_GET["value"]."'";
+
+    if ($db->query($sql))
+    {
+
+    }
+}
+$propale_addon_var_pdf = $conf->global->PROPALE_ADDON_PDF;
 
 $dir = "../includes/modules/commande/";
 
@@ -141,52 +173,79 @@ print '</table>';
 print '<br>';
 print_titre("Modèles de commande pdf");
 
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Name").'</td>';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Default").'</td>';
+print "<table class=\"noborder\" width=\"100%\">\n";
+print "<tr class=\"liste_titre\">\n";
+print "  <td width=\"140\">".$langs->trans("Name")."</td>\n";
+print "  <td>".$langs->trans("Description")."</td>\n";
+print '  <td align="center" colspan="2">'.$langs->trans("Activated")."</td>\n";
+print '  <td align="center">'.$langs->trans("Default")."</td>\n";
 print "</tr>\n";
 
 clearstatcache();
 
+$def = array();
+$sql = "SELECT nom FROM ".MAIN_DB_PREFIX."commande_model_pdf";
+$resql=$db->query($sql);
+if ($resql)
+{
+  $i = 0;
+  $num_rows=$db->num_rows($resql);
+  while ($i < $num_rows)
+    {
+      $array = $db->fetch_array($resql);
+      array_push($def, $array[0]);
+      $i++;
+    }
+}
+else
+{
+  dolibarr_print_error($db);
+}
 $handle=opendir($dir);
-
 $var=True;
 while (($file = readdir($handle))!==false)
 {
-    if (eregi('\.modules\.php$',$file) && substr($file,0,4) == 'pdf_')
+	if (eregi('\.modules\.php$',$file) && substr($file,0,4) == 'pdf_')
     {
         $var = !$var;
         $name = substr($file, 4, strlen($file) -16);
         $classname = substr($file, 0, strlen($file) -12);
-    
-        print '<tr '.$bc[$var].'><td width="100">';
-        echo "$name";
-        print "</td><td>\n";
-        require_once($dir.$file);
-        $obj = new $classname($db);
-    
-        print $obj->description;
-    
-        print '</td><td align="center">';
-    
-        if ($commande_addon_var_pdf == "$name")
-        {
-            print '&nbsp;';
-            print '</td><td align="center">';
-            print img_tick();
-        }
-        else
-        {
-            print '&nbsp;';
-			// print $commande_addon_var_pdf."iii";
-            print '</td><td align="center">';
-            print '<a href="commande.php?action=setpdf&amp;value='.$name.'">'.$langs->trans("Default").'</a>';
-        }
-        print "</td></tr>\n";
-    
+	
+		  $var=!$var;
+		  print "<tr ".$bc[$var].">\n  <td>";
+		  print "$name";
+		  print "</td>\n  <td>\n";
+		  require_once($dir.$file);
+		  $obj = new $classname($db);
+		  
+		  print $obj->description;
+	
+		  print "</td>\n  <td align=\"center\">\n";
+	
+		  if (in_array($name, $def))
+	{
+	  print img_tick();
+	  print "</td>\n  <td>";
+	  print '<a href="commande.php?action=del&amp;value='.$name.'">'.$langs->trans("Disable").'</a>';
+	}
+      else
+	{
+	  print "&nbsp;";
+	  print "</td>\n  <td>";
+	  print '<a href="commande.php?action=set&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
+	}
+
+      print "</td>\n  <td align=\"center\">";
+
+      if ($commande_addon_var_pdf == "$name")
+	{
+	  print img_tick();
+	}
+      else
+	{
+      print '<a href="commande.php?action=setpdf&amp;value='.$name.'">'.$langs->trans("Activate").'</a>';
+	}
+      print '</td></tr>';
     }
 }
 closedir($handle);
diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php
index c1dabf800a1..64358fce26b 100644
--- a/htdocs/includes/modules/commande/modules_commande.php
+++ b/htdocs/includes/modules/commande/modules_commande.php
@@ -25,19 +25,19 @@
  */
 
 /**
-	    \file       htdocs/includes/modules/commande/modules_commande.php
-		\ingroup    commande
-		\brief      Fichier contenant la classe mère de generation des commandes en PDF
-		            et la classe mère de numérotation des commandes
-		\version    $Revision$
+            \file       htdocs/includes/modules/commande/modules_commande.php
+                \ingroup    commande
+                \brief      Fichier contenant la classe mère de generation des commandes en PDF
+                            et la classe mère de numérotation des commandes
+                \version    $Revision$
 */
 
 require_once(FPDF_PATH.'fpdf.php');
 
 
 /**
-	    \class      ModelePDFCommandes
-		\brief      Classe mère des modèles de commandes
+            \class      ModelePDFCommandes
+                \brief      Classe mère des modèles de commandes
 */
 
 class ModelePDFCommandes extends FPDF
@@ -55,21 +55,29 @@ class ModelePDFCommandes extends FPDF
     /** 
      *      \brief      Renvoi la liste des modèles actifs
      */
-    function liste_modeles()
+    function liste_modeles($db)
     {
         $liste=array();
-       	$dir = "../includes/modules/commande/";
-		$handle = opendir($dir);
-		$var=True;
-		while (($file = readdir($handle))!==false)
-		{
-			 if (eregi('\.modules\.php$',$file) && substr($file,0,4) == 'pdf_')
-    		{
-				$name = substr($file, 4, strlen($file) -16);
-				$liste[$name] = $name;
-        	// $classname = substr($file, 0, strlen($file) -12);
-			}
-		}
+        $sql ="SELECT nom as id, nom as lib";
+        $sql.=" FROM ".MAIN_DB_PREFIX."commande_model_pdf";
+        
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $num = $db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $row = $db->fetch_row($resql);
+                $liste[$row[0]]=$row[1];
+                $i++;
+            }
+        }
+        else
+        {
+            $this->error=$db->error();
+            return -1;
+        }
         return $liste;
     }
 
@@ -79,7 +87,7 @@ class ModelePDFCommandes extends FPDF
 
 /**
         \class      ModeleNumRefCommandes
-	    \brief      Classe mère des modèles de numérotation des références de commandes
+            \brief      Classe mère des modèles de numérotation des références de commandes
 */
 
 class ModeleNumRefCommandes
@@ -136,14 +144,14 @@ function commande_pdf_create($db, $comid, $modele='')
   if (! strlen($modele))
     {
       if (defined("COMMANDE_ADDON_PDF") && COMMANDE_ADDON_PDF)
-	{
-	  $modele = COMMANDE_ADDON_PDF;
-	}
+        {
+          $modele = COMMANDE_ADDON_PDF;
+        }
       else
-	{
+        {
       print $langs->trans("Error")." ".$langs->trans("Error_PROPALE_ADDON_PDF_NotDefined");
-	  return 0;
-	}
+          return 0;
+        }
     }
   // Charge le modele
   $file = "pdf_".$modele.".modules.php";
@@ -155,17 +163,17 @@ function commande_pdf_create($db, $comid, $modele='')
       $obj = new $classname($db);
 
       if ( $obj->write_pdf_file($comid) > 0)
-	{
-	  // on supprime l'image correspondant au preview
-	   commande_delete_preview($db, $comid);
-	  return 1;
-	}
+        {
+          // on supprime l'image correspondant au preview
+           commande_delete_preview($db, $comid);
+          return 1;
+        }
       else
-	{
-	  dolibarr_syslog("Erreur dans commande_pdf_create");
-	  dolibarr_print_error($db,$obj->pdferror());
-	  return 0;
-	}
+        {
+          dolibarr_syslog("Erreur dans commande_pdf_create");
+          dolibarr_print_error($db,$obj->pdferror());
+          return 0;
+        }
     }
   else
     {
@@ -175,27 +183,27 @@ function commande_pdf_create($db, $comid, $modele='')
 }
 function commande_delete_preview($db, $propalid)
 {
-	global $langs,$conf;
+        global $langs,$conf;
 
-	$com = new Commande($db,"",$propalid);
-	$com->fetch($propalid);  
-	$client = new Societe($db);
+        $com = new Commande($db,"",$propalid);
+        $com->fetch($propalid);  
+        $client = new Societe($db);
     $client->fetch($com->soc_id);
 
-	if ($conf->commande->dir_output)
-		{
-		$comref = sanitize_string($com->ref); 
-		$dir = $conf->commande->dir_output . "/" . $comref ; 
-		$file = $dir . "/" . $comref . ".pdf.png";
+        if ($conf->commande->dir_output)
+                {
+                $comref = sanitize_string($com->ref); 
+                $dir = $conf->commande->dir_output . "/" . $comref ; 
+                $file = $dir . "/" . $comref . ".pdf.png";
 
-		if ( file_exists( $file ) && is_writable( $file ) )
-			{
-			if ( ! unlink($file) )
-				{
-				$this->error=$langs->trans("ErrorFailedToOpenFile",$file);
-				return 0;
-				}
-			}
-		}
+                if ( file_exists( $file ) && is_writable( $file ) )
+                        {
+                        if ( ! unlink($file) )
+                                {
+                                $this->error=$langs->trans("ErrorFailedToOpenFile",$file);
+                                return 0;
+                                }
+                        }
+                }
 }
 ?>
diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/includes/modules/modCommande.class.php
index 00b9f603339..96af6fde042 100644
--- a/htdocs/includes/modules/modCommande.class.php
+++ b/htdocs/includes/modules/modCommande.class.php
@@ -127,8 +127,10 @@ class modCommande extends DolibarrModules
     // Dir
     $this->dirs[0] = $conf->commande->dir_output;
     $this->dirs[1] = $conf->commande->dir_images;
-
-    $sql = array();
+	$sql = array(
+		 "DELETE FROM ".MAIN_DB_PREFIX."commande_model_pdf WHERE nom = '".$this->const[0][2]."'",
+		 "INSERT INTO ".MAIN_DB_PREFIX."commande_model_pdf (nom) VALUES('".$this->const[0][2]."');",
+		 );
 
     return $this->_init($sql);
   }
@@ -141,7 +143,7 @@ class modCommande extends DolibarrModules
   function remove()
   {
     $sql = array();
-
+	
     return $this->_remove($sql);
 
   }