diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
index a5c5a4b68e8..de480e682e1 100644
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -35,7 +35,7 @@ if (!$user->admin)
   accessforbidden();
 
 
-$dons_addon_var      = FACTURE_ADDON;
+$dons_addon_var      = DON_ADDON;
 
 
 $typeconst=array('yesno','texte','chaine');
@@ -43,13 +43,16 @@ $typeconst=array('yesno','texte','chaine');
 
 if ($_GET["action"] == 'set')
 {
-  if (dolibarr_set_const($db, "FACTURE_ADDON",$_GET["value"]))
-    $facture_addon_var = $_GET["value"];
+  if (dolibarr_set_const($db, "DON_ADDON",$_GET["value"]))
+    $don_addon_var = $_GET["value"];
 }
 
 
+/*
+ * Affiche page
+ */
 
-$dir = "../compta/dons/formulaire";
+$dir = "../includes/modules/dons/";
 
 
 llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
@@ -78,27 +81,29 @@ $handle=opendir($dir);
 $var=True;
 while (($file = readdir($handle))!==false)
 {
-  if (substr($file, strlen($file) -4) == '.php')
+    if (eregi('\.modules\.php$',$file))
     {
-	  $var = !$var;
+        $var = !$var;
+        $name = substr($file, 0, strlen($file) -12);
+        $classname = substr($file, 0, strlen($file) -12);
 
-      print '<tr '.$bc[$var].'><td width=\"100\">';
-      echo "$file";
-      print '</td><td>&nbsp;</td><td align="center">';
+        print '<tr '.$bc[$var].'><td width=\"100\">';
+        echo "$file";
+        print '</td><td>&nbsp;</td><td align="center">';
 
-      if ($facture_addon_var_pdf == "$name")
-	{
-	  print img_tick();
-      print '</td><td align="center">';
-      print '&nbsp;';
-	}
-      else
-	{
-	  print '&nbsp;';
-      print '</td><td align="center">';
-      print '<a href="dons.php?action=setform&value='.$name.'">'.$langs->trans("Activate").'</a>';
-	}
-	print "</td></tr>\n";
+        if ($dons_addon_var == "$name")
+        {
+            print img_tick();
+            print '</td><td align="center">';
+            print '&nbsp;';
+        }
+        else
+        {
+            print '&nbsp;';
+            print '</td><td align="center">';
+            print '<a href="dons.php?action=setform&value='.$name.'">'.$langs->trans("Activate").'</a>';
+        }
+        print "</td></tr>\n";
 
     }
 }
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 1603270c4d8..2cd2dd2bd8c 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -184,36 +184,36 @@ $handle=opendir($dir);
 $var=True;
 while (($file = readdir($handle))!==false)
 {
-  if (substr($file, strlen($file) -12) == '.modules.php' && 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 ($facture_addon_var_pdf == "$name")
-	{
-      print '&nbsp;';
-      print '</td><td align="center">';
-	  print img_tick();
-	}
-      else
-	{
-	  print '&nbsp;';
-      print '</td><td align="center">';
-      print '<a href="facture.php?action=setpdf&amp;value='.$name.'">'.$langs->trans("Default").'</a>';
-	}
-	print "</td></tr>\n";
-
+        $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 ($facture_addon_var_pdf == "$name")
+        {
+            print '&nbsp;';
+            print '</td><td align="center">';
+            print img_tick();
+        }
+        else
+        {
+            print '&nbsp;';
+            print '</td><td align="center">';
+            print '<a href="facture.php?action=setpdf&amp;value='.$name.'">'.$langs->trans("Default").'</a>';
+        }
+        print "</td></tr>\n";
+    
     }
 }
 closedir($handle);
diff --git a/mysql/data/data.sql b/mysql/data/data.sql
index 2376cd296a6..549aee68aee 100644
--- a/mysql/data/data.sql
+++ b/mysql/data/data.sql
@@ -162,7 +162,7 @@ insert into llx_const (name, value, type) values ('OSC_CATALOG_URL','http://osc.
 --
 --
 --
-insert into llx_const (name, value, type, visible) values ('DON_ADDON',           'html_cerfafr','chaine',1);
+insert into llx_const (name, value, type, visible) values ('DON_ADDON',           'html_cerfafr','chaine',0);
 insert into llx_const (name, value, type, visible) values ('PROPALE_ADDON',       'mod_propale_marbre','chaine',0);
 insert into llx_const (name, value, type, visible) values ('PROPALE_ADDON_PDF',   'azur','chaine',0);
 insert into llx_const (name, value, type, visible) values ('COMMANDE_ADDON',      'mod_commande_ivoire','chaine',0);
diff --git a/mysql/migration/1.1.0-2.0.0.sql b/mysql/migration/1.1.0-2.0.0.sql
index 836a2bc7b05..f7310c8be0a 100644
--- a/mysql/migration/1.1.0-2.0.0.sql
+++ b/mysql/migration/1.1.0-2.0.0.sql
@@ -804,7 +804,9 @@ create table llx_paiementcharge
 )type=innodb;
 
 
-update llx_const set visible=0 where name like 'DONS_FORM';
+delete from llx_const where name like 'DONS_%';
+insert into llx_const (name, value, type, visible) values ('DON_ADDON','html_cerfafr','chaine',0);
+
 update llx_const set visible=0 where name like 'ADHERENT%';
 update llx_const set visible=0 where name like 'PROPALE_ADDON%';