diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index 8f819e58438..98e50bc813a 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -38,7 +38,7 @@ class modMyModule extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modMyModule($db)
+	function __construct($db)
 	{
         global $langs,$conf;
 
diff --git a/htdocs/accountancy/class/accountancyaccount.class.php b/htdocs/accountancy/class/accountancyaccount.class.php
index 3d5814d143a..f99f61e782c 100644
--- a/htdocs/accountancy/class/accountancyaccount.class.php
+++ b/htdocs/accountancy/class/accountancyaccount.class.php
@@ -43,11 +43,11 @@ class AccountancyAccount
     /**
      *  Constructor
      *
-     *  @param		DoliDB		$DB		Database handler
+     *  @param		DoliDB		$db		Database handler
      */
-    function AccountancyAccount($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
     }
 
 
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index 2c278030a62..c64ede9953a 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -42,11 +42,11 @@ class AccountancySystem
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function AccountancySystem($DB)
+	function __construct($db)
 	{
-		$this->db = $DB;
+		$this->db = $db;
 	}
 
 
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 83b2c24dbc5..20195bf073b 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -117,7 +117,7 @@ class Adherent extends CommonObject
 	 *
 	 *	@param 		DoliDB		$db		Database handler
      */
-    function Adherent($db)
+    function __construct($db)
     {
         $this->db = $db;
         $this->statut = -1;
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index aa08f2cbbe3..ea2a6489f5b 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -48,11 +48,11 @@ class AdherentType extends CommonObject
     /**
 	 *	Constructor
 	 *
-	 *	@param 		DoliDB		$DB		Database handler
+	 *	@param 		DoliDB		$db		Database handler
      */
-    function AdherentType($DB)
+    function __construct($db)
     {
-        $this->db = $DB ;
+        $this->db = $db;
         $this->statut = 1;
     }
 
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 0424b428f66..4db3884cdad 100755
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -51,7 +51,7 @@ class AdherentStats extends Stats
      * 	@param   	int			$userid    	Id user for filter
 	 * 	@return 	AdherentStats
 	 */
-	function AdherentStats($db, $socid=0, $userid=0)
+	function __construct($db, $socid=0, $userid=0)
 	{
 		global $user, $conf;
 
diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php
index 4a07b5dd9c9..eb4624a4c40 100644
--- a/htdocs/adherents/class/cotisation.class.php
+++ b/htdocs/adherents/class/cotisation.class.php
@@ -50,7 +50,7 @@ class Cotisation extends CommonObject
 	 *
 	 *	@param 		DoliDB		$db		Database handler
 	 */
-	function Cotisation($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index da441327e5b..638064fd1dd 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -36,6 +36,7 @@ require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
 $langs->load("admin");
 $langs->load("errors");
 $langs->load("orders");
+$langs->load('other');
 
 if (! $user->admin) accessforbidden();
 
@@ -289,7 +290,7 @@ foreach ($dirmodels as $reldir)
                         // Show example of numbering module
                         print '<td nowrap="nowrap">';
                         $tmp=$module->getExample();
-                        if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+                        if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
                         elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
index b71cdb76e2a..789884702c6 100644
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -27,6 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php");
 
 $langs->load("admin");
 $langs->load("donations");
+$langs->load('other');
 
 if (!$user->admin) accessforbidden();
 
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 3d0fac4c72b..1adc2ecc660 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -35,6 +35,7 @@ require_once(DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php');
 $langs->load("admin");
 $langs->load("sendings");
 $langs->load("deliveries");
+$langs->load('other');
 
 if (!$user->admin) accessforbidden();
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index f7e501635cb..eb88d57be98 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -32,6 +32,7 @@ require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');
 
 $langs->load("admin");
 $langs->load("errors");
+$langs->load('other');
 
 if (! $user->admin) accessforbidden();
 
@@ -368,7 +369,7 @@ foreach ($dirmodels as $reldir)
                             // Show example of numbering module
                             print '<td nowrap="nowrap">';
                             $tmp=$module->getExample();
-                            if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+                            if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
                             elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
                             else print $tmp;
                             print '</td>'."\n";
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index d2c93328129..4aac5a88fed 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -35,6 +35,7 @@ require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php');
 $langs->load("admin");
 $langs->load("errors");
 $langs->load("interventions");
+$langs->load('other');
 
 if (! $user->admin) accessforbidden();
 
@@ -251,7 +252,7 @@ foreach ($dirmodels as $reldir)
                         // Show example of numbering module
                         print '<td nowrap="nowrap">';
                         $tmp=$module->getExample();
-                        if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+                        if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
                         elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php
index 64abda9ce27..efc3b826b2a 100644
--- a/htdocs/admin/fournisseur.php
+++ b/htdocs/admin/fournisseur.php
@@ -34,6 +34,7 @@ require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php');
 
 $langs->load("admin");
+$langs->load('other');
 
 if (!$user->admin)
 accessforbidden();
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 01b60b15c97..f23b73a766d 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -34,6 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php");
 $langs->load("admin");
 $langs->load("sendings");
 $langs->load("deliveries");
+$langs->load('other');
 
 if (!$user->admin) accessforbidden();
 
diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php
index b50c14918c6..ad67ba3a317 100644
--- a/htdocs/admin/project.php
+++ b/htdocs/admin/project.php
@@ -216,7 +216,7 @@ foreach ($dirmodels as $reldir)
 						// Show example of numbering module
 						print '<td nowrap="nowrap">';
 						$tmp=$module->getExample();
-						if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+						if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
 						elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index babbfa8ad32..1d9a4e919a2 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -34,6 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
 
 $langs->load("admin");
 $langs->load("errors");
+$langs->load('other');
 
 if (! $user->admin) accessforbidden();
 
@@ -274,7 +275,7 @@ foreach ($dirmodels as $reldir)
                         // Show example of numbering module
                         print '<td nowrap="nowrap">';
                         $tmp=$module->getExample();
-                        if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+                        if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
                         elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index aa835cdd96e..a24d7f38d89 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -187,7 +187,7 @@ $var=!$var;
 print '<tr '.$bc[$var].'><td width="140"><input '.$bc[$var].' type="checkbox" name="SYSLOG_SYSLOG_ON" '.$option.' value="1" '.($syslog_syslog_on?' checked="checked"':'').'> '.$langs->trans("SyslogSyslog").'</td>';
 print '<td nowrap="nowrap">'.$langs->trans("SyslogFacility").': <input type="text" class="flat" name="facility" '.$option.' value="'.$defaultsyslogfacility.'">';
 print '</td>';
-print "<td align=\"left\">".$form->textwithpicto('','Only LOG_USER supported on Windows');
+print "<td align=\"left\">".$form->textwithpicto('', $langs->trans('OnlyWindowsLOG_USER'));
 print '</td></tr>';
 
 try
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index d0f6ffecefe..57fab93dc40 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -63,17 +63,17 @@ ob_start();
 
 if ($_GET["what"] == 'conf')
 {
-	$title=$langs->trans("Setup");
+	$title = 'Setup';
 	phpinfo(INFO_CONFIGURATION);
 }
 elseif ($_GET["what"] == 'env')
 {
-	$title=$langs->trans("OSEnv");
+	$title = 'OSEnv';
 	phpinfo(INFO_ENVIRONMENT);
 }
 elseif ($_GET["what"] == 'modules')
 {
-	$title=$langs->trans("Modules");
+	$title = 'Modules';
 	phpinfo(INFO_MODULES);
 }
 else
@@ -85,37 +85,29 @@ $chaine = ob_get_contents();
 ob_end_clean();
 
 // Nettoie la sortie php pour inclusion dans une page deja existante
-$chaine = preg_replace('/background-color: #ffffff;/i','',$chaine);
-$chaine = preg_replace('/(.*)<style/i','<style',$chaine);
-$chaine = preg_replace('/<title>(.*)<body>/i','',$chaine);
-$chaine = preg_replace('/a:link \{([^\}]*)\}/i','',$chaine);
-$chaine = preg_replace('/a:hover \{([^\}]*)\}/i','',$chaine);
-$chaine = preg_replace('/td, th \{([^\}]*)\}/i','',$chaine);
-$chaine = preg_replace('/img \{([^\}]*)\}/i','',$chaine);
+$chaine = preg_replace('/^<!DOCTYPE(.*)<div class="center">/ims', '', $chaine);
+$chaine = preg_replace('/<\/div><\/body><\/html>$/im', '', $chaine);
 $chaine = preg_replace('/table(.*)important; \}/i','',$chaine);
-$chaine = preg_replace('/<hr \/>/i','',$chaine);
-$chaine = preg_replace('/<\/body><\/html>/i','',$chaine);
-$chaine = preg_replace('/body, td, th, h1, h2 \{font-family: sans-serif;\}/i','',$chaine);
-$chaine = preg_replace('/cellpadding="3" /i','cellpadding="1" cellspacing="1" ',$chaine);
-$chaine = preg_replace('/class="h"/i','class="liste_titre"',$chaine);
-$chaine = preg_replace('/<th colspan="2">/i','<td>',$chaine);
-$chaine = preg_replace('/th>/i','td>',$chaine);
+$chaine = str_replace('<hr />', '', $chaine);
+$chaine = str_replace('cellpadding="3" ', 'cellpadding="1" cellspacing="1" ', $chaine);
+$chaine = str_replace('class="h"','class="liste_titre"', $chaine);
+$chaine = str_replace('<th colspan="2">', '<td>', $chaine);
+$chaine = str_replace('th>', 'td>', $chaine);
 // Titles
 $chaine = preg_replace('/<h1([^>]*)>/i','<div class="titre">',$chaine);
-$chaine = preg_replace('/<h2>/i','<div class="titre">',$chaine);
-$chaine = preg_replace('/<\/h1>/i','</div><br>',$chaine);
-$chaine = preg_replace('/<\/h2>/i','</div>',$chaine);
+$chaine = str_replace('<h2>', '<div class="titre">', $chaine);
+$chaine = str_replace('</h1>', '</div><br>', $chaine);
+$chaine = str_replace('</h2>', '</div>', $chaine);
 
-$chaine = preg_replace('/<td class="e">/i','<td class="impair">',$chaine);
-$chaine = preg_replace('/<td class="v">/i','<td class="pair">',$chaine);
-
-$chaine = preg_replace('/<div class="titre">Configuration<\/div><br>/i','',$chaine);
+$chaine = str_replace('<td class="e">', '<td class="impair">', $chaine);
+$chaine = str_replace('<td class="v">', '<td class="pair">', $chaine);
+$chaine = str_replace('<div class="titre">Configuration</div><br>', '', $chaine);
 // Add LF
 $chaine = preg_replace('/(pcntl_[a-z]+),/','$1, ',$chaine);
 
 if (isset($title))
 {
-	print_fiche_titre($title,'','setup');
+	print_fiche_titre($langs->trans($title), '', 'setup');
 	print '<br>';
 }
 
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index d3d30d7c723..088d4751d2e 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -45,7 +45,7 @@ class Bookmark
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function Bookmark($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/boutique/client/class/boutiqueclient.class.php b/htdocs/boutique/client/class/boutiqueclient.class.php
index a84b81ed6a7..bc404113b1d 100644
--- a/htdocs/boutique/client/class/boutiqueclient.class.php
+++ b/htdocs/boutique/client/class/boutiqueclient.class.php
@@ -39,7 +39,7 @@ class BoutiqueClient
 	 *
 	 * 	@param		DoliDB	$db		Database handler
 	 */
-    function BoutiqueClient($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php
index 143a4e3f1ad..cb049194fd1 100644
--- a/htdocs/boutique/commande/class/boutiquecommande.class.php
+++ b/htdocs/boutique/commande/class/boutiquecommande.class.php
@@ -43,7 +43,7 @@ class BoutiqueCommande
      *
      * @param	DoliDB	$db		Database handler
      */
-    function BoutiqueCommande($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/boutique/critiques/class/critique.class.php b/htdocs/boutique/critiques/class/critique.class.php
index eca4877b0ed..9bf1ff22dc9 100644
--- a/htdocs/boutique/critiques/class/critique.class.php
+++ b/htdocs/boutique/critiques/class/critique.class.php
@@ -37,7 +37,7 @@ class Critique
 	 *
 	 * @param	DoliDB		$db		Database handler
 	 */
-	function Critique($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/boutique/promotion/class/promotion.class.php b/htdocs/boutique/promotion/class/promotion.class.php
index 5631f30207c..be27ea78a9d 100644
--- a/htdocs/boutique/promotion/class/promotion.class.php
+++ b/htdocs/boutique/promotion/class/promotion.class.php
@@ -43,7 +43,7 @@ class Promotion
 	 *
 	 * 	@param		DoliDB		$db		Database handler
 	 */
-	function Promotion($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
index 7eec78ebd32..b625eccd28e 100644
--- a/htdocs/cashdesk/class/Auth.class.php
+++ b/htdocs/cashdesk/class/Auth.class.php
@@ -34,12 +34,12 @@ class Auth
 	/**
 	 * Enter description here ...
 	 *
-	 * @param	DoliDB	$DB			Database handler
+	 * @param	DoliDB	$db			Database handler
 	 * @return	void
 	 */
-	function Auth($DB)
+	function __construct($db)
 	{
-		$this->db = $DB;
+		$this->db = $db;
 		$this->reponse(null);
 	}
 
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index eff1cfbf590..19d7bba3914 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -72,7 +72,7 @@ class Facturation
     /**
      *	Constructor
      */
-    public function Facturation()
+    public function __construct()
     {
         $this->raz();
         $this->razPers();
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 938f8b77680..966b0f25d7b 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -84,7 +84,7 @@ class ActionComm extends CommonObject
      *
      *      @param		DoliDB		$db      Database handler
      */
-    function ActionComm($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 4c140b4abd8..ba9f8658784 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -47,7 +47,7 @@ class CActionComm
      *
      *  @param	DoliDB		$db		Database handler
      */
-    function CActionComm($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index cd721792c61..36da9e9840a 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -122,7 +122,7 @@ class Propal extends CommonObject
      *	@param      int		$socid		Id third party
      *	@param      int		$propalid   Id proposal
      */
-    function Propal($db, $socid="", $propalid=0)
+    function __construct($db, $socid="", $propalid=0)
     {
         global $conf,$langs;
 
@@ -2508,11 +2508,11 @@ class PropaleLigne
     /**
      * 	Class line Contructor
      *
-     * 	@param	DoliDB	$DB	Database handler
+     * 	@param	DoliDB	$db	Database handler
      */
-    function PropaleLigne($DB)
+    function __construct($db)
     {
-        $this->db= $DB;
+        $this->db= $db;
     }
 
     /**
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index 28feac26022..7c3b0c27eb0 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -47,15 +47,15 @@ class PropaleStats extends Stats
 	/**
 	 * Constructor
 	 *
-	 * @param 	DoliDB	$DB		   Database handler
+	 * @param 	DoliDB	$db		   Database handler
 	 * @param 	int		$socid	   Id third party
      * @param   int		$userid    Id user for filter
 	 */
-	function PropaleStats($DB, $socid=0, $userid=0)
+	function __construct($db, $socid=0, $userid=0)
 	{
 		global $user, $conf;
 
-		$this->db = $DB;
+		$this->db = $db;
         $this->socid = $socid;
         $this->userid = $userid;
 
diff --git a/htdocs/comm/prospect/class/prospect.class.php b/htdocs/comm/prospect/class/prospect.class.php
index f4813d96da8..b6ce9b07032 100644
--- a/htdocs/comm/prospect/class/prospect.class.php
+++ b/htdocs/comm/prospect/class/prospect.class.php
@@ -39,7 +39,7 @@ class Prospect extends Societe
      *
      *	@param	DoliDB	$db		Databas handler
      */
-    function Prospect($db)
+    function __construct($db)
     {
         global $config;
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 226751306db..031bd143db6 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2867,11 +2867,11 @@ class OrderLine
     /**
      *      Constructor
      *
-     *      @param     DoliDB	$DB      handler d'acces base de donnee
+     *      @param     DoliDB	$db      handler d'acces base de donnee
      */
-    function OrderLine($DB)
+    function __construct($db)
     {
-        $this->db= $DB;
+        $this->db= $db;
     }
 
     /**
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 5221b01fe1b..d531c5da6c5 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -50,7 +50,7 @@ class CommandeStats extends Stats
 	 * @param 	string	$mode	   Option
 	 * @param   int		$userid    Id user for filter
 	 */
-	function CommandeStats($db, $socid, $mode, $userid=0)
+	function __construct($db, $socid, $mode, $userid=0)
 	{
 		global $user, $conf;
 
diff --git a/htdocs/commissions/index.php b/htdocs/commissions/index.php
index c6988f19b8d..d7e024990d0 100644
--- a/htdocs/commissions/index.php
+++ b/htdocs/commissions/index.php
@@ -77,7 +77,7 @@ if ($agentid > 0) {
 
       print '<tr><td width="20%">'.$langs->trans('CommercialAgent').'</td>';
       print '<td colspan="4">';
-      print $form->select_dolusers($selected=$agentid,$htmlname='agentid',$show_empty=1,$exclude='',$disabled=0,$include='',$enableonly='');
+      print $form->select_dolusers($agentid,'agentid',1,'',0,'','');
       print '</td></tr>';
 
       if (! $sortorder) $sortorder="ASC";
@@ -86,7 +86,7 @@ if ($agentid > 0) {
 else {
   print '<tr><td width="20%">'.$langs->trans('CommercialAgent').'</td>';
   print '<td colspan="4">';
-  print $form->select_dolusers($selected='',$htmlname='agentid',$show_empty=1,$exclude='',$disabled=0,$include='',$enableonly='');
+  print $form->select_dolusers('','agentid',1,'',0,'','');
    print '</td></tr>';
   if (! $sortorder) $sortorder="ASC";
   if (! $sortfield) $sortfield="u.login";
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 2811c803486..2ca362f4696 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -990,13 +990,13 @@ class Account extends CommonObject
         return 0;
     }
 
-    /**
+    /**
      *	Load miscellaneous information for tab "Info"
      *
      *	@param  int		$id		Id of object to load
      *	@return	void
-     */
-    function info($id)
+     */
+    function info($id)
     {
 
     }
@@ -1068,7 +1068,7 @@ class AccountLine extends CommonObject
      *
      *  @param	DoliDB	$db		Database handler
      */
-    function AccountLine($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 4bcc156c417..c8efd9c883e 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -46,11 +46,11 @@ class BankCateg // extends CommonObject
     /**
      *	Constructor
      *
-     *  @param		DoliDB		$DB      Database handler
+     *  @param		DoliDB		$db      Database handler
      */
-    function BankCateg($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
         return 1;
     }
 
diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php
index 68a8608fd09..f41a8c663cf 100644
--- a/htdocs/compta/deplacement/class/deplacementstats.class.php
+++ b/htdocs/compta/deplacement/class/deplacementstats.class.php
@@ -48,7 +48,7 @@ class DeplacementStats extends Stats
      * @param   int			$userid    Id user for filter
 	 * @return 	void
 	 */
-	function DeplacementStats($db, $socid=0, $userid=0)
+	function __construct($db, $socid=0, $userid=0)
 	{
 		global $conf;
 
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 1fe0e9549ac..7c828beffb3 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -54,7 +54,7 @@ $limit = $conf->liste_limit;
 
 $tripandexpense_static=new Deplacement($db);
 
-//$help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Subvenciones';
+//$help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones';
 $help_url='';
 llxHeader('',$langs->trans("ListOfFees"),$help_url);
 
diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php
index 075200bccf3..5c5a9a10439 100644
--- a/htdocs/compta/dons/class/don.class.php
+++ b/htdocs/compta/dons/class/don.class.php
@@ -58,13 +58,13 @@ class Don extends CommonObject
     /**
      *  Constructor
      *
-     *  @param	DoliDB	$DB		Database handler
+     *  @param	DoliDB	$db 	Database handler
      */
-    function Don($DB)
+    function __construct($db)
     {
         global $langs;
 
-        $this->db = $DB ;
+        $this->db = $db;
         $this->modepaiementid = 0;
 
         $langs->load("donations");
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
index 0a8e57eb880..422a20ae1a7 100644
--- a/htdocs/compta/dons/fiche.php
+++ b/htdocs/compta/dons/fiche.php
@@ -249,7 +249,7 @@ if ($action == 'builddoc')
  * View
  */
 
-llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Subvenciones');
+llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
 
 $form=new Form($db);
 $formfile = new FormFile($db);
diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php
index 39de537cd3e..40bd2e1e843 100644
--- a/htdocs/compta/dons/index.php
+++ b/htdocs/compta/dons/index.php
@@ -47,7 +47,7 @@ $donation_static=new Don($db);
 
 $donstatic=new Don($db);
 
-$help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Subvenciones';
+$help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones';
 llxHeader('',$langs->trans("Donations"),$help_url);
 
 $nb=array();
diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php
index f3ede273760..8c733a150a4 100644
--- a/htdocs/compta/dons/liste.php
+++ b/htdocs/compta/dons/liste.php
@@ -55,7 +55,7 @@ if (!$user->rights->don->lire) accessforbidden();
 
 if ($conf->projet->enabled) $projectstatic=new Project($db);
 
-llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Subvenciones');
+llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
 
 $donationstatic=new Don($db);
 
diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php
index 369e9a7a785..08fc93a686b 100644
--- a/htdocs/compta/dons/stats.php
+++ b/htdocs/compta/dons/stats.php
@@ -33,7 +33,7 @@ if (!$user->rights->don->lire) accessforbidden();
  * View
  */
 
-llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Subvenciones');
+llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
 
 
 print_fiche_titre($langs->trans("Statistics"));
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index daa0aab3215..1b19a2205f9 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -68,11 +68,11 @@ class FactureRec extends Facture
 	/**
 	 *	Constructor
 	 *
-	 * 	@param		DoliDB		$DB		Database handler
+	 * 	@param		DoliDB		$db		Database handler
 	 */
-	function FactureRec($DB)
+	function __construct($db)
 	{
-		$this->db = $DB ;
+		$this->db = $db;
 	}
 
 	/**
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index a81f9c81a25..33660eee17b 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -115,7 +115,7 @@ class Facture extends CommonInvoice
      *
 	 * 	@param	DoliDB		$db			Database handler
      */
-    function Facture($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
@@ -3160,7 +3160,7 @@ class FactureLigne
      *
      *  @param	DoliDB		$db		Database handler
      */
-    function FactureLigne($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index fcbd5a99708..c56183ca777 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -51,7 +51,7 @@ class FactureStats extends Stats
      * 	@param	int			$userid    	Id user for filter
 	 * 	@return FactureStats
 	 */
-	function FactureStats($db, $socid, $mode, $userid=0)
+	function __construct($db, $socid, $mode, $userid=0)
 	{
 		global $conf;
 
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 84a14f614fb..ba5dc74c734 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -53,11 +53,11 @@ class PaymentTerm // extends CommonObject
     /**
      * 	Constructor
      *
-	 * 	@param	DoliDB		$DB			Database handler
+	 * 	@param	DoliDB		$db			Database handler
      */
-    function PaymentTerm($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
         return 1;
     }
 
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 6c1ef48f957..99ae27599c0 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -45,11 +45,11 @@ class localtax extends CommonObject
     /**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
      */
-    function __construct($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
     }
 
 
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 2cfede23c7c..6f7e231d90c 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -45,9 +45,9 @@ class RemiseCheque extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function RemiseCheque($db)
+	function __construct($db)
 	{
-		$this->db = $DB;
+		$this->db = $db;
 		$this->next_id = 0;
 		$this->previous_id = 0;
 	}
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 86080fbc623..2e2abf4c79f 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -58,9 +58,9 @@ class Paiement extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Paiement($db)
+	function __construct($db)
 	{
-		$this->db = $db ;
+		$this->db = $db;
 	}
 
 	/**
diff --git a/htdocs/compta/prelevement/class/bon-prelevement.class.php b/htdocs/compta/prelevement/class/bon-prelevement.class.php
index 557f72771f2..9fd3029437d 100644
--- a/htdocs/compta/prelevement/class/bon-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/bon-prelevement.class.php
@@ -56,7 +56,7 @@ class BonPrelevement extends CommonObject
      *  @param		DoliDB		$db      	Database handler
      *  @param		string		$filename	Filename of withdraw receipt
      */
-    function BonPrelevement($db, $filename='')
+    function __construct($db, $filename='')
     {
         global $conf,$langs;
 
diff --git a/htdocs/compta/prelevement/class/ligne-prelevement.class.php b/htdocs/compta/prelevement/class/ligne-prelevement.class.php
index b372d274f15..c3231f07acb 100644
--- a/htdocs/compta/prelevement/class/ligne-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligne-prelevement.class.php
@@ -44,7 +44,7 @@ class LignePrelevement
 	 *  @param	DoliDb	$db			Database handler
 	 *  @param 	User	$user       Objet user
 	 */
-	function LignePrelevement($db, $user)
+	function __construct($db, $user)
 	{
 		global $conf,$langs;
 
diff --git a/htdocs/compta/prelevement/class/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejet-prelevement.class.php
index 1d8737d6cff..b6f8a967f10 100644
--- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejet-prelevement.class.php
@@ -41,7 +41,7 @@ class RejetPrelevement
 	 *  @param	DoliDb	$db			Database handler
 	 *  @param 	User	$user       Objet user
 	 */
-	function RejetPrelevement($db, $user)
+	function __construct($db, $user)
 	{
 		global $langs;
 
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 8c3d25644b3..26cff9343f5 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -52,7 +52,7 @@ class ChargeSociales extends CommonObject
      *
      * @param	DoliDB		$db		Database handler
      */
-    function ChargeSociales($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 5a3b63bb89e..25f50e4a7e0 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -54,7 +54,7 @@ class PaymentSocialContribution extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function PaymentSocialContribution($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 0f141549ab1..6dd3183e02d 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -55,11 +55,11 @@ class Tva extends CommonObject
     /**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
      */
-    function Tva($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
         return 1;
     }
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 6e03e4c5eae..60873f86a32 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -90,7 +90,7 @@ class Contact extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Contact($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 4d26149de64..9aaa124fa45 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -72,7 +72,7 @@ class Contrat extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Contrat($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
@@ -1621,7 +1621,7 @@ class ContratLigne
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function ContratLigne($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index c4b10f1bf02..41d74fdebee 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -45,7 +45,7 @@ class box_actions extends ModeleBoxes
 	/**
 	 *  Constructor
 	 */
-	function box_actions()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 253b0b4800c..b1364b2bba2 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -41,7 +41,7 @@ class box_activity extends ModeleBoxes
 	/**
 	 *	Constructor
 	 */
-	function box_activity()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index bda9ccaeeb1..0be97f83a4c 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -41,7 +41,7 @@ class box_bookmarks extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_bookmarks()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 8b087463e83..a0ab16baf0e 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -45,7 +45,7 @@ class box_clients extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_clients()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index a54d2eda2ba..f89e37f191e 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -45,7 +45,7 @@ class box_commandes extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_commandes()
+    function __construct()
     {
         global $langs;
         $langs->load("boxes");
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index e23f51971c4..390dbe52ac2 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -46,7 +46,7 @@ class box_comptes extends ModeleBoxes
 	/**
 	 *  Constructor
 	 */
-	function box_comptes()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 78100419cbf..577ef3262ff 100755
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -46,7 +46,7 @@ class box_contacts extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_contacts()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index d0267bfb0f4..57cc7eafaa1 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -44,7 +44,7 @@ class box_contracts extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_contracts()
+    function __construct()
     {
     	global $langs;
 
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 51f197ec3fd..cceaafa5985 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -50,7 +50,7 @@ class box_external_rss extends ModeleBoxes
      * 	@param	DoliDB	$db			Database handler
      *  @param	string	$param		More parameters
      */
-    function box_external_rss($db,$param)
+    function __construct($db,$param)
     {
         global $langs;
         $langs->load("boxes");
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 736c13ce88a..ee8e01a24f8 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -44,7 +44,7 @@ class box_factures extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_factures()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 45cccf95a97..eb3cf5e67c9 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -44,7 +44,7 @@ class box_factures_fourn extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_factures_fourn()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 571d3c3e558..fc167601cc6 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -44,7 +44,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_factures_fourn_imp()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 70487fca5ad..0aaf343d876 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -47,7 +47,7 @@ class box_factures_imp extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_factures_imp()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 0b275f25e4d..bb9a4adbfa6 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -44,7 +44,7 @@ class box_fournisseurs extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_fournisseurs()
+    function __construct()
     {
         global $langs;
         $langs->load("boxes");
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index d1fc2b2e78b..e64649ec1fd 100755
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -45,7 +45,7 @@ class box_members extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_members()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_osc_client.php b/htdocs/core/boxes/box_osc_client.php
index c2a4a0d00ea..e19ef1c0169 100644
--- a/htdocs/core/boxes/box_osc_client.php
+++ b/htdocs/core/boxes/box_osc_client.php
@@ -44,7 +44,7 @@ class box_osc_clients extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_osc_clients()
+    function __construct()
     {
         global $langs;
         $langs->load("boxes");
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 10d85f10cda..a75cbf15991 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -47,7 +47,7 @@ class box_produits extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_produits()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 9f818bc63f7..9f9bd706ac0 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -46,7 +46,7 @@ class box_propales extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_propales()
+    function __construct()
     {
     	global $langs;
       $langs->load("boxes");
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 87d2324013e..4251b9f1953 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -49,7 +49,7 @@ class box_prospect extends ModeleBoxes
      *
      *  @param	DoliDB	$db		Database handler
 	 */
-	function box_prospect($db)
+	function __construct($db)
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 646be1ca90c..bd1686da45a 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -45,7 +45,7 @@ class box_services_contracts extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_services_contracts()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index b8a42fe8f03..bcb31e96464 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -45,7 +45,7 @@ class box_services_expired extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_services_expired()
+    function __construct()
     {
     	global $langs;
 
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index aa310118fd9..6577cb432cf 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -43,7 +43,7 @@ class box_supplier_orders extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_supplier_orders()
+    function __construct()
     {
         global $langs;
         $langs->load("boxes");
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index da6ee0cf31b..12aadcf4a94 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -48,7 +48,7 @@ class ModeleBoxes    // Can't be abtract as it is instanciated to build "empty"
 	 *
 	 *	@param	DoliDB		$db		Database hanlder
 	 */
-	function ModeleBoxes($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 2c5fca61300..e4d387395a4 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -98,7 +98,7 @@ class CMailFile
 	 *	@param 	string	$errors_to      		Email errors
 	 *	@param	string	$css			        Css option
 	 */
-	function CMailFile($subject,$to,$from,$msg,
+	function __construct($subject,$to,$from,$msg,
 	$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),
 	$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='')
 	{
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index c771f130a2b..1f7fa7c5258 100755
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -58,7 +58,7 @@ class CSMSFile
 	 *	@param 	int		$class				Class
 	 *	@return	int
 	 */
-	function CSMSFile($to,$from,$msg,$deliveryreceipt=0,$deferred=0,$priority=3,$class=1)
+	function __construct($to,$from,$msg,$deliveryreceipt=0,$deferred=0,$priority=3,$class=1)
 	{
 		global $conf;
 
diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
index 7fa522d2037..cd2dc5c1e6c 100644
--- a/htdocs/core/class/antivir.class.php
+++ b/htdocs/core/class/antivir.class.php
@@ -42,7 +42,7 @@ class AntiVir
 	 *  @param      DoliDB		$db      Database handler
 	 *	@return AntiVir
 	 */
-	function AntiVir($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 2841baa79f0..be2fdce15fd 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -75,7 +75,7 @@ class Conf
 	 *
 	 * @return Conf
 	 */
-	function Conf()
+	function __construct()
 	{
 		// Avoid warnings when filling this->xxx
 		$this->file				= (object) array();
diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php
index 88dda14020c..df8e53c2c74 100644
--- a/htdocs/core/class/cookie.class.php
+++ b/htdocs/core/class/cookie.class.php
@@ -43,7 +43,7 @@ class DolCookie
 	 *
 	 *  @param      string		$key      Personnal key
 	 */
-	function DolCookie($key = '')
+	function __construct($key = '')
 	{
 		$this->myKey = $key;
 		$this->cookiearray = array();
diff --git a/htdocs/core/class/cpays.class.php b/htdocs/core/class/cpays.class.php
index ec3283d73ce..8287a2d6f1b 100644
--- a/htdocs/core/class/cpays.class.php
+++ b/htdocs/core/class/cpays.class.php
@@ -54,7 +54,7 @@ class Cpays // extends CommonObject
      *
      *  @param      DoliDb		$db      Database handler
      */
-    function Cpays($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 66c4bbefc03..b91943d146f 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -49,7 +49,7 @@ class Ctypent // extends CommonObject
      *
      *  @param      DoliDb		$db      Database handler
      */
-    function Ctypent($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index ff065db2bae..597e2aae86f 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -49,11 +49,11 @@ class DiscountAbsolute
     /**
      *	Constructor
      *
-     *  @param  	DoliDB		$DB		Database handler
+     *  @param  	DoliDB		$db		Database handler
      */
-    function DiscountAbsolute($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
     }
 
 
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index d6d1bd86539..3a7382c44ce 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -61,7 +61,7 @@ class DolEditor
      *      @param  int		$rows                   Size of rows for textarea tool
 	 *      @param  int		$cols                   Size of cols for textarea tool
 	 */
-    function DolEditor($htmlname,$content,$width='',$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true,$okforextendededitor=true,$rows=0,$cols=0)
+    function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true,$okforextendededitor=true,$rows=0,$cols=0)
     {
     	global $conf,$langs;
 
diff --git a/htdocs/core/class/dolexception.class.php b/htdocs/core/class/dolexception.class.php
index ef8e2cc2934..15fe1e7e74d 100644
--- a/htdocs/core/class/dolexception.class.php
+++ b/htdocs/core/class/dolexception.class.php
@@ -30,7 +30,7 @@ class DolException extends Exception
     /**
      * Constructor
      */
-    function DolException()
+    function __construct()
     {
     }
 }
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 7ffb72308da..2fb677aeffe 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -42,7 +42,7 @@ class DolGeoIP
 	 * @param	string	$datfile	Data file
 	 * @return 	GeoIP
 	 */
-	function DolGeoIP($type,$datfile)
+	function __construct($type,$datfile)
 	{
 		if ($type == 'country')
 		{
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 68571f50066..cd82c00e0e6 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -82,7 +82,7 @@ class DolGraph
     /**
      * Constructor
      */
-    function DolGraph()
+    function __construct()
     {
         global $conf;
         global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 5f6ad7de21c..78fd96de911 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -90,7 +90,7 @@ class Events // extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Events($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		return 1;
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index d3add99deac..70b51714aef 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -48,7 +48,7 @@ class ExtraFields
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function ExtraFields($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->error = array();
diff --git a/htdocs/core/class/google.class.php b/htdocs/core/class/google.class.php
index 04bbe4c8584..539dae89002 100644
--- a/htdocs/core/class/google.class.php
+++ b/htdocs/core/class/google.class.php
@@ -38,7 +38,7 @@ class GoogleAPI
 	 * @param	string		$key		Google key
 	 * @return 	GoogleAPI
 	 */
-	function GoogleAPI($db,$key)
+	function __construct($db,$key)
 	{
 		$this->db=$db;
 		$this->key=$key;
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index efb5fde0093..5fa1997d557 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -38,7 +38,7 @@ class FormActions
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function FormActions($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index ae720402274..72035349706 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -38,7 +38,7 @@ class FormAdmin
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function FormAdmin($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		return 1;
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index c7b6bab3a0c..563fc4b00e7 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -37,7 +37,7 @@ class FormBarCode
      *
      *	@param	DoliDB		$db		Database handler
      */
-    function FormBarCode($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index bc578601a1d..06a889afb17 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -39,7 +39,7 @@ class FormCompany
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function FormCompany($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 979fb0ab5db..8cc95621df6 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -40,7 +40,7 @@ class FormFile
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function FormFile($db)
+    function __construct($db)
     {
         $this->db = $db;
         $this->numoffiles=0;
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f9913b92906..8347725fd32 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -74,7 +74,7 @@ class FormMail
      *
      *  @param	DoliDB	$db      Database handler
      */
-    function FormMail($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index 0b2e6a999df..8f723de978a 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -38,7 +38,7 @@ class FormOrder
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function FormOrder($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		return 1;
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 838ff19570b..2625b4aef5c 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -46,7 +46,7 @@ class FormOther
      *
      *	@param	DoliDB		$db      Database handler
      */
-    function FormOther($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 0337578eb39..996476c7960 100755
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -64,7 +64,7 @@ class FormSms
      *
      *  @param		DoliDB		$db      Database handler
      */
-    function FormSms($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 8a20803a9e8..f6892455301 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -38,7 +38,7 @@ class Interfaces
      *
      *  @param		DoliDB		$db      Database handler
      */
-    function Interfaces($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index cde57a97053..6443c98b3d6 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -33,7 +33,7 @@ class Menu
     /**
 	 *	Constructor
      */
-    function Menu()
+    function __construct()
     {
       	$this->liste = array();
     }
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 852be332686..8ede3620bd8 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -61,7 +61,7 @@ class Menubase
      *  @param     	string		$menu_handler	Menu handler
      *  @param     	string		$type			Type
      */
-    function Menubase($db,$menu_handler='',$type='')
+    function __construct($db,$menu_handler='',$type='')
     {
         $this->db = $db;
         $this->menu_handler = $menu_handler;
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 5281c89a2c0..8cff2f5252c 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -47,7 +47,7 @@ class Notify
 	 *
 	 *	@param 		DoliDB		$db		Database handler
      */
-    function Notify($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 06d3eb057c4..c3af2d046b4 100755
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -146,7 +146,7 @@ class RssParser
      *
      *  @param		DoliDB		$db      Database handler
      */
-    public function RssParser($db)
+    public function __construct($db)
     {
         $this->db=$db;
     }
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 6372e2a78ca..050d5a3d4df 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -49,7 +49,7 @@ class Translate
 	 *  @param	string	$dir            Force directory that contains /langs subdirectory (value is sometine '..' like into install/* pages or support/* pages).
 	 *  @param  Conf	$conf			Object with Dolibarr configuration
 	 */
-	function Translate($dir,$conf)
+	function __construct($dir,$conf)
 	{
 		if (! empty($conf->file->character_set_client)) $this->charset_output=$conf->file->character_set_client;	// If charset output is forced
 		if ($dir) $this->dir=array($dir);
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
index 6e60bd29b87..e81f59c3e67 100644
--- a/htdocs/core/db/mssql.class.php
+++ b/htdocs/core/db/mssql.class.php
@@ -80,7 +80,7 @@ class DoliDBMssql
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
      */
-	function DoliDBMssql($type, $host, $user, $pass, $name='', $port=0)
+	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
 		global $conf,$langs;
 
diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php
index 76825a2d08a..8d6b08d90de 100644
--- a/htdocs/core/db/mysql.class.php
+++ b/htdocs/core/db/mysql.class.php
@@ -80,7 +80,7 @@ class DoliDBMysql
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
 	 */
-	function DoliDBMysql($type, $host, $user, $pass, $name='', $port=0)
+	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
 		global $conf,$langs;
 
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 4dde08c9775..3db424d4db2 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -80,7 +80,7 @@ class DoliDBMysqli
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
      */
-    function DoliDBMysqli($type, $host, $user, $pass, $name='', $port=0)
+    function __construct($type, $host, $user, $pass, $name='', $port=0)
     {
         global $conf,$langs;
 
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index d43aee672ca..0992a97a68f 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -77,7 +77,7 @@ class DoliDBPgsql
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
 	 */
-	function DoliDBPgsql($type, $host, $user, $pass, $name='', $port=0)
+	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
 		global $conf,$langs;
 
diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index f7f72475fbe..8f63f701ea1 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -80,7 +80,7 @@ class DoliDBSqlite
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
      */
-    function DoliDBSqlite($type, $host, $user, $pass, $name='', $port=0)
+    function __construct($type, $host, $user, $pass, $name='', $port=0)
     {
         global $conf,$langs;
 
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 952b386643a..c1e6b32ba61 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1045,9 +1045,9 @@ function form_constantes($tableau)
             print '<input type="hidden" name="constname" value="'.$const.'">';
             print '<input type="hidden" name="constnote" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
 
-            print $langs->trans("Desc".$const) != ("Desc".$const) ? $langs->trans("Desc".$const) : ($obj->note?$obj->note:$const);
+            print $langs->trans('Desc'.$const);
 
-            if ($const=='ADHERENT_MAILMAN_URL')
+            if ($const == 'ADHERENT_MAILMAN_URL')
             {
                 print '. '.$langs->trans("Example").': <a href="#" id="exampleclick1">'.img_down().'</a><br>';
                 //print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&subscribees=%EMAIL%&send_welcome_msg_to_this_batch=1';
@@ -1055,7 +1055,7 @@ function form_constantes($tableau)
                 print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members/add?subscribees_upload=%EMAIL%&amp;adminpw=%MAILMAN_ADMINPW%&amp;subscribe_or_invite=0&amp;send_welcome_msg_to_this_batch=0&amp;notification_to_list_owner=0';
                 print '</div>';
             }
-            if ($const=='ADHERENT_MAILMAN_UNSUB_URL')
+            if ($const == 'ADHERENT_MAILMAN_UNSUB_URL')
             {
                 print '. '.$langs->trans("Example").': <a href="#" id="exampleclick2">'.img_down().'</a><br>';
                 print '<div id="example2" class="hidden">';
@@ -1064,7 +1064,6 @@ function form_constantes($tableau)
                 //print 'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members/remove?adminpw=%MAILMAN_ADMINPW%&unsubscribees=%EMAIL%';
             }
 
-
             print "</td>\n";
 
             if ($const == 'ADHERENT_CARD_TYPE' || $const == 'ADHERENT_ETIQUETTE_TYPE')
diff --git a/htdocs/core/login/functions_myopenid.php b/htdocs/core/login/functions_myopenid.php
index 958e4a63a88..b1ceaf3e1eb 100644
--- a/htdocs/core/login/functions_myopenid.php
+++ b/htdocs/core/login/functions_myopenid.php
@@ -129,7 +129,7 @@ class SimpleOpenID
     /**
      * Constructor
      */
-    function SimpleOpenID()
+    function __construct()
     {
         if (!function_exists('curl_exec'))
         {
diff --git a/htdocs/core/menus/smartphone/smartphone_backoffice.php b/htdocs/core/menus/smartphone/smartphone_backoffice.php
index f19ac45351a..ef7a1270812 100755
--- a/htdocs/core/menus/smartphone/smartphone_backoffice.php
+++ b/htdocs/core/menus/smartphone/smartphone_backoffice.php
@@ -38,7 +38,7 @@ class MenuSmart
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function MenuSmart($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/menus/smartphone/smartphone_frontoffice.php b/htdocs/core/menus/smartphone/smartphone_frontoffice.php
index 521b7467d07..cc2a8fd775e 100755
--- a/htdocs/core/menus/smartphone/smartphone_frontoffice.php
+++ b/htdocs/core/menus/smartphone/smartphone_frontoffice.php
@@ -38,7 +38,7 @@ class MenuSmart
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function MenuSmart($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/menus/standard/auguria_backoffice.php b/htdocs/core/menus/standard/auguria_backoffice.php
index 244cb85bd9b..8de0f9b43a7 100644
--- a/htdocs/core/menus/standard/auguria_backoffice.php
+++ b/htdocs/core/menus/standard/auguria_backoffice.php
@@ -46,7 +46,7 @@ class MenuTop
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function MenuTop($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
@@ -84,7 +84,7 @@ class MenuLeft
      *  @param  array		&$menu_array    	Table of menu entries to show before entries of menu handler
      *  @param  array		&$menu_array_after  Table of menu entries to show after entries of menu handler
      */
-    function MenuLeft($db,&$menu_array,&$menu_array_after)
+    function __construct($db,&$menu_array,&$menu_array_after)
     {
         $this->db=$db;
         $this->menu_array=$menu_array;
diff --git a/htdocs/core/menus/standard/auguria_frontoffice.php b/htdocs/core/menus/standard/auguria_frontoffice.php
index 47532b7ae1b..8048d255960 100644
--- a/htdocs/core/menus/standard/auguria_frontoffice.php
+++ b/htdocs/core/menus/standard/auguria_frontoffice.php
@@ -44,7 +44,7 @@ class MenuTop
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function MenuTop($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
@@ -83,7 +83,7 @@ class MenuLeft
      *  @param  array		&$menu_array    	Table of menu entries to show before entries of menu handler
      *  @param  array		&$menu_array_after  Table of menu entries to show after entries of menu handler
      */
-    function MenuLeft($db,&$menu_array,&$menu_array_after)
+    function __construct($db,&$menu_array,&$menu_array_after)
     {
         $this->db=$db;
         $this->menu_array=$menu_array;
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index eca8486afeb..9a51e08ea37 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -687,20 +687,20 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
 
                 // System info
                 $newmenu->add("/admin/system/index.php?mainmenu=home&leftmenu=system", $langs->trans("SystemInfo"), 0, 1, '', $mainmenu, 'system');
-                if ($leftmenu=="system")
+                if ($leftmenu == 'system')
                 {
-                    $newmenu->add("/admin/system/dolibarr.php?mainmenu=home", $langs->trans("Dolibarr"),1);
-                    $newmenu->add("/admin/system/constall.php?mainmenu=home", $langs->trans("AllParameters"),2);
-                    $newmenu->add("/admin/system/modules.php?mainmenu=home", $langs->trans("Modules"),2);
-                    $newmenu->add("/admin/triggers.php?mainmenu=home", $langs->trans("Triggers"),2);
-                    $newmenu->add("/admin/system/about.php?mainmenu=home", $langs->trans("About"),2);
-                    $newmenu->add("/admin/system/os.php?mainmenu=home", $langs->trans("OS"),1);
-                    $newmenu->add("/admin/system/web.php?mainmenu=home", $langs->trans("WebServer"),1);
-                    $newmenu->add("/admin/system/phpinfo.php?mainmenu=home", $langs->trans("Php"),1);
-                    //if (function_exists('xdebug_is_enabled')) $newmenu->add("/admin/system/xdebug.php", $langs->trans("XDebug"),1);
-                    $newmenu->add("/admin/system/database.php?mainmenu=home", $langs->trans("Database"),1);
-                    $newmenu->add("/admin/system/database-tables.php?mainmenu=home", $langs->trans("Tables"),2);
-                    $newmenu->add("/admin/system/database-tables-contraintes.php?mainmenu=home", $langs->trans("Constraints"),2);
+                    $newmenu->add('/admin/system/dolibarr.php?mainmenu=home', $langs->trans('Dolibarr'), 1);
+                    $newmenu->add('/admin/system/constall.php?mainmenu=home', $langs->trans('AllParameters'), 2);
+                    $newmenu->add('/admin/system/modules.php?mainmenu=home', $langs->trans('Modules'), 2);
+                    $newmenu->add('/admin/triggers.php?mainmenu=home', $langs->trans('Triggers'), 2);
+                    $newmenu->add('/admin/system/about.php?mainmenu=home', $langs->trans('About'), 2);
+                    $newmenu->add('/admin/system/os.php?mainmenu=home', $langs->trans('OS'), 1);
+                    $newmenu->add('/admin/system/web.php?mainmenu=home', $langs->trans('WebServer'), 1);
+                    $newmenu->add('/admin/system/phpinfo.php?mainmenu=home', $langs->trans('PHP'), 1);
+                    //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1);
+                    $newmenu->add('/admin/system/database.php?mainmenu=home', $langs->trans('Database'), 1);
+                    $newmenu->add('/admin/system/database-tables.php?mainmenu=home', $langs->trans('Tables'), 2);
+                    $newmenu->add('/admin/system/database-tables-contraintes.php?mainmenu=home', $langs->trans('Constraints'), 2);
                 }
                 // System info
                 $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("SystemTools"), 0, 1, '', $mainmenu, 'admintools');
diff --git a/htdocs/core/menus/standard/eldy_backoffice.php b/htdocs/core/menus/standard/eldy_backoffice.php
index bdd49579a73..5f383288ae2 100644
--- a/htdocs/core/menus/standard/eldy_backoffice.php
+++ b/htdocs/core/menus/standard/eldy_backoffice.php
@@ -44,7 +44,7 @@ class MenuTop
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function MenuTop($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
@@ -83,7 +83,7 @@ class MenuLeft
      *  @param  array		&$menu_array    	Table of menu entries to show before entries of menu handler
      *  @param  array		&$menu_array_after  Table of menu entries to show after entries of menu handler
      */
-    function MenuLeft($db,&$menu_array,&$menu_array_after)
+    function __construct($db,&$menu_array,&$menu_array_after)
     {
         $this->db=$db;
         $this->menu_array=$menu_array;
diff --git a/htdocs/core/menus/standard/eldy_frontoffice.php b/htdocs/core/menus/standard/eldy_frontoffice.php
index 4c967b33a92..d78e138d88f 100644
--- a/htdocs/core/menus/standard/eldy_frontoffice.php
+++ b/htdocs/core/menus/standard/eldy_frontoffice.php
@@ -43,7 +43,7 @@ class MenuTop
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function MenuTop($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
@@ -81,7 +81,7 @@ class MenuLeft
      *  @param  array		&$menu_array    	Table of menu entries to show before entries of menu handler
      *  @param  array		&$menu_array_after  Table of menu entries to show after entries of menu handler
      */
-    function MenuLeft($db,&$menu_array,&$menu_array_after)
+    function __construct($db,&$menu_array,&$menu_array_after)
     {
         $this->db=$db;
         $this->menu_array=$menu_array;
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 957b3fe4a52..9382f6bb333 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -37,7 +37,7 @@ class MenuTop
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function MenuTop($db)
+    function __construct($db)
     {
         $this->db=$db;
     }
@@ -155,7 +155,7 @@ class MenuLeft
      *  @param  array		&$menu_array    	Table of menu entries to show before entries of menu handler
      *  @param  array		&$menu_array_after  Table of menu entries to show after entries of menu handler
      */
-    function MenuLeft($db,&$menu_array,&$menu_array_after)
+    function __construct($db,&$menu_array,&$menu_array_after)
     {
         $this->db=$db;
         $this->menu_array=$menu_array;
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 02c208bd54c..8f3ef317dfa 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -37,7 +37,7 @@ class html_cerfafr extends ModeleDon
      *
      *  @param      DoliDb		$db      Database handler
      */
-    function html_cerfafr($db)
+    function __construct($db)
     {
         global $conf,$langs;
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
index d22c561d156..b4aa4ba1f06 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
@@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
  *	\class      pdf_expedition_merou
  *	\brief      Classe permettant de generer les borderaux envoi au modele Merou
  */
-Class pdf_expedition_merou extends ModelePdfExpedition
+class pdf_expedition_merou extends ModelePdfExpedition
 {
 	var $emetteur;	// Objet societe qui emet
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
index 050e6bd5b83..af28a00399f 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
@@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
  *	\class      pdf_expedition_dorade
  *	\brief      Classe permettant de generer les borderaux envoi au modele Rouget
  */
-Class pdf_expedition_rouget extends ModelePdfExpedition
+class pdf_expedition_rouget extends ModelePdfExpedition
 {
 	var $emetteur;	// Objet societe qui emet
 
diff --git a/htdocs/core/modules/expedition/methode_expedition.modules.php b/htdocs/core/modules/expedition/methode_expedition.modules.php
index 1ad8bc4bbba..1a918c0fc3e 100644
--- a/htdocs/core/modules/expedition/methode_expedition.modules.php
+++ b/htdocs/core/modules/expedition/methode_expedition.modules.php
@@ -36,7 +36,7 @@ class ModeleShippingMethod
      *
      * @param	DoliDB		$db		Database handler
      */
-	function ModeleShippingMethod($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->name = "NOT DEFINED";
diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php
index 8783f305044..518f565cec5 100644
--- a/htdocs/core/modules/mailings/example.modules.php
+++ b/htdocs/core/modules/mailings/example.modules.php
@@ -42,11 +42,11 @@ class mailing_example extends MailingTargets
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-    function __construct($DB)
+    function __construct($db)
     {
-        $this->db=$DB;
+        $this->db=$db;
     }
 
 
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index e7635e808d6..57da94f1b9e 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -41,7 +41,7 @@ class MailingTargets    // This can't be abstract as it is used for some method
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function MailingTargets($db)
+	function __construct($db)
 	{
         $this->db = $db;
 	}
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 4fe5ea60f01..f04c436b2a1 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -41,7 +41,7 @@ class modAccounting extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modAccounting($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 767b8239afa..6b9de8fd21e 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -40,7 +40,7 @@ class modAdherent extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
      */
-    function modAdherent($db)
+    function __construct($db)
     {
         $this->db = $db;
         $this->numero = 310;
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 37cb02a7fa1..ad4b032a6f6 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -41,7 +41,7 @@ class modAgenda extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modAgenda($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 2400;
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index 8d726d7121f..3303c3bcb7a 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -43,7 +43,7 @@ class modBanque extends DolibarrModules
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function modBanque($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index 662972212c3..34cd7aac886 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -40,7 +40,7 @@ class modBarcode extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modBarcode($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 55;
diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
index ff29e9482c2..91a51dd00c6 100644
--- a/htdocs/core/modules/modBookmark.class.php
+++ b/htdocs/core/modules/modBookmark.class.php
@@ -40,7 +40,7 @@ class modBookmark extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modBookmark($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 330;
diff --git a/htdocs/core/modules/modBoutique.class.php b/htdocs/core/modules/modBoutique.class.php
index 3385a1bd26b..0aa50d7c578 100644
--- a/htdocs/core/modules/modBoutique.class.php
+++ b/htdocs/core/modules/modBoutique.class.php
@@ -41,7 +41,7 @@ class modBoutique extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modBoutique($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 800;
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index 0abf4fd46de..a7a6fa13478 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -36,7 +36,7 @@ class modCashDesk extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modCashDesk ($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 13e847f5d2a..cb0e349f70b 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -37,7 +37,7 @@ class modCategorie extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modCategorie($db)
+	function __construct($db)
 	{
 	    global $conf;
 
diff --git a/htdocs/core/modules/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php
index d0194997e19..0f673696d26 100644
--- a/htdocs/core/modules/modClickToDial.class.php
+++ b/htdocs/core/modules/modClickToDial.class.php
@@ -40,7 +40,7 @@ class modClickToDial extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modClickToDial($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 58;
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 839153be5e3..342f0d92480 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -43,7 +43,7 @@ class modCommande extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modCommande($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index dbdf75918c8..e6a5b6d3182 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -41,7 +41,7 @@ class modComptabilite extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
     */
-	function modComptabilite($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index 13bc3f7f2c0..4466efffdcd 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -41,7 +41,7 @@ class modContrat extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modContrat($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 54;
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index 84fa089ce66..7c3f60abe4d 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -36,13 +36,13 @@ class modDeplacement extends DolibarrModules
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
-	 *   @param      DoliDB		$DB      Database handler
+	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modDeplacement($DB)
+	function __construct($db)
 	{
 		global $conf;
 
-		$this->db = $DB ;
+		$this->db = $db;
 		$this->numero = 75 ;
 
 		$this->family = "financial";
diff --git a/htdocs/core/modules/modDocument.class.php b/htdocs/core/modules/modDocument.class.php
index 2a6b9c63d1e..d0d31cb3e67 100644
--- a/htdocs/core/modules/modDocument.class.php
+++ b/htdocs/core/modules/modDocument.class.php
@@ -41,7 +41,7 @@ class modDocument extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modDocument($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 51;
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 9899a800fba..e9acf254562 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -40,7 +40,7 @@ class modDon  extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modDon($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 700;
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 14b256d53f4..26eae1f353e 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -37,7 +37,7 @@ class modECM extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
     */
-	function modECM($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 235c80e873f..6d4dd923fad 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -41,7 +41,7 @@ class modExpedition extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modExpedition($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 80;
diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
index 9ff4f9662a4..86659deca25 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -39,7 +39,7 @@ class modExport extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modExport($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 240;
diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
index dcbcf9e63d5..0d946aa6dac 100644
--- a/htdocs/core/modules/modExternalRss.class.php
+++ b/htdocs/core/modules/modExternalRss.class.php
@@ -39,7 +39,7 @@ class modExternalRss extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modExternalRss($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
index bf9e18421a4..09311d199ba 100644
--- a/htdocs/core/modules/modExternalSite.class.php
+++ b/htdocs/core/modules/modExternalSite.class.php
@@ -40,7 +40,7 @@ class modExternalSite extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
     */
-	function modExternalSite($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
index 4b28a956481..04a66df1bd8 100644
--- a/htdocs/core/modules/modFTP.class.php
+++ b/htdocs/core/modules/modFTP.class.php
@@ -38,7 +38,7 @@ class modFTP extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
     */
-	function modFTP($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 577107a3586..e072907f403 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -40,7 +40,7 @@ class modFacture extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modFacture($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index 93347807f8d..9b1e0f8834d 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -40,7 +40,7 @@ class modFckeditor extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modFckeditor($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 2000;
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 8b088535d0c..f74d8d5eb32 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -43,7 +43,7 @@ class modFicheinter extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
      */
-    function modFicheinter($db)
+    function __construct($db)
     {
         global $conf;
 
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 468d1e8427f..1257905d567 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -38,7 +38,7 @@ class modFournisseur extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modFournisseur($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php
index e6b04d4652c..d4fe5f7bac8 100644
--- a/htdocs/core/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/core/modules/modGeoIPMaxmind.class.php
@@ -37,7 +37,7 @@ class modGeoIPMaxmind extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modGeoIPMaxmind($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 2900;
diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
index 2b3bbd2d561..7e17060838c 100644
--- a/htdocs/core/modules/modGravatar.class.php
+++ b/htdocs/core/modules/modGravatar.class.php
@@ -36,7 +36,7 @@ class modGravatar extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modGravatar($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
index acb905116b5..f131ee0ae72 100644
--- a/htdocs/core/modules/modImport.class.php
+++ b/htdocs/core/modules/modImport.class.php
@@ -38,7 +38,7 @@ class modImport extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modImport($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 250;
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 29eb657b20c..864f4273981 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -40,7 +40,7 @@ class modLabel extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modLabel($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 60;
diff --git a/htdocs/core/modules/modLdap.class.php b/htdocs/core/modules/modLdap.class.php
index 2aad6dfe570..1d2fee931e2 100644
--- a/htdocs/core/modules/modLdap.class.php
+++ b/htdocs/core/modules/modLdap.class.php
@@ -38,7 +38,7 @@ class modLdap extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modLdap($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 200;
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index ff7a97d1360..6f9a7e362e7 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -40,7 +40,7 @@ class modMailing extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modMailing($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 22;
diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php
index 71f202805b9..d122a4bb9dc 100644
--- a/htdocs/core/modules/modMailmanSpip.class.php
+++ b/htdocs/core/modules/modMailmanSpip.class.php
@@ -38,7 +38,7 @@ class modMailmanSpip extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modMailmanSpip($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 105;
@@ -63,12 +63,6 @@ class modMailmanSpip extends DolibarrModules
 
 		// Config pages
 		$this->config_page_url = array('mailman.php@adherents');
-
-		// Constants
-		$this->const = array();
-		$this->const[1] = array("ADHERENT_MAILMAN_UNSUB_URL","chaine","http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%","Url de désinscription aux listes mailman");
-		$this->const[2] = array("ADHERENT_MAILMAN_URL","chaine","http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%","Url pour les inscriptions mailman");
-		$this->const[3] = array("ADHERENT_MAILMAN_LISTS","chaine","","Mailing-list to subscribe new members to");
 		
 		// Boxes
 		$this->boxes = array();
diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index f76a5aa4f7a..4f60d51ee66 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -38,7 +38,7 @@ class modNotification extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modNotification($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 600;
diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index 9ddc35b1475..3d8d92d8153 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -36,7 +36,7 @@ class modPayBox extends DolibarrModules
      *
      *   @param      DoliDB		$db      Database handler
      */
-    function modPayBox($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 40bcd0ca96b..dd52eba0e09 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -37,7 +37,7 @@ class modPaypal extends DolibarrModules
      *
      *   @param      DoliDB		$db      Database handler
      */
-    function modPaypal($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index 8f440508b81..f63947bc4a6 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -41,7 +41,7 @@ class modPrelevement extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modPrelevement($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 9e09914d601..5f663f26a80 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -43,7 +43,7 @@ class modProduct extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modProduct($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 76b1628e68f..1c2adb531b7 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -42,7 +42,7 @@ class modProjet extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modProjet($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 400;
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 6712f23303f..9594418d487 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -43,7 +43,7 @@ class modPropale extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modPropale($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 4f51b13e116..c765bf23d36 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -42,7 +42,7 @@ class modService extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modService($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 56a41db58af..040e82fa668 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -42,7 +42,7 @@ class modSociete extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modSociete($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index f639933c1fc..057a9fe34ac 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -40,7 +40,7 @@ class modStock extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modStock($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index 9dffdf35e70..0ce4111f6e0 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -38,7 +38,7 @@ class modSyslog extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modSyslog($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 42;
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index 66f07f9a31e..49148d049e4 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -43,7 +43,7 @@ class modTax extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modTax($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 354ed76f818..5f98dd0b438 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -39,7 +39,7 @@ class modUser extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modUser($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
index a28d253f03a..03dfa798bab 100644
--- a/htdocs/core/modules/modWebServices.class.php
+++ b/htdocs/core/modules/modWebServices.class.php
@@ -38,7 +38,7 @@ class modWebServices extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
      */
-    function modWebServices($db)
+    function __construct($db)
     {
         $this->db = $db;
         $this->numero = 2600;
diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
index 95debcd7058..f13f16c418f 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
@@ -48,7 +48,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	 *	@param		Translate	$langs		Handler de langue
 	 *	@param		User		$user		Handler du user connecte
 	 */
-	function modGeneratePassNone($db, $conf, $langs, $user)
+	function __construct($db, $conf, $langs, $user)
 	{
 		$this->id = "none";
 		$this->length = 0;
diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
index 76ec32db477..1eb42a9f715 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
@@ -48,7 +48,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	 *	@param		Translate	$langs		Handler de langue
 	 *	@param		User		$user		Handler du user connecte
 	 */
-	function modGeneratePassStandard($db, $conf, $langs, $user)
+	function __construct($db, $conf, $langs, $user)
 	{
 		$this->id = "standard";
 		$this->length = 8;
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index 6e757345df6..938a8b7c338 100755
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -41,7 +41,7 @@ class InterfaceLogevents
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfaceLogevents($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
index ab78856e65f..112c7bc053b 100755
--- a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
+++ b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
@@ -34,7 +34,7 @@ class InterfacePaypalWorkflow
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfacePaypalWorkflow($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index ff7b1843a2e..5615ef084ad 100755
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -36,7 +36,7 @@ class InterfaceWorkflowManager
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfaceWorkflowManager($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 8e0641e594f..d122546aa64 100755
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -42,7 +42,7 @@ class InterfaceActionsAuto
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfaceActionsAuto($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 3d6c7b01333..2f674860440 100755
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -38,7 +38,7 @@ class InterfaceLdapsynchro
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfaceLdapsynchro($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index cf47057966d..a6c68d809e6 100755
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -37,7 +37,7 @@ class InterfaceNotification
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfaceNotification($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
index 19143edb64a..9abcb164025 100755
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -42,7 +42,7 @@ class InterfaceDemo
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfaceDemo($db)
+    function __construct($db)
     {
         $this->db = $db;
     
diff --git a/htdocs/document.php b/htdocs/document.php
index a509bc3bd7c..2d629bcae7a 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -499,8 +499,8 @@ if ($action == 'remove_file')	// Remove a file
 		exit;
 	}
 
-	$ret=dol_delete_file($original_file);
-	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+	$ret=dol_delete_file($original_file);
+	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
 	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
 
 	dol_syslog("document.php back to ".urldecode($urlsource), LOG_DEBUG);
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index a4cd7a79e64..d13ff95f03d 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -53,7 +53,7 @@ class EcmDirectory // extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function EcmDirectory($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		return 1;
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 243be7bc8ce..57238a97cde 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -38,7 +38,7 @@ class FormEcm
 	 *
 	 * 	@param	DoliDB	$db		Database handler
 	 */
-	function FormEcm($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 7c624d24ae3..06a23324d65 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -86,7 +86,7 @@ class Expedition extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Expedition($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->lines = array();
@@ -1269,7 +1269,7 @@ class ExpeditionLigne
      *
      *  @param		DoliDB		$db      Database handler
      */
-	function ExpeditionLigne($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php
index 3eecc073b5d..f06123f48c5 100644
--- a/htdocs/expedition/class/expeditionstats.class.php
+++ b/htdocs/expedition/class/expeditionstats.class.php
@@ -34,11 +34,11 @@ class ExpeditionStats
     /**
      * Constructor
      *
-     * @param		DoliDB		$DB      Database handler
+     * @param		DoliDB		$db      Database handler
      */
-    function ExpeditionStats($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
     }
 
     /**
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 013e41e2fea..4cdd9cda153 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -52,7 +52,7 @@ class Export
 	 *
 	 *    @param  	DoliDB		$db		Database handler
 	 */
-	function Export($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 676881e1c95..b37dc17944e 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -108,11 +108,11 @@ if ($action=='selectfield')
 
         $array_selected[$field]=count($array_selected)+1;    // We tag the key $field as "selected"
         // We check if there is a dependency
-        if (! empty($fieldsdependenciesarray[$fieldsentitiesarray[$field]]))
+        if (! empty($fieldsdependenciesarray[$fieldsentitiesarray[$field]]))
         {
             $tmp=$fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
             if (is_array($tmp)) $listofdependencies=$tmp;
-            else $listofdependencies=array($tmp);
+            else $listofdependencies=array($tmp);
             foreach($listofdependencies as $fieldid)
             {
                 if (empty($array_selected[$fieldid]))
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 466464dd37a..f8c801e237c 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -65,7 +65,7 @@ class Fichinter extends CommonObject
 	 */
 	function __construct($db)
 	{
-		$this->db = $db ;
+		$this->db = $db;
 		$this->products = array();
 		$this->fk_project = 0;
 		$this->statut = 0;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index fe3ed8f2202..626cbb5dd23 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -87,7 +87,7 @@ class FactureFournisseur extends CommonInvoice
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function FactureFournisseur($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 3e020f463f6..0e86f2c9365 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -60,7 +60,7 @@ class PaiementFourn extends Paiement
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function PaiementFourn($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 73bee41c4ce..05d312cc755 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -45,7 +45,7 @@ class Import
 	 *
 	 *    @param  	DoliDB		$db		Database handler
 	 */
-	function Import($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/install/lib/repair.lib.php b/htdocs/install/lib/repair.lib.php
index d965c1ff9c8..af0d7774830 100644
--- a/htdocs/install/lib/repair.lib.php
+++ b/htdocs/install/lib/repair.lib.php
@@ -118,28 +118,28 @@ function checkLinkedElements($sourcetype, $targettype)
 function clean_data_ecm_directories()
 {
 	global $db, $langs;
-
-	// Clean data from ecm_directories
-	$sql="SELECT rowid, label FROM ".MAIN_DB_PREFIX."ecm_directories";
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		while($obj=$db->fetch_object($resql))
-		{
-			$id=$obj->rowid;
-			$label=$obj->label;
-			$newlabel=dol_sanitizeFileName($label);
-			if ($label != $newlabel)
-			{
-				$sqlupdate="UPDATE ".MAIN_DB_PREFIX."ecm_directories set label='".$newlabel."' WHERE rowid=".$id;
-				print '<tr><td>'.$sqlupdate."</td></tr>\n";
+
+	// Clean data from ecm_directories
+	$sql="SELECT rowid, label FROM ".MAIN_DB_PREFIX."ecm_directories";
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+		while($obj=$db->fetch_object($resql))
+		{
+			$id=$obj->rowid;
+			$label=$obj->label;
+			$newlabel=dol_sanitizeFileName($label);
+			if ($label != $newlabel)
+			{
+				$sqlupdate="UPDATE ".MAIN_DB_PREFIX."ecm_directories set label='".$newlabel."' WHERE rowid=".$id;
+				print '<tr><td>'.$sqlupdate."</td></tr>\n";
 				$resqlupdate=$db->query($sqlupdate);
-				if (! $resqlupdate) dol_print_error($db,'Failed to update');
-			}
-
-		}
-	}
-	else dol_print_error($db,'Failed to run request');
+				if (! $resqlupdate) dol_print_error($db,'Failed to update');
+			}
+
+		}
+	}
+	else dol_print_error($db,'Failed to run request');
 
 	return;
 }
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index 677dd3d7d4e..f34d810adf1 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -146,7 +146,6 @@ DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
 DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
 DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
 DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic insription of new members (separated by a comma)
 GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
 MayBeOverwrited=This text can be overwrited by value defined for member's type
 ShowTypeCard=Show type '%s'
@@ -164,47 +163,47 @@ DocForAllMembersCards=Generate business cards for all members (Format for output
 DocForOneMemberCards=Generate business cards for a particular member (Format for output actually setup: <b>%s</b>)
 DocForLabels=Generate address sheets (Format for output actually setup: <b>%s</b>)
 SubscriptionPayment=Subscription payment
-
-
-// START - Lines generated via autotranslator.php tool (2011-06-26 15:35:22).
-// Reference language: en_US -> el_GR
-LastSubscriptionDate=Τελευταία ημερομηνία εγγραφής
-LastSubscriptionAmount=Τελευταία ποσό συνδρομής
-MembersStatisticsByCountries=Μέλη στατιστικές ανά χώρα
-MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων από πολιτεία / επαρχία
-MembersStatisticsByTowne=Τα μέλη στατιστικών στοιχείων από την πόλη
-NbOfMembers=Αριθμός μελών
-NoValidatedMemberYet=Δεν επικυρώνονται τα μέλη βρέθηκαν
-MembersByCountryDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από τις χώρες. Graphic εξαρτάται, ωστόσο, στην υπηρεσία της Google online διάγραμμα και είναι διαθέσιμο μόνο αν μια σύνδεση στο Διαδίκτυο είναι λειτουργεί.
-MembersByStateDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από το κράτος / επαρχίες / Canton.
-MembersByTownDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από την πόλη.
-MembersStatisticsDesc=Επιλέξτε στατιστικά στοιχεία που θέλετε να διαβάσετε ...
-MenuMembersStats=Στατιστικά
-LastMemberDate=Τελευταία ημερομηνία μέλος
-Nature=Φύση
-Public=Δημόσιο
-Exports=Εξαγωγές
-NewMemberbyWeb=Νέο μέλος πρόσθεσε. Εν αναμονή έγκρισης
-NewMemberForm=Νέα μορφή μέλος
-SubscriptionsStatistics=Στατιστικά στοιχεία για τις συνδρομές
-NbOfSubscriptions=Αριθμός συνδρομών
-AmountOfSubscriptions=Ποσό των συνδρομών
-// STOP - Lines generated via autotranslator.php tool (2011-06-26 15:41:20).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 16:06:57).
-// Reference language: en_US -> el_GR
-NewSubscriptionDesc=Αυτή η φόρμα σας επιτρέπει να καταγράψετε την εγγραφή σας ως νέο μέλος του ιδρύματος. Αν θέλετε να ανανεώσετε τη συνδρομή σας (αν είναι ήδη μέλος), επικοινωνήστε με θεμέλιο του σκάφους, αντί μέσω e-mail %s.
-BlankSubscriptionFormDesc=Dolibarr μπορεί να σας παρέχει μια δημόσια διεύθυνση URL για να επιτρέψουν σε εξωτερικούς επισκέπτες να ζητήσει να εγγραφεί στο ίδρυμα. Εάν μια ηλεκτρονική πληρωμή μονάδα είναι ενεργοποιημένη, μια μορφή πληρωμής θα πρέπει επίσης να παρέχονται αυτόματα.
-EnablePublicSubscriptionForm=Ενεργοποιήστε το κοινό αυτόματη συνδρομή μορφή
-LastSubscriptionsModified=Τελευταία τροποποίηση %s συνδρομές
-TurnoverOrBudget=Κύκλος εργασιών (για μια επιχείρηση), ή του προϋπολογισμού (για ένα ίδρυμα)
-DefaultAmount=Προεπιλογή ποσό της συνδρομής
-CanEditAmount=Επισκέπτης μπορεί να επιλέξει / επεξεργαστείτε το ποσό της συνδρομής του
-MEMBER_NEWFORM_PAYONLINE=Μετάβαση στην ολοκληρωμένη ηλεκτρονική σελίδα πληρωμής
-Associations=Ιδρύματα
-Collectivités=Οργανισμοί
-Particuliers=Προσωπικά
-Entreprises=Εταιρείες
-DOLIBARRFOUNDATION_PAYMENT_FORM=Για να κάνετε την πληρωμή της συνδρομής σας χρησιμοποιώντας μια τραπεζική μεταφορά, δείτε τη σελίδα <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Για να πληρώσετε με πιστωτική κάρτα ή Paypal, κάντε κλικ στο κουμπί στο κάτω μέρος της σελίδας. <br>
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:08:13).
+
+
+// START - Lines generated via autotranslator.php tool (2011-06-26 15:35:22).
+// Reference language: en_US -> el_GR
+LastSubscriptionDate=Τελευταία ημερομηνία εγγραφής
+LastSubscriptionAmount=Τελευταία ποσό συνδρομής
+MembersStatisticsByCountries=Μέλη στατιστικές ανά χώρα
+MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων από πολιτεία / επαρχία
+MembersStatisticsByTowne=Τα μέλη στατιστικών στοιχείων από την πόλη
+NbOfMembers=Αριθμός μελών
+NoValidatedMemberYet=Δεν επικυρώνονται τα μέλη βρέθηκαν
+MembersByCountryDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από τις χώρες. Graphic εξαρτάται, ωστόσο, στην υπηρεσία της Google online διάγραμμα και είναι διαθέσιμο μόνο αν μια σύνδεση στο Διαδίκτυο είναι λειτουργεί.
+MembersByStateDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από το κράτος / επαρχίες / Canton.
+MembersByTownDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από την πόλη.
+MembersStatisticsDesc=Επιλέξτε στατιστικά στοιχεία που θέλετε να διαβάσετε ...
+MenuMembersStats=Στατιστικά
+LastMemberDate=Τελευταία ημερομηνία μέλος
+Nature=Φύση
+Public=Δημόσιο
+Exports=Εξαγωγές
+NewMemberbyWeb=Νέο μέλος πρόσθεσε. Εν αναμονή έγκρισης
+NewMemberForm=Νέα μορφή μέλος
+SubscriptionsStatistics=Στατιστικά στοιχεία για τις συνδρομές
+NbOfSubscriptions=Αριθμός συνδρομών
+AmountOfSubscriptions=Ποσό των συνδρομών
+// STOP - Lines generated via autotranslator.php tool (2011-06-26 15:41:20).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 16:06:57).
+// Reference language: en_US -> el_GR
+NewSubscriptionDesc=Αυτή η φόρμα σας επιτρέπει να καταγράψετε την εγγραφή σας ως νέο μέλος του ιδρύματος. Αν θέλετε να ανανεώσετε τη συνδρομή σας (αν είναι ήδη μέλος), επικοινωνήστε με θεμέλιο του σκάφους, αντί μέσω e-mail %s.
+BlankSubscriptionFormDesc=Dolibarr μπορεί να σας παρέχει μια δημόσια διεύθυνση URL για να επιτρέψουν σε εξωτερικούς επισκέπτες να ζητήσει να εγγραφεί στο ίδρυμα. Εάν μια ηλεκτρονική πληρωμή μονάδα είναι ενεργοποιημένη, μια μορφή πληρωμής θα πρέπει επίσης να παρέχονται αυτόματα.
+EnablePublicSubscriptionForm=Ενεργοποιήστε το κοινό αυτόματη συνδρομή μορφή
+LastSubscriptionsModified=Τελευταία τροποποίηση %s συνδρομές
+TurnoverOrBudget=Κύκλος εργασιών (για μια επιχείρηση), ή του προϋπολογισμού (για ένα ίδρυμα)
+DefaultAmount=Προεπιλογή ποσό της συνδρομής
+CanEditAmount=Επισκέπτης μπορεί να επιλέξει / επεξεργαστείτε το ποσό της συνδρομής του
+MEMBER_NEWFORM_PAYONLINE=Μετάβαση στην ολοκληρωμένη ηλεκτρονική σελίδα πληρωμής
+Associations=Ιδρύματα
+Collectivités=Οργανισμοί
+Particuliers=Προσωπικά
+Entreprises=Εταιρείες
+DOLIBARRFOUNDATION_PAYMENT_FORM=Για να κάνετε την πληρωμή της συνδρομής σας χρησιμοποιώντας μια τραπεζική μεταφορά, δείτε τη σελίδα <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Για να πληρώσετε με πιστωτική κάρτα ή Paypal, κάντε κλικ στο κουμπί στο κάτω μέρος της σελίδας. <br>
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:08:13).
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index abddc202aff..2dc2d0fb45c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -327,7 +327,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons unauthorized (instead of seeing gray)
+ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
 
 # Modules
 Module0Name=Users & groups
@@ -1147,6 +1147,7 @@ SyslogSimpleFile=File
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
+OnlyWindowsLOG_USER=Windows only supports LOG_USER
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1296,9 +1297,6 @@ BankOrderGlobal=General
 BankOrderGlobalDesc=General display order
 BankOrderES=Spanish
 BankOrderESDesc=Spanish display order
-##### MailmanSpip #####
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
 ##### Multicompany #####
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
diff --git a/htdocs/langs/en_US/mailmanspip.lang b/htdocs/langs/en_US/mailmanspip.lang
index 65bb322d8ea..7670bb759d2 100644
--- a/htdocs/langs/en_US/mailmanspip.lang
+++ b/htdocs/langs/en_US/mailmanspip.lang
@@ -1,13 +1,18 @@
 # Dolibarr language file - en_US - mailmanspip
 CHARSET=UTF-8
-TestSubscribe=To test subscription to mailman lists
-TestUnSubscribe=To test unsubscribe from mailman lists
-MailmanCreationSuccess=Calling URL to create into mailman sit success
-MailmanDeletionSuccess=Calling URL to remove subscription from mailman with success
+MailmanSpipSetup=Mailman and SPIP module Setup
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=Subscription test was executed succesfully
+MailmanDeletionSuccess=Unsubscription test was executed succesfully
 SynchroMailManEnabled=A Mailman update will be performed
 SynchroSpipEnabled=A Spip update will be performed
 DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
 DescADHERENT_SPIP_SERVEUR=SPIP Server
 DescADHERENT_SPIP_DB=SPIP database name
 DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
+DescADHERENT_SPIP_PASS=SPIP database password
\ No newline at end of file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 594d1c6e807..6c7c143716e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -522,7 +522,7 @@ SendAcknowledgementByMail=Send Ack. by email
 NoEMail=No email
 Owner=Owner
 DetectedVersion=Detected version
-FollowingConstantsWillBeSubstituted=Following constants will be substitute with corresponding value.
+FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
 Refresh=Refresh
 BackToList=Back to list
 GoBack=Go back
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 232441f6a26..da6a0d5a577 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -147,7 +147,6 @@ DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
 DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
 DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
 DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic insription of new members (separated by a comma)
 GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here
 MayBeOverwrited=This text can be overwrited by value defined for member's type
 ShowTypeCard=Show type '%s'
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index a6d3136f46f..6814f7daad5 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - es_ES - admin
 CHARSET=UTF-8
+Foundation=Fundación
 Version=Versión
 VersionProgram=Versión programa
 VersionLastInstall=Versión instalación inicial
@@ -187,7 +188,7 @@ ModulesDesc=Los módulos Dolibarr definen las funcionalidades disponibles en la
 ModulesInterfaceDesc=Los módulos de interfaz son módulos que permiten vincular a Dolibarr con sistemas, aplicaciones o servicios externos.
 ModulesSpecialDesc=Los módulos complementarios son módulos de uso muy específico o menos corriente que los módulos normales.
 ModulesJobDesc=Los módulos específicos permiten una preconfiguración simplificada de Dolibarr para un negocio en concreto.
-ModulesMarketPlaceDesc=Hay disponbiles para su descarga en sitios externos en internet otros módulos / extensiones...
+ModulesMarketPlaceDesc=Hay disponibles para su descarga en sitios externos otros módulos/extensiones...
 ModulesMarketPlaces=Más módulos...
 DoliStoreDesc=DoliStore, el sitio oficial de módulos complementarios y para Dolibarr ERP/CRM
 WebSiteDesc=Sitios proveedores a consultar para encontrar más módulos
@@ -319,7 +320,7 @@ ResponseTimeout=Timeout de respuesta
 SmsTestMessage=Mensaje de prueba de __PHONEFROM__ para __PHONETO__
 ModuleMustBeEnabledFirst=Para usar esta función debe estar activado el módulo <b>%s</b>.
 SecurityToken=Clave para encriptar urls
-NoSmsEngine=No hay disponible ningún gestor de envío de SMS. Los gestores de envío de SMS no se instalan en estándar (ya que dependen de un proveedor), pero puede encontrar en la plataforma %s
+NoSmsEngine=No hay disponible ningún gestor de envío de SMS. Los gestores de envío de SMS no se instalan por defecto ya que dependen de cada proveedor, sin embargo puede encontrarlos en la plataforma %s.
 PDF=PDF
 PDFDesc=Puede definir aquí las opciones globales para la generación de los PDF
 PDFAddressForging=Reglas de visualización de direcciones
@@ -331,6 +332,7 @@ UrlGenerationParameters=Seguridad de las URLs
 SecurityTokenIsUnique=¿Usar un parámetro securekey único para cada URL?
 EnterRefToBuildUrl=Introduzca la referencia del objeto %s
 GetSecuredUrl=Obtener la URL calculada
+ButtonHideUnauthorized=Ocultar los botones de acciones no autorizadas en vez de mostrarlos atenuados
 # Modules= undefined=
 Module0Name=Usuarios y grupos
 Module0Desc=Gestión de usuarios y grupos
@@ -410,8 +412,8 @@ Module500Name=Impuestos, cargas sociales y dividendos
 Module500Desc=Gestión de impuestos y cargas sociales
 Module600Name=Notificaciones
 Module600Desc=Envío de notificaciones (por correo electrónico) sobre los eventos de trabajo Dolibarr
-Module700Name=Subvenciones
-Module700Desc=Gestión de subvenciones
+Module700Name=Donaciones
+Module700Desc=Gestión de donaciones
 Module800Name=OSCommerce 1
 Module800Desc=Interfaz de visualización de una tienda OSCommerce mediante acceso directo a su base de datos
 Module900Name=OSCommerce 2
@@ -450,7 +452,7 @@ Module50200Desc=Módulo para proporcionar un pago en línea con tarjeta de créd
 Module59000Name=Márgenes
 Module59000Desc=Módulo para gestionar los márgenes de beneficio
 Module60000Name=Comisiones
-Module60000Desc=Módulo para gestionar las comisiones
+Module60000Desc=Módulo para gestionar las comisiones de venta
 Permission11=Consultar facturas
 Permission12=Crear/Modificar facturas
 Permission13=De-validar facturas
@@ -612,9 +614,9 @@ Permission532=Crear/modificar servicios
 Permission534=Eliminar servicios
 Permission536=Ver/gestionar los servicios ocultos
 Permission538=Exportar servicios
-Permission701=Consultar subvenciones
-Permission702=Crear/modificar subvenciones
-Permission703=Eliminar subvenciones
+Permission701=Consultar donaciones
+Permission702=Crear/modificar donaciones
+Permission703=Eliminar donaciones
 Permission1001=Consultar stocks
 Permission1002=Crear/modificar stocks
 Permission1003=Eliminar stocks
@@ -731,7 +733,7 @@ PhpConf=Conf
 PhpWebLink=Vínculo Web-PHP
 Pear=Pear
 PearPackages=Paquetes Pear
-+Browser=Navegador
+Browser=Navegador
 Database=Base de datos
 DatabaseServer=Host de la base de datos
 DatabaseName=Nombre de la base de datos
@@ -908,7 +910,7 @@ UsersSetup=Configuración del módulo usuarios
 UserMailRequired=E-Mail necesario para crear un usuario nuevo
 ##### Company setup #####
 CompanySetup=Configuración del módulo empresas
-CompanyCodeChecker=Módulo de generación e control de los códigos de terceros (clientes/proveedores)
+CompanyCodeChecker=Módulo de generación y control de los códigos de terceros (clientes/proveedores)
 AccountCodeManager=Módulo de generación de los códigos contables (clientes/proveedores)
 ModuleCompanyCodeAquarium=Devuelve un código contable compuesto de<br>%s seguido del código tercero de proveedor para el código contable de proveedor,<br>%s seguido del código tercero de cliente para el código contable de cliente.
 ModuleCompanyCodePanicum=Devuelve un código contable vacío.
@@ -1159,9 +1161,10 @@ SyslogSimpleFile=Archivo
 SyslogFilename=Nombre y ruta del archivo
 YouCanUseDOL_DATA_ROOT=Puede utilizar DOL_DATA_ROOT/dolibarr.log para un registro en el directorio "documentos" de Dolibarr. Sin embargo, puede establecer un directorio diferente para guardar este archivo.
 ErrorUnknownSyslogConstant=La constante %s no es una constante syslog conocida
+OnlyWindowsLOG_USER=Windows sólo soporta LOG_USER
 ##### Donations #####
-DonationsSetup=Configuración del módulo subvenciones
-DonationsReceiptModel=Modelo recepción de subvenciones
+DonationsSetup=Configuración del módulo donaciones
+DonationsReceiptModel=Modelo recepción de donaciones
 ##### Barcode #####
 BarcodeSetup=Configuración de los códigos de barras
 PaperFormatModule=Módulos de formatos de impresión
@@ -1308,9 +1311,6 @@ BankOrderGlobal=General
 BankOrderGlobalDesc=Orden de visualización general
 BankOrderES=Español
 BankOrderESDesc=Orden de visualización español
-##### MailmanSpip #####
-MailmanSpipSetup=Configuración del módulo Mailman y SPIP
-MailmanTitle=Sistema de listas de correo Mailman
 ##### Multicompany #####
 MultiCompanySetup=Configuración del módulo Multi-empresa
 ##### Suppliers #####
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index 734c8e0c8cd..c0000c1f01b 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -50,7 +50,7 @@ BoxOldestExpiredServices=Servicios antiguos expirados
 BoxLastExpiredServices=Los %s contratos más antiguos con servicios activos expirados 
 BoxTitleLastActionsToDo=Los %s últimos eventos a realizar
 BoxTitleLastContracts=Los %s últimos contratos
-BoxTitleLastModifiedDonations=Las %s últimas subvenciones modificadas
+BoxTitleLastModifiedDonations=Las %s últimas donaciones modificadas
 BoxTitleLastModifiedExpenses=Los %s últimos honorarios modificados
 FailedToRefreshDataInfoNotUpToDate=Error en el  refresco del flujo RSS. Fecha del último refresco: %s
 LastRefreshDate=Fecha última actualización
diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang
index 34f3d09c568..fa8a7edcf42 100644
--- a/htdocs/langs/es_ES/donations.lang
+++ b/htdocs/langs/es_ES/donations.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - es_ES - donations
 CHARSET= UTF-8
-Donation=Subvención
-Donations=Subvenciones
+Donation=Donación
+Donations=Donaciones
 Donor=Donante
 Donors=Donantes
-AddDonation=Añadir subvención
-NewDonation=Nueva subvención
-DonationPromise=Promesa de subvención
+AddDonation=Añadir donación
+NewDonation=Nueva donación
+DonationPromise=Promesa de donación
 PromisesNotValid=Promesas no validadas
 PromisesValid=Promesas validadas
-DonationsPaid=Subvenciones pagadas
-DonationsReceived=Subvenciones ingresadas
-PublicDonation=Subvención pública
-DonationsNumber=Número de subvenciones
-DonationsArea=Área de subvenciones
+DonationsPaid=Donaciones pagadas
+DonationsReceived=Donaciones ingresadas
+PublicDonation=Donación pública
+DonationsNumber=Número de donaciones
+DonationsArea=Área de donaciones
 DonationStatusPromiseNotValidated=Promesa no validada
 DonationStatusPromiseValidated=Promesa validada
-DonationStatusPaid=Subvención pagada
+DonationStatusPaid=Donación pagada
 DonationStatusPromiseNotValidatedShort=No validada
 DonationStatusPromiseValidatedShort=Validada
 DonationStatusPaidShort=Pagada
 ValidPromess=Validar promesa
 BuildDonationReceipt=Crear recibo
-DonationsModels=Modelo de documento de recepción de subvención
-LastModifiedDonations=Las %s últimas subvenciones modificadas
-SearchADonation=Buscar una subvención
\ No newline at end of file
+DonationsModels=Modelo de documento de recepción de donación
+LastModifiedDonations=Las %s últimas donaciones modificadas
+SearchADonation=Buscar una donación
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index 52882e9b7c5..df06b32dc74 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -57,7 +57,7 @@ Login=Usuario
 AdminLogin=Usuario del administrador de la base de datos Dolibarr. Deje vacío si se conecta en anonymous
 Password=Contraseña
 PasswordAgain=Verificación de la contraseña
-AdminPassword=contraseña del administrador de la base de datos Dolibarr. Deje vacío si se conecta en anonymous
+AdminPassword=Contraseña del administrador de la base de datos Dolibarr. Deje vacío si se conecta en anonymous
 CreateDatabase=Crear la base de datos
 CreateUser=Crear el propietario
 DatabaseSuperUserAccess=Base de datos - Acceso super usuario
@@ -84,9 +84,9 @@ PleaseTypePassword=¡Indique una contraseña, no se aceptan las contraseñas vac
 PleaseTypeALogin=¡Indique un usuario!
 PasswordsMismatch=¡Las contraseñas no coinciden, vuelva a intentarlo !
 SetupEnd=Fin de la instalación
-SystemIsInstalled=Se esta instalando su sistema
+SystemIsInstalled=Se está instalando su sistema.
 SystemIsUpgraded=Se actualizó Dolibarr correctamente.
-YouNeedToPersonalizeSetup=Ahora debe configurar Dolibarr según sus necesidades (Elección de la apariencia, de las funcionalidades, etc). Para eso, haga click en el siguiente link:
+YouNeedToPersonalizeSetup=Ahora debe configurar Dolibarr según sus necesidades (elección de la apariencia, de las funcionalidades, etc). Para eso, haga click en el siguiente link:
 AdminLoginCreatedSuccessfuly=Creación de la cuenta administrador Dolibarr '<b>%s</b>' realizada.
 GoToDolibarr=Acceso a Dolibarr
 GoToSetupArea=Acceso a Dolibarr (área de configuración)
diff --git a/htdocs/langs/es_ES/mailmanspip.lang b/htdocs/langs/es_ES/mailmanspip.lang
new file mode 100644
index 00000000000..83abab8df48
--- /dev/null
+++ b/htdocs/langs/es_ES/mailmanspip.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - es_ES - mailmanspip
+CHARSET=UTF-8
+MailmanSpipSetup=Configuración del módulo Mailman y SPIP
+MailmanTitle=Sistema de listas de correo Mailman
+DescADHERENT_MAILMAN_LISTS=Lista(s) para la suscripción automática de los nuevos miembros (separados por comas)
+TestSubscribe=Para comprobar la suscripción a listas Mailman
+TestUnSubscribe=Para comprobar la cancelación de suscripciones a listas Mailman
+MailmanCreationSuccess=La prueba de suscripción ha sido realizada con éxito
+MailmanDeletionSuccess=La prueba de desuscripción ha sido realizada con éxito
+SynchroMailManEnabled=Una actualización de Mailman será efectuada
+SynchroSpipEnabled=Una actualización de Mailman será efectuada
+DescADHERENT_MAILMAN_ADMINPW=Contraseña de administrador Mailman
+DescADHERENT_MAILMAN_URL=URL para las suscripciones Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL para las desuscripciones Mailman
+DescADHERENT_SPIP_SERVEUR=Servidor SPIP
+DescADHERENT_SPIP_DB=Nombre de la base de datos de SPIP
+DescADHERENT_SPIP_USER=Usuario de la base de datos de SPIP
+DescADHERENT_SPIP_PASS=Contraseña de la base de datos de SPIP
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index 4ccee8d5918..dc09d944173 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -149,8 +149,7 @@ DescADHERENT_CARD_HEADER_TEXT=Texto a imprimir en la parte superior del carné d
 DescADHERENT_CARD_TEXT=Texto a imprimir en el carné de miembro (Alineado a la izquierda)
 DescADHERENT_CARD_TEXT_RIGHT=Texto a imprimir en el carné de miembro (Alineado a la derecha)
 DescADHERENT_CARD_FOOTER_TEXT=Texto a imprimir en la parte inferior del carné de miembro
-DescADHERENT_MAILMAN_LISTS=Lista(s) para la inscripción automática de los nuevos miembros (separados por comas)
-GlobalConfigUsedIfNotDefined=Se utilizará el texto definido en la configuración del módulo Miembros si no se define  aquí
+GlobalConfigUsedIfNotDefined=Se utilizará el texto definido en la configuración del módulo Miembros si no se define aquí
 MayBeOverwrited=Este valor puede ser sobreescrito por el texto definido en el tipo de miembro
 ShowTypeCard=Ver tipo '%s'
 HTPasswordExport=Generación archivo htpassword
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 53d8bcae61d..c75e00976dc 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -25,7 +25,7 @@ ProjectsList=Listado de proyectos
 ShowProject=Ver proyecto
 SetProject=Definir proyecto
 NoProject=Ningún proyecto definido
-NbOpenTasks=Nº Tareas abiertas
+NbOpenTasks=Nº tareas abiertas
 NbOfProjects=Nº de proyectos
 TimeSpent=Tiempo dedicado
 TimesSpent=Tiempos dedicados
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 36f975ef65b..a6b91499d6b 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1154,6 +1154,7 @@ SyslogSimpleFile= Fichier
 SyslogFilename= Nom et chemin du fichier
 YouCanUseDOL_DATA_ROOT= Vous pouvez utiliser DOL_DATA_ROOT/dolibarr.log pour un log dans le répertoire "documents" de Dolibarr. Vous pouvez néanmoins définir un chemin différent pour stocker ce fichier.
 ErrorUnknownSyslogConstant= La constante %s n'est pas une constante syslog connue
+OnlyWindowsLOG_USER=Windows ne supporte que LOG_USER
 ##### Donations #####
 DonationsSetup= Configuration du module Dons
 DonationsReceiptModel= Modèle de reçu de dons
@@ -1301,8 +1302,6 @@ BankOrderGlobal=Général
 BankOrderGlobalDesc=Ordre d'affichage général
 BankOrderES=Espagnol
 BankOrderESDesc=Ordre d'affichage Espagnol
-##### MailmanSpip #####
-MailmanSpipSetup=Configuration du module Mailman et SPIP
 ##### Multicompany #####
 MultiCompanySetup=Configuration du module Multi-société
 ##### Suppliers #####
diff --git a/htdocs/langs/fr_FR/mailmanspip.lang b/htdocs/langs/fr_FR/mailmanspip.lang
index 700e81a790b..092d358428a 100644
--- a/htdocs/langs/fr_FR/mailmanspip.lang
+++ b/htdocs/langs/fr_FR/mailmanspip.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - fr_FR - mailmanspip
 CHARSET=UTF-8
+MailmanTitle=
+MailmanSpipSetup=Configuration du module Mailman et SPIP
 TestSubscribe=Pour tester l'inscription aux listes mailman
 TestUnSubscribe=Pour tester la désincritpion aux listes mailman
 MailmanCreationSuccess=Appel de l'url de création dans mailman avec succès
@@ -8,7 +10,7 @@ SynchroMailManEnabled=Une alimentation de Mailman sera réalisée
 SynchroSpipEnabled=Une alimentation de Spip sera réalisée
 DescADHERENT_MAILMAN_ADMINPW=Mot de passe administrateur Mailman
 DescADHERENT_MAILMAN_URL=URL d'inscription aux listes Mailman
-DescADHERENT_MAILMAN_UNSUB_URL de désinscription aux listes Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL de désinscription aux listes Mailman
 DescADHERENT_SPIP_SERVEUR=Serveur SPIP
 DescADHERENT_SPIP_DB=Nom base SPIP
 DescADHERENT_SPIP_USER=Login connexion base SPIP
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 77786d2c328..b4f59ee7a7d 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -62,7 +62,7 @@ class Livraison extends CommonObject
 	 *
 	 * @param	DoliDB	$db		Database handler
 	 */
-	function Livraison($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->lines = array();
@@ -900,7 +900,7 @@ class LivraisonLigne
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function LivraisonLigne($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 1396c8c13a0..28f62175c60 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -102,10 +102,7 @@ print_fiche_titre($langs->trans("margesSetup"),$linkback,'setup');
 
 $head = marges_admin_prepare_head();
 
-dol_fiche_head($head, 'parameters', $langs->trans("marges"), 0, 'marges');
-
-print "<br>";
-
+dol_fiche_head($head, 'parameters', $langs->trans("Margins"), 0, 'margin');
 
 print_fiche_titre($langs->trans("MemberMainOptions"),'','');
 print '<table class="noborder" width="100%">';
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 04495eb5e7a..6fa027e4638 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -96,12 +96,12 @@ if ($id > 0 || ! empty($ref))
 		print '</tr>';
 
 		// Status (to sell)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
 		print $object->getLibStatut(2,0);
 		print '</td></tr>';
 
 		// Status (to buy)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
 		print $object->getLibStatut(2,1);
 		print '</td></tr>';
 
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 73ea52ce705..f829e784004 100755
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -43,15 +43,15 @@ class ActionsCardProduct extends Product
     /**
 	 *    Constructor
 	 *
-     *    @param	DoliDB	$DB             Database handler
+     *    @param	DoliDB	$db             Database handler
      *    @param	string	$dirmodule		Name of directory of module
      *    @param	string	$targetmodule	Name of directory where canvas is stored
      *    @param	string	$canvas         Name of canvas
      *    @param	string	$card           Name of tab (sub-canvas)
 	 */
-	function __construct($DB, $dirmodule, $targetmodule, $canvas, $card)
+	function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
 	{
-        $this->db               = $DB;
+        $this->db               = $db;
         $this->dirmodule		= $dirmodule;
         $this->targetmodule     = $targetmodule;
         $this->canvas           = $canvas;
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index b21db469db1..1a885245e86 100755
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -43,14 +43,14 @@ class ActionsCardService extends Product
 	/**
 	 *    Constructor
 	 *
-     *    @param   DoliDB	$DB             Handler acces base de donnees
+     *    @param   DoliDB	$db             Handler acces base de donnees
      *    @param   string	$targetmodule   Name of directory of module where canvas is stored
      *    @param   string	$canvas         Name of canvas
      *    @param   string	$card           Name of tab (sub-canvas)
 	 */
-	function ActionsCardService($DB,$targetmodule,$canvas,$card)
+	function __construct($db,$targetmodule,$canvas,$card)
 	{
-		$this->db 				= $DB;
+		$this->db 				= $db;
 		$this->targetmodule     = $targetmodule;
         $this->canvas           = $canvas;
         $this->card             = $card;
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index aec1d5f65ea..ff96ccf80f1 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -43,7 +43,7 @@ class FormProduct
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function FormProduct($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 06bd03043df..aff8a64e7fc 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -147,7 +147,7 @@ class Product extends CommonObject
 	 *
 	 *  @param      DoliDB		$db      Database handler
 	 */
-	function Product($db)
+	function __construct($db)
 	{
 		global $langs;
 
diff --git a/htdocs/product/class/service.class.php b/htdocs/product/class/service.class.php
index 8d12267ea0b..0e828ac43d0 100644
--- a/htdocs/product/class/service.class.php
+++ b/htdocs/product/class/service.class.php
@@ -47,7 +47,7 @@ class Service extends CommonObject
 	*
 	*  @param      DoliDB		$db      Database handler
 	*/
-	function Service($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 70ca91c4f8c..54067a5b9d0 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -27,6 +27,9 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
 
+//Required to translate NbOfProposals
+$langs->load('propal');
+
 $type=GETPOST("type","int");
 
 // Security check
@@ -92,10 +95,10 @@ print_barre_liste($title, $page, "popuprop.php",$param,"","","",$num);
 print '<table class="noborder" width="100%">';
 
 print "<tr class=\"liste_titre\">";
-print_liste_field_titre($langs->trans("Ref"),"popuprop.php", "p.ref","","","",$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Type"),"popuprop.php", "p.type","","","",$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Label"),"popuprop.php", "p.label","","","",$sortfield,$sortorder);
-print_liste_field_titre("Nb. de proposition","popuprop.php", "c","","",'align="right"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans('Ref'), 'popuprop.php', 'p.ref', '', '', '', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('Type'), 'popuprop.php', 'p.type', '', '', '', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('Label'), 'popuprop.php', 'p.label', '', '', '', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('NbOfProposals'), 'popuprop.php', 'c', '', '', 'align="right"', $sortfield, $sortorder);
 print "</tr>\n";
 
 $sql  = "SELECT p.rowid, p.label, p.ref, p.fk_product_type as type, count(*) as c";
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index c2afa0950d0..6321813fdb9 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -36,11 +36,11 @@ class MouvementStock
     /**
 	 *  Constructor
 	 *
-	 *  @param      DoliDB		$DB      Database handler
+	 *  @param      DoliDB		$db      Database handler
      */
-	function MouvementStock($DB)
+	function __construct($db)
 	{
-		$this->db = $DB;
+		$this->db = $db;
 	}
 
 	/**
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index b31ff85e95c..b4e55b9e657 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -37,15 +37,15 @@ class ActionsCardCompany extends ActionsCardCommon
 	/**
 	 *    Constructor
 	 *
-     *    @param	DoliDB	$DB				Handler acces base de donnees
+     *    @param	DoliDB	$db				Handler acces base de donnees
      *    @param	string	$dirmodule		Name of directory of module
      *    @param	string	$targetmodule	Name of directory of module where canvas is stored
      *    @param	string	$canvas			Name of canvas
      *    @param	string	$card			Name of tab (sub-canvas)
 	 */
-	function __construct($DB, $dirmodule, $targetmodule, $canvas, $card)
+	function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
 	{
-        $this->db				= $DB;
+        $this->db				= $db;
         $this->dirmodule		= $dirmodule;
         $this->targetmodule		= $targetmodule;
         $this->canvas			= $canvas;
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 8b807e9960b..74f64e07a1e 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -36,15 +36,15 @@ class ActionsCardIndividual extends ActionsCardCommon
     /**
 	 *    Constructor
 	 *
-     *    @param	DoliDB	$DB				Handler acces base de donnees
+     *    @param	DoliDB	$db				Handler acces base de donnees
      *    @param	string	$dirmodule		Name of directory of module
      *    @param	string	$targetmodule	Name of directory of module where canvas is stored
      *    @param	string	$canvas			Name of canvas
      *    @param	string	$card			Name of tab (sub-canvas)
      */
-	function __construct($DB, $dirmodule, $targetmodule, $canvas, $card)
+	function __construct($db, $dirmodule, $targetmodule, $canvas, $card)
 	{
-		$this->db				= $DB;
+		$this->db				= $db;
 		$this->dirmodule		= $dirmodule;
 		$this->targetmodule		= $targetmodule;
         $this->canvas			= $canvas;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 300f2dfb8bf..51b05e910e7 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -147,7 +147,7 @@ class Societe extends CommonObject
      *
      *    @param	DoliDB		$db		Database handler
      */
-    public function Societe($db)
+    public function __construct($db)
     {
         global $conf;
 
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 4ec4d7fbed7..b6506045c1d 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -55,7 +55,7 @@ class UserGroup extends CommonObject
      *
      *    @param   DoliDb  $db     Database handler
 	 */
-	function UserGroup($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 9575f1e88a3..f87a0af3db9 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -58,7 +58,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return AdherentTest
 	 */
-	function AdherentTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
index c652b6bf759..2ec8c130267 100644
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -58,7 +58,7 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return AdminLibTest
 	 */
-	function AdminLibTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php
index 25843dbfbdc..c2da51ae06a 100644
--- a/test/phpunit/BankAccountTest.php
+++ b/test/phpunit/BankAccountTest.php
@@ -60,7 +60,7 @@ class BankAccountTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return BankAccountTest
 	 */
-	function BankAccountTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index 554ba45289e..1ea69754035 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -88,7 +88,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return BuildDocTest
 	 */
-	function BuildDocTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
@@ -112,8 +112,8 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
         if (! $conf->propal->enabled) { print __METHOD__." propal module not enabled\n"; die(); }
         if (! $conf->projet->enabled) { print __METHOD__." project module not enabled\n"; die(); }
         if (! $conf->expedition->enabled) { print __METHOD__." shipment module not enabled\n"; die(); }
-        if (! $conf->ficheinter->enabled) { print __METHOD__." intervention module not enabled\n"; die(); }
-        if (! $conf->deplacement->enabled) { print __METHOD__." trip module not enabled\n"; die(); }
+        if (! $conf->ficheinter->enabled) { print __METHOD__." intervention module not enabled\n"; die(); }
+        if (! $conf->deplacement->enabled) { print __METHOD__." trip module not enabled\n"; die(); }
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php
index 6891401179b..73820d14ff4 100755
--- a/test/phpunit/CMailFileTest.php
+++ b/test/phpunit/CMailFileTest.php
@@ -58,7 +58,7 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CMailFile
 	 */
-	function CMailFileTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index 54dba76bd34..fe9ab89008a 100755
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -59,7 +59,7 @@ class CategorieTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CategorieTest
 	 */
-	function CategorieTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ChargeSocialesTest.php b/test/phpunit/ChargeSocialesTest.php
index 9562d11bf7a..9b520a8f993 100755
--- a/test/phpunit/ChargeSocialesTest.php
+++ b/test/phpunit/ChargeSocialesTest.php
@@ -58,7 +58,7 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ChargeSocialesTest
 	 */
-	function ChargeSocialesTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index eb5e2028ada..d73e8661c8c 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -59,7 +59,7 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CommandeFournisseurTest
 	 */
-	function CommandeFournisseurTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php
index 2b46d0ee45b..ce253e65208 100644
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@@ -58,7 +58,7 @@ class CommandeTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CommandeTest
 	 */
-	function CommandeTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CommonObjectTest.php b/test/phpunit/CommonObjectTest.php
index 42f5503e152..8759fce9a36 100644
--- a/test/phpunit/CommonObjectTest.php
+++ b/test/phpunit/CommonObjectTest.php
@@ -59,7 +59,7 @@ class CommonObjectTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CommonObjectTest
 	 */
-	function CommonObjectTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php
index 5595c919768..9778c8aea60 100644
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@@ -58,7 +58,7 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CompanyBankAccountTest
 	 */
-	function CompanyBankAccountTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
index 00c5c99985a..ed235a9fb85 100755
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@@ -60,7 +60,7 @@ class ContactTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ContactTest
 	 */
-	function ContactTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php
index 2a827af2665..62e46c47502 100644
--- a/test/phpunit/ContratTest.php
+++ b/test/phpunit/ContratTest.php
@@ -58,7 +58,7 @@ class ContratTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ContratTest
 	 */
-	function ContratTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php
index 24101beedbe..fbce577aa98 100755
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
@@ -60,7 +60,7 @@ class CoreTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CoreTest
 	 */
-	function CoreTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 222fb62a86a..c56b39f5cf4 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -58,7 +58,7 @@ class DateLibTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return DateLibTest
 	 */
-	function DateLibTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/DiscountTest.php b/test/phpunit/DiscountTest.php
index 7d9a1dde834..1fc7c0e1ca0 100755
--- a/test/phpunit/DiscountTest.php
+++ b/test/phpunit/DiscountTest.php
@@ -58,7 +58,7 @@ class DiscountTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return DiscountTest
 	 */
-	function DiscountTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index d7ba76dae2b..267af4057fc 100755
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -61,7 +61,7 @@ class ExportTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ExportTest
 	 */
-	function ExportTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FactureFournisseurTest.php b/test/phpunit/FactureFournisseurTest.php
index 9a1afe73f53..2313c03f854 100644
--- a/test/phpunit/FactureFournisseurTest.php
+++ b/test/phpunit/FactureFournisseurTest.php
@@ -58,7 +58,7 @@ class FactureFournisseurTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return FactureFournisseurTest
 	 */
-	function FactureFournisseurTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 99c845c4555..0470b70e57a 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -58,7 +58,7 @@ class FactureTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return FactureTest
 	 */
-	function FactureTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FactureTestRounding.php b/test/phpunit/FactureTestRounding.php
index a345fdb436c..0644c860aa2 100644
--- a/test/phpunit/FactureTestRounding.php
+++ b/test/phpunit/FactureTestRounding.php
@@ -58,7 +58,7 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase
 	 *
 	 * @return FactureTest
 	 */
-	function FactureTestRounding()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index 76e19726e26..cc47f70d38e 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -59,7 +59,7 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return FilesLibTest
 	 */
-	function FilesLibTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/Functions2Test.php b/test/phpunit/Functions2Test.php
index 9a6cc1163f2..e8f7ceb3619 100755
--- a/test/phpunit/Functions2Test.php
+++ b/test/phpunit/Functions2Test.php
@@ -61,7 +61,7 @@ class Functions2Test extends PHPUnit_Framework_TestCase
      *
      * @return CoreTest
      */
-    function Functions2Test()
+    function __construct()
     {
         //$this->sharedFixture
         global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FunctionsTest.php b/test/phpunit/FunctionsTest.php
index 4797301b575..7a65f198951 100755
--- a/test/phpunit/FunctionsTest.php
+++ b/test/phpunit/FunctionsTest.php
@@ -62,7 +62,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
      *
      * @return CoreTest
      */
-    function FunctionsTest()
+    function __construct()
     {
         //$this->sharedFixture
         global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ImagesLibTest.php b/test/phpunit/ImagesLibTest.php
index d1e25797e0d..d6dd3d5a16f 100644
--- a/test/phpunit/ImagesLibTest.php
+++ b/test/phpunit/ImagesLibTest.php
@@ -59,7 +59,7 @@ class ImagesLibTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ImagesLibTest
 	 */
-	function ImagesLibTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php
index 913b9bd4b33..04c49742c49 100755
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
@@ -60,7 +60,7 @@ class ImportTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ImportTest
 	 */
-	function ImportTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index 9b2924270e7..023caa2fd3a 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -57,7 +57,7 @@ class ModulesTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return BuildDocTest
 	 */
-	function ModulesTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index 8f092b1a6ba..5914248ce5f 100755
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -61,7 +61,7 @@ class PdfDocTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return PdfDocTest
 	 */
-	function PdfDocTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PgsqlTest.php b/test/phpunit/PgsqlTest.php
index 52f159ddf5f..ac290161b06 100755
--- a/test/phpunit/PgsqlTest.php
+++ b/test/phpunit/PgsqlTest.php
@@ -60,7 +60,7 @@ class PgsqlTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ContactTest
 	 */
-	function PgsqlTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
index 7416fa9937a..d0be9c47e27 100755
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -59,7 +59,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
      *
      * @return CoreTest
      */
-    function PricesTest()
+    function __construct()
     {
         //$this->sharedFixture
         global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php
index 799b16da232..5ec451598c9 100755
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -58,7 +58,7 @@ class ProductTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ProductTest
 	 */
-	function ProductTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php
index c9ff64b3655..c8fd6b732f9 100644
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@@ -58,7 +58,7 @@ class PropalTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return PropalTest
 	 */
-	function PropalTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 10d395ff94e..9ee2a99f744 100755
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -70,7 +70,7 @@ class SecurityTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return SecurityTest
 	 */
-	function SecurityTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 7f212843bd5..d781698fefc 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -59,7 +59,7 @@ class SocieteTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return SocieteTest
 	 */
-	function SocieteTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/UserGroupTest.php b/test/phpunit/UserGroupTest.php
index b82878f3349..02a5809fee0 100644
--- a/test/phpunit/UserGroupTest.php
+++ b/test/phpunit/UserGroupTest.php
@@ -58,7 +58,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return UserGroupTest
 	 */
-	function UserGroupTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 223b94397e3..a82d24060e7 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -58,7 +58,7 @@ class UserTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return UserTest
 	 */
-	function UserTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php
index 10e8b57a384..be152dcf06c 100755
--- a/test/phpunit/WebservicesTest.php
+++ b/test/phpunit/WebservicesTest.php
@@ -60,7 +60,7 @@ class WebservicesTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return DateLibTest
 	 */
-	function WebservicesTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/_NumberingModulesTest.php b/test/phpunit/_NumberingModulesTest.php
index 430986a9ef6..31c88f8dfa1 100644
--- a/test/phpunit/_NumberingModulesTest.php
+++ b/test/phpunit/_NumberingModulesTest.php
@@ -57,7 +57,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return NumberingModulesTest
 	 */
-	function NumberingModulesTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;