diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index 8f819e5843851bc7c505ba66b6c21d6c5f67dee1..98e50bc813a682c8f0b51c0f9e552ea7685c5356 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 3d5814d143af0231daa15c20a716aeb8deac8233..f99f61e782cba1c0b1886540a2e2218cce2dcb17 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 2c278030a62bbcbec5236356d8f4f595f758a19a..c64ede9953a410a0ee12b48d730700eae39c8bf9 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 83b2c24dbc5b6741b77ed694f929d74444de5536..20195bf073be331e5cbc612debe31193385e44de 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 aa08f2cbbe3d161d827850dcb02c3d419307fd4d..ea2a6489f5b0d996d009c2537ea7e9f3e08cb2d0 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 0424b428f6662fba6061b5ee37749f4714e8a9b2..4db3884cdad6538353741c9477cbbf12a1aa6778 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 4a07b5dd9c9d57603a245fc089248b304ac8e155..eb4624a4c40e543bff1186e81072dfb3c0b80bb1 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/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index d3d30d7c72374782c49cd5dcaf01fe680215eca0..088d4751d2ee33efcb86cc7c870d019f9f8e84c9 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 a84b81ed6a7e940e4d62480c68a03f7b5ea6ade2..bc404113b1dc141f5f8f96fbc5c10076287490b5 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 143a4e3f1adab65f14c3d874d69670e64de9c85b..cb049194fd19017afca2493b8149c7b65d892d00 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 eca4877b0edaec7cd34a1e93ef2bec5cc3cb187d..9bf1ff22dc99efa329e2247ecb669c9d6bb69b6c 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 5631f30207c75e0753d51689d6f0d483e35fcc1b..be27ea78a9db3de774cdbf892f519e93198f2f92 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 7eec78ebd321fad33e58b4867c6a104d336d6f82..b625eccd28e19b504421f53c8d903db3441f301b 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 eff1cfbf5900e479cac37b728e66c03c519250eb..19d7bba39145cf83395f6155fa18b42efff0abbc 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 938f8b77680cae77c026db25147bc9ebbc5c5598..966b0f25d7ba96ab87ed5be64e83af52ca134aaf 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 4c140b4abd83a30f788b56a0e1999bb4df5666c6..ba9f86587847082b373268a73f69793d7baec521 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 cd721792c6197026e04be758dc562a395f0fbe1f..77b511a9e892441e9074f472f0093553c3aeb8a5 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;
 
@@ -2510,7 +2510,7 @@ class PropaleLigne
      *
      * 	@param	DoliDB	$DB	Database handler
      */
-    function PropaleLigne($DB)
+    function __construct($DB)
     {
         $this->db= $DB;
     }
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index 28feac2602247e1553b3b38df4e93cc923c3d327..7c3b0c27eb05349896776cb534a95dc6d70748c4 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 f4813d96da85263ec125669d9433f35089606b36..b6ce9b07032c13f8cd349c3635c06ca45330cf99 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 226751306db10a6387250b0b25624e3c32b1a39c..2bf5a733e1c52ae8724762d80ba7d6b04056c16e 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2869,7 +2869,7 @@ class OrderLine
      *
      *      @param     DoliDB	$DB      handler d'acces base de donnee
      */
-    function OrderLine($DB)
+    function __construct($DB)
     {
         $this->db= $DB;
     }
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 5221b01fe1b56c0f85dcd4eb983cfe595f5e4edd..d531c5da6c56581de14ab5f97f1724caad3d6f6f 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/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 2811c8034860a02ca6be47fe11d5e649f66d1d4b..2ca362f4696a48da6cb08457dd10672817588a46 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 4bcc156c417e8ddd5c3e4fbc661041ee4f7d6300..c8efd9c883ee49bd36bfc3733eb12dbd57296c41 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 68a8608fd09aa6c278dfc8590a1d060db15f54f1..f41a8c663cf0d9d355eaca46e22358588a5ba608 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/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php
index 075200bccf3e7684fbfb5919a9a7918de8d89940..5c5a9a10439700d3f7e7c572a381f3bc2cd39ae2 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/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index daa0aab3215c3f3faabbec0b85e92a089cb3d2e2..1b19a2205f9193cdd555ade6c87e71c0e966bc09 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 a81f9c81a253cdd328556cc6b6bbaacc9785737c..33660eee17b7a08b398bd2aebff950942c7d100c 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 fcbd5a99708f6dec53cf25ffd5b7adea507cf5af..c56183ca777ce612b58b3242b79a373f9ff69542 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 84a14f614fb5c136a5948e8b7a84b765bf5a76e1..ba5dc74c734737c48f7fd324db6521b10f78dbe5 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 6c1ef48f95795eb13381b70762a43ea331a11d02..99ae27599c099a126589a7f1804ed5c0b9e770ed 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 ca4b86631477f88e0c6a3bcd13af3abcd28fc2ae..6f7e231d90cc6d368101607e55cbe1f162e78a7a 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -45,7 +45,7 @@ class RemiseCheque extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function RemiseCheque($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->next_id = 0;
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 86080fbc623fd22f8b9101001a878f7123087cd5..2e2abf4c79f75b1a6aaa5ab6d96298e173984099 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 557f72771f29473b85f5e805420a99e3a0f10b3e..9fd3029437d38d60584e8f0a3dafe45ad0b6e806 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 b372d274f152104a488f279c0e20ad27b89c1419..c3231f07acbc42436079be02f83bf4ba7852fda2 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 1d8737d6cffdca08c02807bb993657b45c2d874b..b6f8a967f10158f5f2e6d0693533904eca799d45 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 8c3d25644b3db9253be0051f1392fecff97890f0..26cff9343f57f40a64c1deeaabca57676875f72c 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 5a3b63bb89e8d78e17ad6764e01b56ba603771e4..25f50e4a7e00cb49ae79ccf715f04c5998128631 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 0f141549ab105f91045a00bb36205d907a47eb8a..6dd3183e02de34f588f4ea43c805ff22d4d088ba 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 6e03e4c5eae24cff0e7b5edeb5cf555448f94c16..60873f86a320da32c0516979363e35ce480394a6 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 4d26149de64a210ad4af4b01d5b491982c411eba..9aaa124fa45d14aa5db8a9e2c90619e35365264b 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 c4b10f1bf02ead0a4568877d43bac3f60c61c690..41d74fdebee6bf287612b4d3f095afa05cc59188 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 253b0b4800cb936f6bd9c890df37cc48bc89f599..b1364b2bba25269a638770309225199efd81ad5b 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 bda9ccaeeb17710b73beacc221a29df81b541005..0be97f83a4cfe41ccb5e27204209a7dc2ca69a3b 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 8b087463e83ec4d077f023b640f72a9880bd672e..a0ab16baf0e5b32b2a3cb63443ecdb5341fa66ef 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 a54d2eda2ba13089aac05de7d478d340903d59f8..f89e37f191ec61d3da20a3275b1e2bdf89c02954 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 e23f51971c42964297d526d9de40f0c9d302c53a..390dbe52ac2bfb2a8cabaa6736b2065f0e015a59 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 78100419cbfb3c936a2b3b1c12fbe325c16f3454..577ef3262ff1017d1abcaa94c684e74773e25f7a 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 d0267bfb0f41ac10b717146597450d4c8f5be132..57cc7eafaa129b88edd73bd62ccf66e23332597b 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 51f197ec3fde12a73d68fac41d49c6e90d6a5325..cceaafa5985402667e2c034dbb772500c722f7c3 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 736c13ce88a1a10637ad1a985e9f25ab3ce0746b..ee8e01a24f8318700baf191ce9deb302b2deb394 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 45cccf95a9741c52b90458bf5241d01205aad231..eb3cf5e67c98414660999670cbb663ca55d1af92 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 571d3c3e55820da77053bec337a865abd32c854f..fc167601cc68ad1e0a5aa42587e604618b5a2731 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 70487fca5ad575a5f4a43f1e3243c14cf170e184..0aaf343d87623d8846a888285362f3b81c594df2 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 0b275f25e4d32d517bf33de7732a656ae9e4eecd..bb9a4adbfa63a17f62009319765a869db579d1b1 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 d1fc2b2e78b9f3732e1421bfa614c359860fb49b..e64649ec1fdeabce57f7ad698775aea024fca91e 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 c2a4a0d00ea332c08b156446e511b383a25d12fd..e19ef1c0169879db2b7b337cc377f91dd249857b 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 10d85f10cdaa8f649a56b337b88f50f593f28c7c..a75cbf159914816bb2d5534deb2cb86bb26486c4 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 9f818bc63f716e77db2f3c27ebc1de22376125a7..9f9bd706ac008b61a82a2737011de1006801b107 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 87d2324013e90e947dc8bd40cef7f65cd0dec4cd..4251b9f19530465046d447b6a8487f4242065a8d 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 646be1ca90c69ca5ed3348f1a7a472712673f0a1..bd1686da45ae65a526f875cf8a38d9b6042ee8eb 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 b8a42fe8f031f9a6a13be7e128d85f0eebde3d48..bcb31e96464f7ca09c724bde183bb93cd624259e 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 aa310118fd9ec075a38e0d39af63c908f6ed2b39..6577cb432cf61600a71418555b98c039bf3b375a 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 da6ee0cf31b595c29c320bf3f109e0149d58ddb0..12aadcf4a94005e8183c0d11584a0a384e014f92 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 2c5fca613003b7b234add2f0b9abf420ee859856..e4d387395a467161604d22ad4a0d618e48faf70d 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 c771f130a2b8766175143e54a29970ae4e3950ba..1f7fa7c52581512c6753bc95d87dd68de2849fd4 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 7fa522d20372c3ba6397bca02fe53638c4d16531..cd2dc5c1e6c99d30eb8a9def345bbc2be160f12c 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 2841baa79f0c310aeb1b7478ad07c1767f160897..be2fdce15fdd4fa7b6ef1c5508d4b435910bcbb4 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 88dda14020cb79f9994741b3d8fde2000fb0885c..df8e53c2c74bd7b295d4156d5ea3d1acc25f6080 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 ec3283d73ce2bd48210d3f56e157c253d36c16e0..8287a2d6f1b443b197fdb4ea5dc8e46c5f529829 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 66c4bbefc033d048a881f3a4142f195723089804..b91943d146f2daa40ae212e738dd32ecf07731df 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 ff065db2baee842ef54383130b88ae7113c30fd2..597e2aae86f83220d1074fa7622252e0a1a208de 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 d6d1bd8653980fa5d1c91bd01c537526f722739f..3a7382c44ce062eb695bb5e37db937a1f3056c15 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 ef8e2cc2934f766dea2c9f39f36cd7958bc4e1ad..15fe1e7e74dbd38160e1a24ea42d611f4799555e 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 7ffb72308da7707c10414348ea3643eeb87f681c..2fb677aeffe769e08c1b3d94ddc16107c4fc46ba 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 68571f500665e355e7ba86b68dbd920121838b32..cd82c00e0e613e35bdc4bc0ff95e3d8754350a1d 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 5f6ad7de21cc0cf689742f394688ea25ee8eb0e6..78fd96de91105072f5fd396c77dd96f947307a6c 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 d3add99deac83388b357fb8299c094ddf96210e7..70b51714aef4a112d631895e0415164ab3b644d0 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 04bbe4c85847d6d22ba111a8ef4c8a4af69c79f4..539dae890026e51eb68eece85ba2381e791fa065 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 efb5fde009389401c06cac4cec1e496ce29252f7..5fa1997d557f2b38dc0f36d93f5bed115a873822 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 ae720402274ae886861259d67b0f7ac97001e821..720353497066ea488f2cbedfce0e93d055bb5237 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 c7b6bab3a0c5d4d6d4eb122a9dc5d931bd791352..563fc4b00e70c82d74b8421013f5d7c45a224858 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 bc578601a1dce82f21b07ab7131dc71c2e72767d..06a889afb17d04f7d3c2d78f6f947a1e42acff35 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 979fb0ab5db56e1c861b2109db2fad3fee81d7d8..8cc95621df663cf1c292fbae347693bbee1c0e3b 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 f9913b92906cf9f5030e6ab4f39471eefc9fb2dd..8347725fd32eec81b59314465e14cdbb12e85247 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 0b2e6a999dfeb7801648863051e10ea5337f3b90..8f723de978a5595c3af995c1be86a6f9bc72581e 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 838ff19570b2b72e437ca35190dc4fe7035c589f..2625b4aef5cbbb7f1e33f278190266709a07d961 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 0337578eb39c03b7fa32305d41cbb97bbdca04c6..996476c7960e762b2f202ab23684dacdf45cbe5e 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 8a20803a9e864889f221a72bd93bd38c5bf723bb..f6892455301ccb30c3c4603a502b1c16f8c41e1b 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 cde57a97053bc7dd11e2e25ed440fb502342ce71..6443c98b3d6c207c7246e022f35f608002ecf05a 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 852be332686d8bd12adbed42aed7714e7963ffc8..8ede3620bd85d0f3a4db2a502d7b404683264260 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 5281c89a2c0a3e7234c758754ee3b9bb7beea6bd..8cff2f5252c839fde19233b7d368e79509dbc280 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 06d3eb057c4eb84a71ba010bb81152ccfdd61769..c3af2d046b4adf4944ed42629d7be884267f36cc 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 6372e2a78ca4b2005237eb6f9b1f3b97108d628b..050d5a3d4df31253f5dd713fda6fd88955f610ab 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 6e60bd29b8702faefa5d1409cf0d96b36b44d9df..e81f59c3e67ac71e7660cc0258f4228ea49e20f6 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 76825a2d08a7646af823304286244aabcc56461a..8d6b08d90deca70261cbd68faa2694d97539de50 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 4dde08c977540caa4ec6a0b158b4dd366c7d0cbe..3db424d4db262742c1a528d642d0059c49657a19 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 d43aee672caf796d7da8236dcfca58e175efe489..0992a97a68fba121386c08097e03c13287920e92 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 f7f72475fbee2d648e5b6ab658d288dd912379ac..8f63f701ea15d687656297a7f19ae8e9e44e2185 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/login/functions_myopenid.php b/htdocs/core/login/functions_myopenid.php
index 958e4a63a88a3c9ffbd47e66873925d6915b0e45..b1ceaf3e1ebd28a8cd63f2e89d73ecc3b11b103a 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 f19ac45351a8450a51702b51c47a39aa26f05fbe..ef7a127081285accd22e188feed652c1052c1d2f 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 521b7467d07c67a62d06540f6c474deea6f85582..cc2a8fd775e4fdb4b374c41b55fa87bb2ec078fd 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 244cb85bd9bcd5e673774ad9ae83d4356f505808..8de0f9b43a7ae27a7185e359ffa229b2dcbceb9c 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 47532b7ae1bd94cff5fe4a2e36d0fbf6b6b9dd77..8048d255960a30724c4e80b50c4ef048c342ed5b 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_backoffice.php b/htdocs/core/menus/standard/eldy_backoffice.php
index bdd49579a739028124a41cd0e877efd9247747bf..5f383288ae2cc14032ade2deff43b458cf00f8c9 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 4c967b33a9296fc36542aae177e84069e9a38f85..d78e138d88fcb4f7ab7d7dc1b5e5a9b621fb10db 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 957b3fe4a5293dc9f93f51a57988664eb7d3d373..9382f6bb3336f76605376d7f2e5b6667a6433b96 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 02c208bd54ce375eb52dd9c824048e8b4ce811c9..8f3ef317dfae50d2fea8f905f5d60bee1b7dba19 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 d22c561d156b0433fea6796dbca68d6a8fb45d16..b4aa4ba1f0690ad82fe73d93ba8037f92253b920 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 050e6bd5b83178b2669ff87ab87461f696f39714..af28a00399f5b726c4daaa9b8b755c0149a76544 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 1ad8bc4bbbadaca71f165e4ae4b6ef5d264559a6..1a918c0fc3ea39a15cd706cfdf8442b23a5df6f8 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/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index e7635e808d65c2290239c5b4c482c92b74b0b4ad..57da94f1b9eac4db3df9b7edea9bde98033024ae 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 4fe5ea60f01e95ebfd3b9d6efcd1606b079bea13..f04c436b2a17988aa82216a6954149790e2b7a7c 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 767b8239afac9170c6b8352f79145e5a20e61929..6b9de8fd21e2ba7a49d124c670cfac953b0087e5 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 37cb02a7fa16f3662b95b2153e1c8e2319e8feba..ad4b032a6f69ca42322b8d19caf4b42ed1ec3e7a 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 8d726d7121f4696b7ca3fac2a4e97d048ac3496a..3303c3bcb7a7a3c18732b7828089d0e59d5272d4 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 662972212c3c1553fca223907076f3da2780517f..34cd7aac886bff0ca574dbf654651181eab2717a 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 ff29e9482c2809c4e7c4aeecb1064a11afdb2412..91a51dd00c64796c1a58a7ea5bfd427bb3538d0b 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 3385a1bd26b871b30a60401516a7389faf65ee4c..0aa50d7c5781b6b58189dced773af7332b42e21b 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 0abf4fd46de8e27dc44b518795c86bcad7e3577a..a7a6fa134788953ced624d1fcbe27538900efe7f 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 13e847f5d2a82a5f88176f2057f023c56c4c6cf9..cb0e349f70bea71b059bbaab7dcde8a9d0001c59 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 d0194997e19a3ba8feef46fbdc18173c33cdc9f6..0f673696d268350bf3b71229b46a63efb3f74d79 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 839153be5e3a7ef468ac9b2deb1806139ee0acba..342f0d92480671d6db4b55d4e529d273bc4a3582 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 dbdf75918c86f872d3daf56ce3dafa367a6e67de..e6a5b6d31821809758a2c63d4ebb223470a2eea5 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 13bc3f7f2c052102c9212fb78e1c38a3d4ef4b78..4466efffdcd07c5568ebf2e2177fd8381420c329 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 84fa089ce66de3342be4f2b7111e71a195ca75b4..7c3f60abe4dd50f23b442bece8bb676bcccb608b 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 2a6b9c63d1eef08c7f5dccdbfe1209626c74d99e..d0d31cb3e6710546a433476b8982ff9bb908431e 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 9899a800fbaf34a848b1e56c181b5c7ad9f7c83e..e9acf254562f4ff61fc27b03c99f8a9cc1075a28 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 14b256d53f4ed55a1a2fc4743d1e0839702be1d6..26eae1f353e1faf40965fc0e93eb8b283cd806f8 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 235c80e873ff505b66c10bd5c766e0a6fd6a84a5..6d4dd923fadef1a9d84e79f08c9800b72e68a73d 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 9ff4f9662a4ca843e88e76dda3781fb53ea61e20..86659deca258ad4017043eb436277ba9b84a90ed 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 dcbcf9e63d580fc3a4a2eca8c7c3ea27b392e6d4..0d946aa6dac4f32fbcb479c663f48b03fd378dc3 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 bf9e18421a499c4b3beaf8044635f6db48b150a2..09311d199ba5a3a2de3d8a46c09084a0ef094836 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 4b28a956481d1afe773db0ca023c6bf7ce3963be..04a66df1bd8c86f1f05705518913d308e26593a4 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 577107a3586a3f5bca2ac0232089f7a87fc864b3..e072907f403c991c6392671da528fa2d21ae8c88 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 93347807f8d80d743f2de2da80f5c35742f0b0f2..9b1e0f8834da25b2ee1e61d0ce013a144d12ecbc 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 8b088535d0ced68664ec8c30674d6af0774f2f31..f74d8d5eb32be12c4d252d49b44994f86fc2dae6 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 468d1e8427f23ba8343e1f7a1adfb6f3d7860a33..1257905d5672e0e7991521f9cc14a960d3856ca4 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 e6b04d4652cfc7c440bbdbcb399a934571fbb95b..d4fe5f7bac83aa241b04e723513a13c538a3392d 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 2b3bbd2d5614b8de7ecceba61437df1ba8117461..7e17060838cf1038f2a1dc67b2b9acffdd02c0c8 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 acb905116b572c5379a09bb23831c4a611cf8ee9..f131ee0ae72b5bab59a634a43f2aa760656aa7e7 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 29eb657b20caa9702bfdd5fcce28f471aab55ee4..864f4273981f07d92a9390655004726bf2ace79a 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 2aad6dfe570129f8e1ace1be0fdf3be37010e5ef..1d2fee931e2629e4186f2a1ee19e2068222c7e28 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 ff7a97d1360e51b9f5316796504d56ccc70bb60d..6f9a7e362e7fde862cc5fe154a866a7e0aaf816c 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 6a7e6e10c7f3f5aec065c124153a611322971a01..d122a4bb9dc7827786e68aec24519e9f65321e1e 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;
diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index f76a5aa4f7a40b2f9c6c49c3b7f530f764a790d0..4f60d51ee66e4b94dc49e8460f1bf30e1b0b4758 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 9ddc35b1475560aba317ca971c103e37d01e5da5..3d8d92d815371e99a843bea440c7cbf5993b2f20 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 40bcd0ca96b1c7647858f90e1bc69db460c6f0aa..dd52eba0e093b1862fe8386990e9be0a8eabb02e 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 8f440508b81d2f10144434ff392236c9973bc5dc..f63947bc4a6f4a175f8eaf6b7cb5dc9b7d0789ca 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 9e09914d6019e57829fb0b0ef49239531c26c7cb..5f663f26a80bd9af0b03fa7d436cab7c54717981 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 76b1628e68feb0aa89719c57d53d4c1467816a3f..1c2adb531b74623af1f1772010b9417fb83971c5 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 6712f23303f5f9b2511892d5a7aa6241bc38cfa5..9594418d487948dc50984b6cb472d89fae57f73d 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 4f51b13e1166597046c61bb8f406b31afd5e1e48..c765bf23d36b3aaef827d33be14c35a5e2e7b701 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 56a41db58af5f558a655e3cb7c20e1a84a216b71..040e82fa668e114c8a96abf6a361dda0c8027e35 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 f639933c1fc8fc0f2efbc92008db9a4c996c6130..057a9fe34ac90fbbd1508aabb5124827dfe71943 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 9dffdf35e706295a817bc9713795118a41267bf8..0ce4111f6e0e2493a79a738692107c93901d999e 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 66f07f9a31e86d3dc6243b9d38a84cbff89bca4f..49148d049e4b476c7eb8bd8c9d1600bfb58ac39a 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 354ed76f8180f11cec242a65d14ab51de395b26d..5f98dd0b438d47df9b5d269cce1b9720c1356244 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 a28d253f03ad489a668dbc43fda5bbbb2d40595d..03dfa798babb7931426ac3af5c93615e41f42dd3 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 95debcd7058c494bb72b2474cb5d97f4be0af364..f13f16c418fb9f97f1ccfcda6575a27e4ccef91a 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 76ec32db477f1c86ad0f6a5a5a3c200df68c2311..1eb42a9f715250b30c944d03c65f7f3759af7246 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 6e757345df647625fd6ba1eafeacb066341a9d33..938a8b7c338cdb33018958bcc64e1586bcad9e63 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 ab78856e65fb450bbfbdddcfcac04c89da2bacfc..112c7bc053b18bcca5169866566dcd047e2e8927 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 ff7b1843a2e60a6e34a8e76ffc6f4b5cb026f7cd..5615ef084ad05169a962fae4ae089ad913087556 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 8e0641e594f550eefa105a59f2bfaf94b090e0ce..d122546aa6468f7276cf386c4dbf0d6f2b82c9c6 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 3d6c7b01333f19b8d1a1ba57ed6d87a7fdd07b48..2f674860440fa215d0509468e505a967ce005312 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 cf47057966dbf99d7edb2204f6dff493123c440b..a6c68d809e6bd97e39e6a90a5403e1905776448b 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 19143edb64aace521b6e5ea33433d293a4cb0180..9abcb1640255e22e96de4e9d03320b16dcffc9ab 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/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index a4cd7a79e642d14f09c294916e26a85fbd61c19a..d13ff95f03d57ee88a7a53276157565486d065e8 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 243be7bc8ce3df50c620b992c6f5bcedf52a185f..57238a97cde749e4b5a06bac3d4a35c5835510b8 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 7c624d24ae3c61108bf06aeccbeb8baaaef045e8..06a23324d65bb694bb2cac682e7d8da86cec0d2f 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 3eecc073b5dff712a432d457a66b3178803cbc19..f06123f48c56cb1b8fc7a0e22a542501058088d4 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 013e41e2feafa5d7701f867e3cfd55b374ddbd3d..4cdd9cda153c7b87f9316890c33cd3b5fa3953f1 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/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 466464dd37adc965d78c0d1af79962d930e72e78..f8c801e237c2b09eeade98434f55ab70b7e8ab59 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 fe3ed8f2202257dc23aae9ed036f31e09fd5d87b..626cbb5dd2351095779b818c3cfe58ef87f294f7 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 3e020f463f620d4c3a8466fcd9262045ccda7a80..0e86f2c9365a4a188489c5b80bca83b44f9cd312 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 73bee41c4ced544b5331352d9930c09e7fa44772..05d312cc7551660a7daa51e87bfb1699a7de6125 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/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 77786d2c328c7fa3ce4b35da568d0833ccf6dd9d..b4f59ee7a7dc6ec2ef2d949c159f47fab0e30339 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/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index b21db469db148821130733a3e5bed780b7aad164..92182531d012db7b16ba9eef4712c72884f8e493 100755
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -48,7 +48,7 @@ class ActionsCardService extends Product
      *    @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->targetmodule     = $targetmodule;
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index aec1d5f65ea972321ea5e3b0ffebf29f783777ce..ff96ccf80f102f711287e0f07a0d10eef1e2b675 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 06bd03043dfb5c1cc60990bce257dbc69ace3d7b..aff8a64e7fcd7fcd507f1b97ee854c459acee86a 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 8d12267ea0b402068d7e32c58a7d1f993122a7ea..0e828ac43d0f0ef74d9e531cbb1c3df1b8a5f17f 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/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index c2afa0950d0d148878ffafeefb567c7c36f1d809..6321813fdb924eae385f11e95181edc55601d096 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/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 300f2dfb8bf27418904d0aff2a153aeb9e45ae0f..51b05e910e7bf68a58c579c59cf6f978e99efa64 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 4ec4d7fbed7720edf0cdb01e89094438d8c0aaa7..b6506045c1d827a05471cba8c78eb513b80e0839 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 9575f1e88a33f9dfdeed34a41c8c692f75d80473..f87a0af3db97b83cd2669167c3fa9418f8efbcab 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 c652b6bf759a59aff20e2e4f2cc63cc8fce7da9c..2ec8c130267f342d9acf6b506ab8addaa2489aea 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 25843dbfbdcdd879c300043702232dbf52c480dc..c2da51ae06a5085db3683e7140e9760ca718272d 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 554ba45289e2fdf8eadf0088f9a8bd092e1d768a..1ea697540352ce04bcbd9bee0dc52f9da7fd83c6 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 6891401179beb0cd620bf44dcfadc41163d62100..73820d14ff4fd057256fb5eb9ce1a49647327e50 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 54dba76bd3466e68a66be223487fde2dbf700c77..fe9ab89008a32fac5ddbda648e5cd88e4bb28c3d 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 9562d11bf7ad3de252d312f54636a86af70a9444..9b520a8f993b4398f4b581b9e2f37fb584d87d17 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 eb5e2028ada6bf8f24a3380d68adacd14135284c..d73e8661c8cfd3422003a7b178924d7ec444c37b 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 2b46d0ee45b1f81364b2dfd90b52a3ff4dedcc6a..ce253e65208429bdc9da7c5cd04bea1e82dd21c6 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 42f5503e1524f4beaa63acf69df516c67305117c..8759fce9a364d91324f37e3a54af8da7aaf76869 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 5595c9197685aa40759ba8786e49cfc14dedbf0e..9778c8aea60178eedf03af4df888753ae8f565fc 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 00c5c99985a7f011e8d6826449e2308d1bfed5c0..ed235a9fb85ad038f675969bf9238e5c668d032d 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 2a827af2665b80fece301e9e97f83e3f3c4b51d2..62e46c47502ebe0425cad5e17ffb590b4321e606 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 24101beedbe7f69b0b3779b6e63bba93dab80593..fbce577aa980d38c489a5c3e1d6c52d888a2550f 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 222fb62a86af2511ff0aa959c7aedad5dca2a2f1..c56b39f5cf417a3e1e444e0684076062ce1adcdc 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 7d9a1dde834999c4c0383caac970f1df890abb5e..1fc7c0e1ca00c6a3a2215b0e18d49840eb5bde6a 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 d7ba76dae2b925131828421129358ac61d22ae15..267af4057fc6c2ca1bedb2c4e1e2a9cc3a5e4b34 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 9a1afe73f53ec91549e82ab03f8a4c9a2be2013f..2313c03f854c8503bc25ccf3a413f3a6ffb3c565 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 99c845c4555cc40d6cf4d8750ce70f1bb052d373..0470b70e57a34094829376fa2c0264314283d57a 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 a345fdb436cc15a22d3908fe353bb29692fcb86c..0644c860aa25fff92073bcda8b9359a2409fc9ab 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 76e19726e267bae624b33ede3882fe513a3ba48f..cc47f70d38e5eff93cd872159a75c8078b3f2f4e 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 9a6cc1163f29f721fb2cdb363bc0889f8a7f6367..e8f7ceb3619c475faae4ea5d17a237d5bbdcf6ff 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 4797301b5757fdd9c59e193419c00b02627a0dfd..7a65f1989514d913c9c709668abad9dcfe84fd16 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 d1e25797e0d7fc7ac2d6d4da6b741506c75fddd4..d6dd3d5a16f0157d82b684408cf48d8d0d9e22e7 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 913b9bd4b33b97363781e49f7fd995053d1ee49e..04c49742c49115e566b5895318ef99f65d27383e 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 9b2924270e7326670d964ccef8e506bc5ca61adc..023caa2fd3aff6096f96482be2560a71e5c07016 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 8f092b1a6ba3261bd139d2f0d18baaa25598d9a1..5914248ce5f626f580736809f7c9b0d1bfe9e4a8 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 52f159ddf5f916a01fe5a1748c7f5c4c29194c7b..ac290161b06909e45ace0f7d7e66cb6118862482 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 7416fa9937af33575b6594d0d12df884465b3d77..d0be9c47e27804a348bf90f66c4ee318794a60cd 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 799b16da232d9e5db18fc7505a8a0e85403c0c20..5ec451598c970f41673490bf742b4ad77ba6ada5 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 c9ff64b3655c968ee5dae1eb3379953528d5545b..c8fd6b732f96e84980ad9337a86015bba960dd99 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 10d395ff94e2df298b0b96c0dd541b9190036d14..9ee2a99f7447c93a3c748890fefb83ce2e7cf97d 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 7f212843bd511cc133d88937e2e893f217e4ef5c..d781698fefcc768dd573cd708a05491d423a557d 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 b82878f33490976e938dce7d3d389fbf8547f2da..02a5809fee04e7aa6c75e703a2ef40802388bddf 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 223b94397e3d6776d2a41b855d684458c1326468..a82d24060e79c5aa8699188280f39a7499f7f0db 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 10e8b57a384e925274668329203420ad03c4453b..be152dcf06c4ecb9f4b2e191335165d8f6076124 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 430986a9ef64f41b8ae1ce95cf33e0d7d7ca1ff6..31c88f8dfa1cf7414457bd6e73d226741813169c 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;