diff --git a/htdocs/public/dons/bplc.php b/htdocs/public/dons/bplc.php
index ee13afa0bd3..156db6a3074 100644
--- a/htdocs/public/dons/bplc.php
+++ b/htdocs/public/dons/bplc.php
@@ -34,7 +34,7 @@ require("../../don.class.php");
 
 $conf = new Conf();
 
-$db = new Db();
+$db = new DoliDb();
 
 $retbplc = new Retourbplc($db);
 
diff --git a/htdocs/public/dons/depenses.xhtml b/htdocs/public/dons/depenses.xhtml
index e7c120d982d..ca0e0a8fa48 100644
--- a/htdocs/public/dons/depenses.xhtml
+++ b/htdocs/public/dons/depenses.xhtml
@@ -8,7 +8,7 @@
     <!-- $Id$ -->
     <title>EUCD.INFO - Dépenses</title>
     <script language="php">
-      require("../../conf/conf.class.php3");
+      require("../../conf/conf.class.php");
       require("../../lib/mysql.lib.php3");
     </script>
   </head>
diff --git a/htdocs/public/dons/depenses_code.php b/htdocs/public/dons/depenses_code.php
index 5bc7274075d..d73eee86023 100644
--- a/htdocs/public/dons/depenses_code.php
+++ b/htdocs/public/dons/depenses_code.php
@@ -23,10 +23,10 @@
 
 
 $conf = new Conf();
-$db = new Db();
-$a = setlocale("LC_TIME", "FRENCH");
+$db = new DoliDb();
+$a = setlocale(LC_TIME, "FRENCH");
 $sql = "SELECT ".$db->pdate("f.datef")." as datef, s.nom, f.total, f.note, f.paye";
-$sql .= " FROM llx_facture_fourn as f, societe as s";
+$sql .= " FROM llx_facture_fourn as f, llx_societe as s";
 $sql .= " WHERE f.fk_soc = s.idp ORDER BY f.datef DESC";
 
 if ( $db->query( $sql) )
@@ -57,7 +57,7 @@ if ( $db->query( $sql) )
 	  print "<TD>".strftime("%d %B %Y",$objp->datef)."</td>\n";
 	  print '<TD align="right">'.number_format($objp->total,2,'.','').'<br>euros';
 
-	  if ($obj->paye)
+	  if ($objp->paye == 1)
 	    {
 	      print "<br>payé";
 	      $total_paye += $objp->total;
diff --git a/htdocs/public/dons/don.xhtml b/htdocs/public/dons/don.xhtml
index 8812011f0ad..965f0472205 100644
--- a/htdocs/public/dons/don.xhtml
+++ b/htdocs/public/dons/don.xhtml
@@ -38,7 +38,7 @@
 	  <tr id="date">
 
 	    <script language="php">
-	      $a = setlocale("LC_TIME", "FRENCH");
+	      $a = setlocale(LC_TIME, "fr_FR");
 	      print strftime("%d %B %Y", time());
 	    </script>
 	  </tr>
diff --git a/htdocs/public/dons/donateurs.xhtml b/htdocs/public/dons/donateurs.xhtml
index 311b83ee152..3cf40180402 100644
--- a/htdocs/public/dons/donateurs.xhtml
+++ b/htdocs/public/dons/donateurs.xhtml
@@ -8,7 +8,7 @@
     <!-- $Id$ -->
     <title>Dons FSF France Projet EUCD.INFO</title>
     <script language="php">
-      require("../../conf/conf.class.php3");
+      require("../../conf/conf.class.php");
       require("../../lib/mysql.lib.php3");
       require("../../don.class.php");
     </script>
diff --git a/htdocs/public/dons/donateurs_code.php b/htdocs/public/dons/donateurs_code.php
index 3183a570b17..0ff9639bdcb 100644
--- a/htdocs/public/dons/donateurs_code.php
+++ b/htdocs/public/dons/donateurs_code.php
@@ -22,8 +22,8 @@
 
 
 $conf = new Conf();
-$db = new Db();
-$a = setlocale("LC_TIME", "FRENCH");
+$db = new DoliDb();
+$a = setlocale(LC_TIME, "FRENCH");
 $sql = "SELECT ".$db->pdate("d.datedon")." as datedon, d.nom, d.prenom, d.amount, d.public, d.societe";
 $sql .= " FROM llx_don as d";
 $sql .= " WHERE d.fk_don_projet = 1 AND d.fk_statut in (2, 3) ORDER BY d.datedon DESC";
diff --git a/htdocs/public/dons/erreur.xhtml b/htdocs/public/dons/erreur.xhtml
index 563ceb3f707..4b27566f8c5 100644
--- a/htdocs/public/dons/erreur.xhtml
+++ b/htdocs/public/dons/erreur.xhtml
@@ -35,7 +35,7 @@
 
 	  <tr id="date">
 	    <script language="php">
-	      $a = setlocale("LC_TIME", "FRENCH");
+	      $a = setlocale(LC_TIME, "FRENCH");
 	      print strftime("%d %B %Y", time());
 	    </script>
 	  </tr>
diff --git a/htdocs/public/dons/graph.xhtml b/htdocs/public/dons/graph.xhtml
index f70191b61ff..4da59ec1319 100644
--- a/htdocs/public/dons/graph.xhtml
+++ b/htdocs/public/dons/graph.xhtml
@@ -8,7 +8,7 @@
     <!-- $Id$ -->
     <title>Dons FSF France Projet EUCD.INFO</title>
     <script language="php">
-      require("../../conf/conf.class.php3");
+      require("../../conf/conf.class.php");
       require("../../lib/mysql.lib.php3");
       require("../../don.class.php");
     </script>
diff --git a/htdocs/public/dons/index.php b/htdocs/public/dons/index.php
index d3c48979345..ef3847c1076 100644
--- a/htdocs/public/dons/index.php
+++ b/htdocs/public/dons/index.php
@@ -29,7 +29,7 @@ $conf = new Conf();
 if ($conf->don->enabled)
 {
 
-  $db = new Db();
+  $db = new DoliDb();
   $don = new Don($db);
       
   $don->projetid    = $HTTP_POST_VARS["projetid"];
@@ -72,7 +72,7 @@ if ($conf->don->enabled)
 	  
 	  if ($ref_commande)
 	    {
-	      $a = setlocale("LC_TIME", "FRENCH");
+	      $a = setlocale(LC_TIME, "FRENCH");
 	      $date_limite = strftime("%A %d %B %Y",time() + (3 * 7 * 24 * 3600));
 
 	      include ("mail.php");
diff --git a/htdocs/public/dons/mail_moderator.php b/htdocs/public/dons/mail_moderator.php
index 8752fd31159..0364dd442af 100644
--- a/htdocs/public/dons/mail_moderator.php
+++ b/htdocs/public/dons/mail_moderator.php
@@ -9,7 +9,7 @@ Pr
 Nom:     $don->nom
 Montant: $don->amount
 
-http://dolibarr.fsffrance.org/compta/dons/
+https://fsffrance.org/dolibarr/compta/dons/
 
 ";
 ?>
diff --git a/htdocs/public/dons/navigation.fr.xsl b/htdocs/public/dons/navigation.fr.xsl
index 41f7e2cd5c3..f32138394d8 100644
--- a/htdocs/public/dons/navigation.fr.xsl
+++ b/htdocs/public/dons/navigation.fr.xsl
@@ -28,7 +28,7 @@
 	  <a href="http://eucd.info/images.fr.php">Images</a><br />
 	  <br />
 	  <br />
-	  <a href="http://dons.eucd.info/">Dons</a><br />	  
+	  <a href="https://dons.eucd.info/">Dons</a><br />	  
 	  <script language="php">
 	    if (file_exists ("therm.php"))
 	    {
diff --git a/htdocs/public/dons/therm.php b/htdocs/public/dons/therm.php
index 39e875099a7..36ed995960b 100644
--- a/htdocs/public/dons/therm.php
+++ b/htdocs/public/dons/therm.php
@@ -62,7 +62,7 @@ if (file_exists ($thermlib))
        */
       
       $conf = new Conf();
-      $dbt = new Db();
+      $dbt = new DoliDb();
       $dontherm = new Don($dbt);
       
       $actualValue = $dontherm->sum_actual();
diff --git a/htdocs/public/dons/valid.xhtml b/htdocs/public/dons/valid.xhtml
index bb06df441e7..6de8a56f11c 100644
--- a/htdocs/public/dons/valid.xhtml
+++ b/htdocs/public/dons/valid.xhtml
@@ -29,7 +29,7 @@
 
 	  <tr id="date">
 	    <script language="php">
-	      $a = setlocale("LC_TIME", "FRENCH");
+	      $a = setlocale(LC_TIME, "FRENCH");
 	      print strftime("%d %B %Y", time());
 	    </script>
 	  </tr>