From 5a73c32f46e4e8f6c0e32a3ccfe866165a321f66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a?= <marcosgdf@gmail.com>
Date: Mon, 30 Jul 2012 17:17:33 +0200
Subject: [PATCH] Migrated ClassName to __construct() function Changed $DB to
 $db lower-cased "Class"

---
 dev/skeletons/modMyModule.class.php                       | 2 +-
 htdocs/accountancy/class/accountancyaccount.class.php     | 6 +++---
 htdocs/accountancy/class/accountancysystem.class.php      | 6 +++---
 htdocs/adherents/class/adherent.class.php                 | 2 +-
 htdocs/adherents/class/adherent_type.class.php            | 6 +++---
 htdocs/adherents/class/adherentstats.class.php            | 2 +-
 htdocs/adherents/class/cotisation.class.php               | 2 +-
 htdocs/bookmarks/class/bookmark.class.php                 | 2 +-
 htdocs/boutique/client/class/boutiqueclient.class.php     | 2 +-
 htdocs/boutique/commande/class/boutiquecommande.class.php | 2 +-
 htdocs/boutique/critiques/class/critique.class.php        | 2 +-
 htdocs/boutique/promotion/class/promotion.class.php       | 2 +-
 htdocs/cashdesk/class/Auth.class.php                      | 6 +++---
 htdocs/cashdesk/class/Facturation.class.php               | 2 +-
 htdocs/comm/action/class/actioncomm.class.php             | 2 +-
 htdocs/comm/action/class/cactioncomm.class.php            | 2 +-
 htdocs/comm/propal/class/propal.class.php                 | 4 ++--
 htdocs/comm/propal/class/propalestats.class.php           | 6 +++---
 htdocs/comm/prospect/class/prospect.class.php             | 2 +-
 htdocs/commande/class/commande.class.php                  | 2 +-
 htdocs/commande/class/commandestats.class.php             | 2 +-
 htdocs/compta/bank/class/account.class.php                | 8 ++++----
 htdocs/compta/bank/class/bankcateg.class.php              | 6 +++---
 .../compta/deplacement/class/deplacementstats.class.php   | 2 +-
 htdocs/compta/dons/class/don.class.php                    | 6 +++---
 htdocs/compta/facture/class/facture-rec.class.php         | 6 +++---
 htdocs/compta/facture/class/facture.class.php             | 4 ++--
 htdocs/compta/facture/class/facturestats.class.php        | 2 +-
 htdocs/compta/facture/class/paymentterm.class.php         | 6 +++---
 htdocs/compta/localtax/class/localtax.class.php           | 6 +++---
 .../compta/paiement/cheque/class/remisecheque.class.php   | 2 +-
 htdocs/compta/paiement/class/paiement.class.php           | 4 ++--
 htdocs/compta/prelevement/class/bon-prelevement.class.php | 2 +-
 .../compta/prelevement/class/ligne-prelevement.class.php  | 2 +-
 .../compta/prelevement/class/rejet-prelevement.class.php  | 2 +-
 htdocs/compta/sociales/class/chargesociales.class.php     | 2 +-
 .../sociales/class/paymentsocialcontribution.class.php    | 2 +-
 htdocs/compta/tva/class/tva.class.php                     | 6 +++---
 htdocs/contact/class/contact.class.php                    | 2 +-
 htdocs/contrat/class/contrat.class.php                    | 4 ++--
 htdocs/core/boxes/box_actions.php                         | 2 +-
 htdocs/core/boxes/box_activity.php                        | 2 +-
 htdocs/core/boxes/box_bookmarks.php                       | 2 +-
 htdocs/core/boxes/box_clients.php                         | 2 +-
 htdocs/core/boxes/box_commandes.php                       | 2 +-
 htdocs/core/boxes/box_comptes.php                         | 2 +-
 htdocs/core/boxes/box_contacts.php                        | 2 +-
 htdocs/core/boxes/box_contracts.php                       | 2 +-
 htdocs/core/boxes/box_external_rss.php                    | 2 +-
 htdocs/core/boxes/box_factures.php                        | 2 +-
 htdocs/core/boxes/box_factures_fourn.php                  | 2 +-
 htdocs/core/boxes/box_factures_fourn_imp.php              | 2 +-
 htdocs/core/boxes/box_factures_imp.php                    | 2 +-
 htdocs/core/boxes/box_fournisseurs.php                    | 2 +-
 htdocs/core/boxes/box_members.php                         | 2 +-
 htdocs/core/boxes/box_osc_client.php                      | 2 +-
 htdocs/core/boxes/box_produits.php                        | 2 +-
 htdocs/core/boxes/box_propales.php                        | 2 +-
 htdocs/core/boxes/box_prospect.php                        | 2 +-
 htdocs/core/boxes/box_services_contracts.php              | 2 +-
 htdocs/core/boxes/box_services_expired.php                | 2 +-
 htdocs/core/boxes/box_supplier_orders.php                 | 2 +-
 htdocs/core/boxes/modules_boxes.php                       | 2 +-
 htdocs/core/class/CMailFile.class.php                     | 2 +-
 htdocs/core/class/CSMSFile.class.php                      | 2 +-
 htdocs/core/class/antivir.class.php                       | 2 +-
 htdocs/core/class/conf.class.php                          | 2 +-
 htdocs/core/class/cookie.class.php                        | 2 +-
 htdocs/core/class/cpays.class.php                         | 2 +-
 htdocs/core/class/ctypent.class.php                       | 2 +-
 htdocs/core/class/discount.class.php                      | 6 +++---
 htdocs/core/class/doleditor.class.php                     | 2 +-
 htdocs/core/class/dolexception.class.php                  | 2 +-
 htdocs/core/class/dolgeoip.class.php                      | 2 +-
 htdocs/core/class/dolgraph.class.php                      | 2 +-
 htdocs/core/class/events.class.php                        | 2 +-
 htdocs/core/class/extrafields.class.php                   | 2 +-
 htdocs/core/class/google.class.php                        | 2 +-
 htdocs/core/class/html.formactions.class.php              | 2 +-
 htdocs/core/class/html.formadmin.class.php                | 2 +-
 htdocs/core/class/html.formbarcode.class.php              | 2 +-
 htdocs/core/class/html.formcompany.class.php              | 2 +-
 htdocs/core/class/html.formfile.class.php                 | 2 +-
 htdocs/core/class/html.formmail.class.php                 | 2 +-
 htdocs/core/class/html.formorder.class.php                | 2 +-
 htdocs/core/class/html.formother.class.php                | 2 +-
 htdocs/core/class/html.formsms.class.php                  | 2 +-
 htdocs/core/class/interfaces.class.php                    | 2 +-
 htdocs/core/class/menu.class.php                          | 2 +-
 htdocs/core/class/menubase.class.php                      | 2 +-
 htdocs/core/class/notify.class.php                        | 2 +-
 htdocs/core/class/rssparser.class.php                     | 2 +-
 htdocs/core/class/translate.class.php                     | 2 +-
 htdocs/core/db/mssql.class.php                            | 2 +-
 htdocs/core/db/mysql.class.php                            | 2 +-
 htdocs/core/db/mysqli.class.php                           | 2 +-
 htdocs/core/db/pgsql.class.php                            | 2 +-
 htdocs/core/db/sqlite.class.php                           | 2 +-
 htdocs/core/login/functions_myopenid.php                  | 2 +-
 htdocs/core/menus/smartphone/smartphone_backoffice.php    | 2 +-
 htdocs/core/menus/smartphone/smartphone_frontoffice.php   | 2 +-
 htdocs/core/menus/standard/auguria_backoffice.php         | 4 ++--
 htdocs/core/menus/standard/auguria_frontoffice.php        | 4 ++--
 htdocs/core/menus/standard/eldy_backoffice.php            | 4 ++--
 htdocs/core/menus/standard/eldy_frontoffice.php           | 4 ++--
 htdocs/core/menus/standard/empty.php                      | 4 ++--
 htdocs/core/modules/dons/html_cerfafr.modules.php         | 2 +-
 .../expedition/doc/pdf_expedition_merou.modules.php       | 2 +-
 .../expedition/doc/pdf_expedition_rouget.modules.php      | 2 +-
 .../modules/expedition/methode_expedition.modules.php     | 2 +-
 htdocs/core/modules/mailings/modules_mailings.php         | 2 +-
 htdocs/core/modules/modAccounting.class.php               | 2 +-
 htdocs/core/modules/modAdherent.class.php                 | 2 +-
 htdocs/core/modules/modAgenda.class.php                   | 2 +-
 htdocs/core/modules/modBanque.class.php                   | 2 +-
 htdocs/core/modules/modBarcode.class.php                  | 2 +-
 htdocs/core/modules/modBookmark.class.php                 | 2 +-
 htdocs/core/modules/modBoutique.class.php                 | 2 +-
 htdocs/core/modules/modCashDesk.class.php                 | 2 +-
 htdocs/core/modules/modCategorie.class.php                | 2 +-
 htdocs/core/modules/modClickToDial.class.php              | 2 +-
 htdocs/core/modules/modCommande.class.php                 | 2 +-
 htdocs/core/modules/modComptabilite.class.php             | 2 +-
 htdocs/core/modules/modContrat.class.php                  | 2 +-
 htdocs/core/modules/modDeplacement.class.php              | 6 +++---
 htdocs/core/modules/modDocument.class.php                 | 2 +-
 htdocs/core/modules/modDon.class.php                      | 2 +-
 htdocs/core/modules/modECM.class.php                      | 2 +-
 htdocs/core/modules/modExpedition.class.php               | 2 +-
 htdocs/core/modules/modExport.class.php                   | 2 +-
 htdocs/core/modules/modExternalRss.class.php              | 2 +-
 htdocs/core/modules/modExternalSite.class.php             | 2 +-
 htdocs/core/modules/modFTP.class.php                      | 2 +-
 htdocs/core/modules/modFacture.class.php                  | 2 +-
 htdocs/core/modules/modFckeditor.class.php                | 2 +-
 htdocs/core/modules/modFicheinter.class.php               | 2 +-
 htdocs/core/modules/modFournisseur.class.php              | 2 +-
 htdocs/core/modules/modGeoIPMaxmind.class.php             | 2 +-
 htdocs/core/modules/modGravatar.class.php                 | 2 +-
 htdocs/core/modules/modImport.class.php                   | 2 +-
 htdocs/core/modules/modLabel.class.php                    | 2 +-
 htdocs/core/modules/modLdap.class.php                     | 2 +-
 htdocs/core/modules/modMailing.class.php                  | 2 +-
 htdocs/core/modules/modMailmanSpip.class.php              | 2 +-
 htdocs/core/modules/modNotification.class.php             | 2 +-
 htdocs/core/modules/modPaybox.class.php                   | 2 +-
 htdocs/core/modules/modPaypal.class.php                   | 2 +-
 htdocs/core/modules/modPrelevement.class.php              | 2 +-
 htdocs/core/modules/modProduct.class.php                  | 2 +-
 htdocs/core/modules/modProjet.class.php                   | 2 +-
 htdocs/core/modules/modPropale.class.php                  | 2 +-
 htdocs/core/modules/modService.class.php                  | 2 +-
 htdocs/core/modules/modSociete.class.php                  | 2 +-
 htdocs/core/modules/modStock.class.php                    | 2 +-
 htdocs/core/modules/modSyslog.class.php                   | 2 +-
 htdocs/core/modules/modTax.class.php                      | 2 +-
 htdocs/core/modules/modUser.class.php                     | 2 +-
 htdocs/core/modules/modWebServices.class.php              | 2 +-
 .../security/generate/modGeneratePassNone.class.php       | 2 +-
 .../security/generate/modGeneratePassStandard.class.php   | 2 +-
 htdocs/core/triggers/interface_20_all_Logevents.class.php | 2 +-
 .../interface_20_modPaypal_PaypalWorkflow.class.php       | 2 +-
 .../interface_20_modWorkflow_WorkflowManager.class.php    | 2 +-
 .../triggers/interface_50_modAgenda_ActionsAuto.class.php | 2 +-
 .../triggers/interface_50_modLdap_Ldapsynchro.class.php   | 2 +-
 .../interface_50_modNotification_Notification.class.php   | 2 +-
 .../core/triggers/interface_90_all_Demo.class.php-NORUN   | 2 +-
 htdocs/ecm/class/ecmdirectory.class.php                   | 2 +-
 htdocs/ecm/class/htmlecm.form.class.php                   | 2 +-
 htdocs/expedition/class/expedition.class.php              | 4 ++--
 htdocs/expedition/class/expeditionstats.class.php         | 6 +++---
 htdocs/exports/class/export.class.php                     | 2 +-
 htdocs/fichinter/class/fichinter.class.php                | 2 +-
 htdocs/fourn/class/fournisseur.facture.class.php          | 2 +-
 htdocs/fourn/class/paiementfourn.class.php                | 2 +-
 htdocs/imports/class/import.class.php                     | 2 +-
 htdocs/livraison/class/livraison.class.php                | 4 ++--
 .../product/canvas/service/actions_card_service.class.php | 2 +-
 htdocs/product/class/html.formproduct.class.php           | 2 +-
 htdocs/product/class/product.class.php                    | 2 +-
 htdocs/product/class/service.class.php                    | 2 +-
 htdocs/product/stock/class/mouvementstock.class.php       | 6 +++---
 htdocs/societe/class/societe.class.php                    | 2 +-
 htdocs/user/class/usergroup.class.php                     | 2 +-
 test/phpunit/AdherentTest.php                             | 2 +-
 test/phpunit/AdminLibTest.php                             | 2 +-
 test/phpunit/BankAccountTest.php                          | 2 +-
 test/phpunit/BuildDocTest.php                             | 6 +++---
 test/phpunit/CMailFileTest.php                            | 2 +-
 test/phpunit/CategorieTest.php                            | 2 +-
 test/phpunit/ChargeSocialesTest.php                       | 2 +-
 test/phpunit/CommandeFournisseurTest.php                  | 2 +-
 test/phpunit/CommandeTest.php                             | 2 +-
 test/phpunit/CommonObjectTest.php                         | 2 +-
 test/phpunit/CompanyBankAccountTest.php                   | 2 +-
 test/phpunit/ContactTest.php                              | 2 +-
 test/phpunit/ContratTest.php                              | 2 +-
 test/phpunit/CoreTest.php                                 | 2 +-
 test/phpunit/DateLibTest.php                              | 2 +-
 test/phpunit/DiscountTest.php                             | 2 +-
 test/phpunit/ExportTest.php                               | 2 +-
 test/phpunit/FactureFournisseurTest.php                   | 2 +-
 test/phpunit/FactureTest.php                              | 2 +-
 test/phpunit/FactureTestRounding.php                      | 2 +-
 test/phpunit/FilesLibTest.php                             | 2 +-
 test/phpunit/Functions2Test.php                           | 2 +-
 test/phpunit/FunctionsTest.php                            | 2 +-
 test/phpunit/ImagesLibTest.php                            | 2 +-
 test/phpunit/ImportTest.php                               | 2 +-
 test/phpunit/ModulesTest.php                              | 2 +-
 test/phpunit/PdfDocTest.php                               | 2 +-
 test/phpunit/PgsqlTest.php                                | 2 +-
 test/phpunit/PricesTest.php                               | 2 +-
 test/phpunit/ProductTest.php                              | 2 +-
 test/phpunit/PropalTest.php                               | 2 +-
 test/phpunit/SecurityTest.php                             | 2 +-
 test/phpunit/SocieteTest.php                              | 2 +-
 test/phpunit/UserGroupTest.php                            | 2 +-
 test/phpunit/UserTest.php                                 | 2 +-
 test/phpunit/WebservicesTest.php                          | 2 +-
 test/phpunit/_NumberingModulesTest.php                    | 2 +-
 221 files changed, 267 insertions(+), 267 deletions(-)

diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index 8f819e58438..98e50bc813a 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -38,7 +38,7 @@ class modMyModule extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modMyModule($db)
+	function __construct($db)
 	{
         global $langs,$conf;
 
diff --git a/htdocs/accountancy/class/accountancyaccount.class.php b/htdocs/accountancy/class/accountancyaccount.class.php
index 3d5814d143a..f99f61e782c 100644
--- a/htdocs/accountancy/class/accountancyaccount.class.php
+++ b/htdocs/accountancy/class/accountancyaccount.class.php
@@ -43,11 +43,11 @@ class AccountancyAccount
     /**
      *  Constructor
      *
-     *  @param		DoliDB		$DB		Database handler
+     *  @param		DoliDB		$db		Database handler
      */
-    function AccountancyAccount($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
     }
 
 
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index 2c278030a62..c64ede9953a 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -42,11 +42,11 @@ class AccountancySystem
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function AccountancySystem($DB)
+	function __construct($db)
 	{
-		$this->db = $DB;
+		$this->db = $db;
 	}
 
 
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 83b2c24dbc5..20195bf073b 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -117,7 +117,7 @@ class Adherent extends CommonObject
 	 *
 	 *	@param 		DoliDB		$db		Database handler
      */
-    function Adherent($db)
+    function __construct($db)
     {
         $this->db = $db;
         $this->statut = -1;
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index aa08f2cbbe3..ea2a6489f5b 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -48,11 +48,11 @@ class AdherentType extends CommonObject
     /**
 	 *	Constructor
 	 *
-	 *	@param 		DoliDB		$DB		Database handler
+	 *	@param 		DoliDB		$db		Database handler
      */
-    function AdherentType($DB)
+    function __construct($db)
     {
-        $this->db = $DB ;
+        $this->db = $db;
         $this->statut = 1;
     }
 
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 0424b428f66..4db3884cdad 100755
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -51,7 +51,7 @@ class AdherentStats extends Stats
      * 	@param   	int			$userid    	Id user for filter
 	 * 	@return 	AdherentStats
 	 */
-	function AdherentStats($db, $socid=0, $userid=0)
+	function __construct($db, $socid=0, $userid=0)
 	{
 		global $user, $conf;
 
diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php
index 4a07b5dd9c9..eb4624a4c40 100644
--- a/htdocs/adherents/class/cotisation.class.php
+++ b/htdocs/adherents/class/cotisation.class.php
@@ -50,7 +50,7 @@ class Cotisation extends CommonObject
 	 *
 	 *	@param 		DoliDB		$db		Database handler
 	 */
-	function Cotisation($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index d3d30d7c723..088d4751d2e 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -45,7 +45,7 @@ class Bookmark
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function Bookmark($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/boutique/client/class/boutiqueclient.class.php b/htdocs/boutique/client/class/boutiqueclient.class.php
index a84b81ed6a7..bc404113b1d 100644
--- a/htdocs/boutique/client/class/boutiqueclient.class.php
+++ b/htdocs/boutique/client/class/boutiqueclient.class.php
@@ -39,7 +39,7 @@ class BoutiqueClient
 	 *
 	 * 	@param		DoliDB	$db		Database handler
 	 */
-    function BoutiqueClient($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php
index 143a4e3f1ad..cb049194fd1 100644
--- a/htdocs/boutique/commande/class/boutiquecommande.class.php
+++ b/htdocs/boutique/commande/class/boutiquecommande.class.php
@@ -43,7 +43,7 @@ class BoutiqueCommande
      *
      * @param	DoliDB	$db		Database handler
      */
-    function BoutiqueCommande($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/boutique/critiques/class/critique.class.php b/htdocs/boutique/critiques/class/critique.class.php
index eca4877b0ed..9bf1ff22dc9 100644
--- a/htdocs/boutique/critiques/class/critique.class.php
+++ b/htdocs/boutique/critiques/class/critique.class.php
@@ -37,7 +37,7 @@ class Critique
 	 *
 	 * @param	DoliDB		$db		Database handler
 	 */
-	function Critique($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/boutique/promotion/class/promotion.class.php b/htdocs/boutique/promotion/class/promotion.class.php
index 5631f30207c..be27ea78a9d 100644
--- a/htdocs/boutique/promotion/class/promotion.class.php
+++ b/htdocs/boutique/promotion/class/promotion.class.php
@@ -43,7 +43,7 @@ class Promotion
 	 *
 	 * 	@param		DoliDB		$db		Database handler
 	 */
-	function Promotion($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
index 7eec78ebd32..b625eccd28e 100644
--- a/htdocs/cashdesk/class/Auth.class.php
+++ b/htdocs/cashdesk/class/Auth.class.php
@@ -34,12 +34,12 @@ class Auth
 	/**
 	 * Enter description here ...
 	 *
-	 * @param	DoliDB	$DB			Database handler
+	 * @param	DoliDB	$db			Database handler
 	 * @return	void
 	 */
-	function Auth($DB)
+	function __construct($db)
 	{
-		$this->db = $DB;
+		$this->db = $db;
 		$this->reponse(null);
 	}
 
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index eff1cfbf590..19d7bba3914 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -72,7 +72,7 @@ class Facturation
     /**
      *	Constructor
      */
-    public function Facturation()
+    public function __construct()
     {
         $this->raz();
         $this->razPers();
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 938f8b77680..966b0f25d7b 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -84,7 +84,7 @@ class ActionComm extends CommonObject
      *
      *      @param		DoliDB		$db      Database handler
      */
-    function ActionComm($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 4c140b4abd8..ba9f8658784 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -47,7 +47,7 @@ class CActionComm
      *
      *  @param	DoliDB		$db		Database handler
      */
-    function CActionComm($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index cd721792c61..77b511a9e89 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 28feac26022..7c3b0c27eb0 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -47,15 +47,15 @@ class PropaleStats extends Stats
 	/**
 	 * Constructor
 	 *
-	 * @param 	DoliDB	$DB		   Database handler
+	 * @param 	DoliDB	$db		   Database handler
 	 * @param 	int		$socid	   Id third party
      * @param   int		$userid    Id user for filter
 	 */
-	function PropaleStats($DB, $socid=0, $userid=0)
+	function __construct($db, $socid=0, $userid=0)
 	{
 		global $user, $conf;
 
-		$this->db = $DB;
+		$this->db = $db;
         $this->socid = $socid;
         $this->userid = $userid;
 
diff --git a/htdocs/comm/prospect/class/prospect.class.php b/htdocs/comm/prospect/class/prospect.class.php
index f4813d96da8..b6ce9b07032 100644
--- a/htdocs/comm/prospect/class/prospect.class.php
+++ b/htdocs/comm/prospect/class/prospect.class.php
@@ -39,7 +39,7 @@ class Prospect extends Societe
      *
      *	@param	DoliDB	$db		Databas handler
      */
-    function Prospect($db)
+    function __construct($db)
     {
         global $config;
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 226751306db..2bf5a733e1c 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 5221b01fe1b..d531c5da6c5 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -50,7 +50,7 @@ class CommandeStats extends Stats
 	 * @param 	string	$mode	   Option
 	 * @param   int		$userid    Id user for filter
 	 */
-	function CommandeStats($db, $socid, $mode, $userid=0)
+	function __construct($db, $socid, $mode, $userid=0)
 	{
 		global $user, $conf;
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 2811c803486..2ca362f4696 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -990,13 +990,13 @@ class Account extends CommonObject
         return 0;
     }
 
-    /**
+    /**
      *	Load miscellaneous information for tab "Info"
      *
      *	@param  int		$id		Id of object to load
      *	@return	void
-     */
-    function info($id)
+     */
+    function info($id)
     {
 
     }
@@ -1068,7 +1068,7 @@ class AccountLine extends CommonObject
      *
      *  @param	DoliDB	$db		Database handler
      */
-    function AccountLine($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 4bcc156c417..c8efd9c883e 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -46,11 +46,11 @@ class BankCateg // extends CommonObject
     /**
      *	Constructor
      *
-     *  @param		DoliDB		$DB      Database handler
+     *  @param		DoliDB		$db      Database handler
      */
-    function BankCateg($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
         return 1;
     }
 
diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php
index 68a8608fd09..f41a8c663cf 100644
--- a/htdocs/compta/deplacement/class/deplacementstats.class.php
+++ b/htdocs/compta/deplacement/class/deplacementstats.class.php
@@ -48,7 +48,7 @@ class DeplacementStats extends Stats
      * @param   int			$userid    Id user for filter
 	 * @return 	void
 	 */
-	function DeplacementStats($db, $socid=0, $userid=0)
+	function __construct($db, $socid=0, $userid=0)
 	{
 		global $conf;
 
diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php
index 075200bccf3..5c5a9a10439 100644
--- a/htdocs/compta/dons/class/don.class.php
+++ b/htdocs/compta/dons/class/don.class.php
@@ -58,13 +58,13 @@ class Don extends CommonObject
     /**
      *  Constructor
      *
-     *  @param	DoliDB	$DB		Database handler
+     *  @param	DoliDB	$db 	Database handler
      */
-    function Don($DB)
+    function __construct($db)
     {
         global $langs;
 
-        $this->db = $DB ;
+        $this->db = $db;
         $this->modepaiementid = 0;
 
         $langs->load("donations");
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index daa0aab3215..1b19a2205f9 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -68,11 +68,11 @@ class FactureRec extends Facture
 	/**
 	 *	Constructor
 	 *
-	 * 	@param		DoliDB		$DB		Database handler
+	 * 	@param		DoliDB		$db		Database handler
 	 */
-	function FactureRec($DB)
+	function __construct($db)
 	{
-		$this->db = $DB ;
+		$this->db = $db;
 	}
 
 	/**
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index a81f9c81a25..33660eee17b 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -115,7 +115,7 @@ class Facture extends CommonInvoice
      *
 	 * 	@param	DoliDB		$db			Database handler
      */
-    function Facture($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
@@ -3160,7 +3160,7 @@ class FactureLigne
      *
      *  @param	DoliDB		$db		Database handler
      */
-    function FactureLigne($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index fcbd5a99708..c56183ca777 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -51,7 +51,7 @@ class FactureStats extends Stats
      * 	@param	int			$userid    	Id user for filter
 	 * 	@return FactureStats
 	 */
-	function FactureStats($db, $socid, $mode, $userid=0)
+	function __construct($db, $socid, $mode, $userid=0)
 	{
 		global $conf;
 
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 84a14f614fb..ba5dc74c734 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -53,11 +53,11 @@ class PaymentTerm // extends CommonObject
     /**
      * 	Constructor
      *
-	 * 	@param	DoliDB		$DB			Database handler
+	 * 	@param	DoliDB		$db			Database handler
      */
-    function PaymentTerm($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
         return 1;
     }
 
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 6c1ef48f957..99ae27599c0 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -45,11 +45,11 @@ class localtax extends CommonObject
     /**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
      */
-    function __construct($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
     }
 
 
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index ca4b8663147..6f7e231d90c 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 86080fbc623..2e2abf4c79f 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -58,9 +58,9 @@ class Paiement extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Paiement($db)
+	function __construct($db)
 	{
-		$this->db = $db ;
+		$this->db = $db;
 	}
 
 	/**
diff --git a/htdocs/compta/prelevement/class/bon-prelevement.class.php b/htdocs/compta/prelevement/class/bon-prelevement.class.php
index 557f72771f2..9fd3029437d 100644
--- a/htdocs/compta/prelevement/class/bon-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/bon-prelevement.class.php
@@ -56,7 +56,7 @@ class BonPrelevement extends CommonObject
      *  @param		DoliDB		$db      	Database handler
      *  @param		string		$filename	Filename of withdraw receipt
      */
-    function BonPrelevement($db, $filename='')
+    function __construct($db, $filename='')
     {
         global $conf,$langs;
 
diff --git a/htdocs/compta/prelevement/class/ligne-prelevement.class.php b/htdocs/compta/prelevement/class/ligne-prelevement.class.php
index b372d274f15..c3231f07acb 100644
--- a/htdocs/compta/prelevement/class/ligne-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligne-prelevement.class.php
@@ -44,7 +44,7 @@ class LignePrelevement
 	 *  @param	DoliDb	$db			Database handler
 	 *  @param 	User	$user       Objet user
 	 */
-	function LignePrelevement($db, $user)
+	function __construct($db, $user)
 	{
 		global $conf,$langs;
 
diff --git a/htdocs/compta/prelevement/class/rejet-prelevement.class.php b/htdocs/compta/prelevement/class/rejet-prelevement.class.php
index 1d8737d6cff..b6f8a967f10 100644
--- a/htdocs/compta/prelevement/class/rejet-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejet-prelevement.class.php
@@ -41,7 +41,7 @@ class RejetPrelevement
 	 *  @param	DoliDb	$db			Database handler
 	 *  @param 	User	$user       Objet user
 	 */
-	function RejetPrelevement($db, $user)
+	function __construct($db, $user)
 	{
 		global $langs;
 
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 8c3d25644b3..26cff9343f5 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -52,7 +52,7 @@ class ChargeSociales extends CommonObject
      *
      * @param	DoliDB		$db		Database handler
      */
-    function ChargeSociales($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 5a3b63bb89e..25f50e4a7e0 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -54,7 +54,7 @@ class PaymentSocialContribution extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function PaymentSocialContribution($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 0f141549ab1..6dd3183e02d 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -55,11 +55,11 @@ class Tva extends CommonObject
     /**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
      */
-    function Tva($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
         return 1;
     }
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 6e03e4c5eae..60873f86a32 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -90,7 +90,7 @@ class Contact extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Contact($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 4d26149de64..9aaa124fa45 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -72,7 +72,7 @@ class Contrat extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Contrat($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
@@ -1621,7 +1621,7 @@ class ContratLigne
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function ContratLigne($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index c4b10f1bf02..41d74fdebee 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -45,7 +45,7 @@ class box_actions extends ModeleBoxes
 	/**
 	 *  Constructor
 	 */
-	function box_actions()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 253b0b4800c..b1364b2bba2 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -41,7 +41,7 @@ class box_activity extends ModeleBoxes
 	/**
 	 *	Constructor
 	 */
-	function box_activity()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index bda9ccaeeb1..0be97f83a4c 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -41,7 +41,7 @@ class box_bookmarks extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_bookmarks()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 8b087463e83..a0ab16baf0e 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -45,7 +45,7 @@ class box_clients extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_clients()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index a54d2eda2ba..f89e37f191e 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -45,7 +45,7 @@ class box_commandes extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_commandes()
+    function __construct()
     {
         global $langs;
         $langs->load("boxes");
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index e23f51971c4..390dbe52ac2 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -46,7 +46,7 @@ class box_comptes extends ModeleBoxes
 	/**
 	 *  Constructor
 	 */
-	function box_comptes()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 78100419cbf..577ef3262ff 100755
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -46,7 +46,7 @@ class box_contacts extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_contacts()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index d0267bfb0f4..57cc7eafaa1 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -44,7 +44,7 @@ class box_contracts extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_contracts()
+    function __construct()
     {
     	global $langs;
 
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 51f197ec3fd..cceaafa5985 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -50,7 +50,7 @@ class box_external_rss extends ModeleBoxes
      * 	@param	DoliDB	$db			Database handler
      *  @param	string	$param		More parameters
      */
-    function box_external_rss($db,$param)
+    function __construct($db,$param)
     {
         global $langs;
         $langs->load("boxes");
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 736c13ce88a..ee8e01a24f8 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -44,7 +44,7 @@ class box_factures extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_factures()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 45cccf95a97..eb3cf5e67c9 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -44,7 +44,7 @@ class box_factures_fourn extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_factures_fourn()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 571d3c3e558..fc167601cc6 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -44,7 +44,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_factures_fourn_imp()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 70487fca5ad..0aaf343d876 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -47,7 +47,7 @@ class box_factures_imp extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_factures_imp()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 0b275f25e4d..bb9a4adbfa6 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -44,7 +44,7 @@ class box_fournisseurs extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_fournisseurs()
+    function __construct()
     {
         global $langs;
         $langs->load("boxes");
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index d1fc2b2e78b..e64649ec1fd 100755
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -45,7 +45,7 @@ class box_members extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_members()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_osc_client.php b/htdocs/core/boxes/box_osc_client.php
index c2a4a0d00ea..e19ef1c0169 100644
--- a/htdocs/core/boxes/box_osc_client.php
+++ b/htdocs/core/boxes/box_osc_client.php
@@ -44,7 +44,7 @@ class box_osc_clients extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_osc_clients()
+    function __construct()
     {
         global $langs;
         $langs->load("boxes");
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 10d85f10cda..a75cbf15991 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -47,7 +47,7 @@ class box_produits extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_produits()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 9f818bc63f7..9f9bd706ac0 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -46,7 +46,7 @@ class box_propales extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_propales()
+    function __construct()
     {
     	global $langs;
       $langs->load("boxes");
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 87d2324013e..4251b9f1953 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -49,7 +49,7 @@ class box_prospect extends ModeleBoxes
      *
      *  @param	DoliDB	$db		Database handler
 	 */
-	function box_prospect($db)
+	function __construct($db)
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 646be1ca90c..bd1686da45a 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -45,7 +45,7 @@ class box_services_contracts extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_services_contracts()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index b8a42fe8f03..bcb31e96464 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -45,7 +45,7 @@ class box_services_expired extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_services_expired()
+    function __construct()
     {
     	global $langs;
 
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index aa310118fd9..6577cb432cf 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -43,7 +43,7 @@ class box_supplier_orders extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_supplier_orders()
+    function __construct()
     {
         global $langs;
         $langs->load("boxes");
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index da6ee0cf31b..12aadcf4a94 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -48,7 +48,7 @@ class ModeleBoxes    // Can't be abtract as it is instanciated to build "empty"
 	 *
 	 *	@param	DoliDB		$db		Database hanlder
 	 */
-	function ModeleBoxes($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 2c5fca61300..e4d387395a4 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -98,7 +98,7 @@ class CMailFile
 	 *	@param 	string	$errors_to      		Email errors
 	 *	@param	string	$css			        Css option
 	 */
-	function CMailFile($subject,$to,$from,$msg,
+	function __construct($subject,$to,$from,$msg,
 	$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),
 	$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='')
 	{
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index c771f130a2b..1f7fa7c5258 100755
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -58,7 +58,7 @@ class CSMSFile
 	 *	@param 	int		$class				Class
 	 *	@return	int
 	 */
-	function CSMSFile($to,$from,$msg,$deliveryreceipt=0,$deferred=0,$priority=3,$class=1)
+	function __construct($to,$from,$msg,$deliveryreceipt=0,$deferred=0,$priority=3,$class=1)
 	{
 		global $conf;
 
diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
index 7fa522d2037..cd2dc5c1e6c 100644
--- a/htdocs/core/class/antivir.class.php
+++ b/htdocs/core/class/antivir.class.php
@@ -42,7 +42,7 @@ class AntiVir
 	 *  @param      DoliDB		$db      Database handler
 	 *	@return AntiVir
 	 */
-	function AntiVir($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 2841baa79f0..be2fdce15fd 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -75,7 +75,7 @@ class Conf
 	 *
 	 * @return Conf
 	 */
-	function Conf()
+	function __construct()
 	{
 		// Avoid warnings when filling this->xxx
 		$this->file				= (object) array();
diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php
index 88dda14020c..df8e53c2c74 100644
--- a/htdocs/core/class/cookie.class.php
+++ b/htdocs/core/class/cookie.class.php
@@ -43,7 +43,7 @@ class DolCookie
 	 *
 	 *  @param      string		$key      Personnal key
 	 */
-	function DolCookie($key = '')
+	function __construct($key = '')
 	{
 		$this->myKey = $key;
 		$this->cookiearray = array();
diff --git a/htdocs/core/class/cpays.class.php b/htdocs/core/class/cpays.class.php
index ec3283d73ce..8287a2d6f1b 100644
--- a/htdocs/core/class/cpays.class.php
+++ b/htdocs/core/class/cpays.class.php
@@ -54,7 +54,7 @@ class Cpays // extends CommonObject
      *
      *  @param      DoliDb		$db      Database handler
      */
-    function Cpays($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 66c4bbefc03..b91943d146f 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -49,7 +49,7 @@ class Ctypent // extends CommonObject
      *
      *  @param      DoliDb		$db      Database handler
      */
-    function Ctypent($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index ff065db2bae..597e2aae86f 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -49,11 +49,11 @@ class DiscountAbsolute
     /**
      *	Constructor
      *
-     *  @param  	DoliDB		$DB		Database handler
+     *  @param  	DoliDB		$db		Database handler
      */
-    function DiscountAbsolute($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
     }
 
 
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index d6d1bd86539..3a7382c44ce 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -61,7 +61,7 @@ class DolEditor
      *      @param  int		$rows                   Size of rows for textarea tool
 	 *      @param  int		$cols                   Size of cols for textarea tool
 	 */
-    function DolEditor($htmlname,$content,$width='',$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true,$okforextendededitor=true,$rows=0,$cols=0)
+    function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true,$okforextendededitor=true,$rows=0,$cols=0)
     {
     	global $conf,$langs;
 
diff --git a/htdocs/core/class/dolexception.class.php b/htdocs/core/class/dolexception.class.php
index ef8e2cc2934..15fe1e7e74d 100644
--- a/htdocs/core/class/dolexception.class.php
+++ b/htdocs/core/class/dolexception.class.php
@@ -30,7 +30,7 @@ class DolException extends Exception
     /**
      * Constructor
      */
-    function DolException()
+    function __construct()
     {
     }
 }
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 7ffb72308da..2fb677aeffe 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -42,7 +42,7 @@ class DolGeoIP
 	 * @param	string	$datfile	Data file
 	 * @return 	GeoIP
 	 */
-	function DolGeoIP($type,$datfile)
+	function __construct($type,$datfile)
 	{
 		if ($type == 'country')
 		{
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 68571f50066..cd82c00e0e6 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -82,7 +82,7 @@ class DolGraph
     /**
      * Constructor
      */
-    function DolGraph()
+    function __construct()
     {
         global $conf;
         global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 5f6ad7de21c..78fd96de911 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -90,7 +90,7 @@ class Events // extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Events($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		return 1;
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index d3add99deac..70b51714aef 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -48,7 +48,7 @@ class ExtraFields
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function ExtraFields($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->error = array();
diff --git a/htdocs/core/class/google.class.php b/htdocs/core/class/google.class.php
index 04bbe4c8584..539dae89002 100644
--- a/htdocs/core/class/google.class.php
+++ b/htdocs/core/class/google.class.php
@@ -38,7 +38,7 @@ class GoogleAPI
 	 * @param	string		$key		Google key
 	 * @return 	GoogleAPI
 	 */
-	function GoogleAPI($db,$key)
+	function __construct($db,$key)
 	{
 		$this->db=$db;
 		$this->key=$key;
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index efb5fde0093..5fa1997d557 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -38,7 +38,7 @@ class FormActions
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function FormActions($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index ae720402274..72035349706 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -38,7 +38,7 @@ class FormAdmin
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function FormAdmin($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		return 1;
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index c7b6bab3a0c..563fc4b00e7 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -37,7 +37,7 @@ class FormBarCode
      *
      *	@param	DoliDB		$db		Database handler
      */
-    function FormBarCode($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index bc578601a1d..06a889afb17 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -39,7 +39,7 @@ class FormCompany
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function FormCompany($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 979fb0ab5db..8cc95621df6 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -40,7 +40,7 @@ class FormFile
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function FormFile($db)
+    function __construct($db)
     {
         $this->db = $db;
         $this->numoffiles=0;
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f9913b92906..8347725fd32 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -74,7 +74,7 @@ class FormMail
      *
      *  @param	DoliDB	$db      Database handler
      */
-    function FormMail($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index 0b2e6a999df..8f723de978a 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -38,7 +38,7 @@ class FormOrder
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function FormOrder($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		return 1;
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 838ff19570b..2625b4aef5c 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -46,7 +46,7 @@ class FormOther
      *
      *	@param	DoliDB		$db      Database handler
      */
-    function FormOther($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 0337578eb39..996476c7960 100755
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -64,7 +64,7 @@ class FormSms
      *
      *  @param		DoliDB		$db      Database handler
      */
-    function FormSms($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 8a20803a9e8..f6892455301 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -38,7 +38,7 @@ class Interfaces
      *
      *  @param		DoliDB		$db      Database handler
      */
-    function Interfaces($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index cde57a97053..6443c98b3d6 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -33,7 +33,7 @@ class Menu
     /**
 	 *	Constructor
      */
-    function Menu()
+    function __construct()
     {
       	$this->liste = array();
     }
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 852be332686..8ede3620bd8 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -61,7 +61,7 @@ class Menubase
      *  @param     	string		$menu_handler	Menu handler
      *  @param     	string		$type			Type
      */
-    function Menubase($db,$menu_handler='',$type='')
+    function __construct($db,$menu_handler='',$type='')
     {
         $this->db = $db;
         $this->menu_handler = $menu_handler;
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 5281c89a2c0..8cff2f5252c 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -47,7 +47,7 @@ class Notify
 	 *
 	 *	@param 		DoliDB		$db		Database handler
      */
-    function Notify($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 06d3eb057c4..c3af2d046b4 100755
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -146,7 +146,7 @@ class RssParser
      *
      *  @param		DoliDB		$db      Database handler
      */
-    public function RssParser($db)
+    public function __construct($db)
     {
         $this->db=$db;
     }
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 6372e2a78ca..050d5a3d4df 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -49,7 +49,7 @@ class Translate
 	 *  @param	string	$dir            Force directory that contains /langs subdirectory (value is sometine '..' like into install/* pages or support/* pages).
 	 *  @param  Conf	$conf			Object with Dolibarr configuration
 	 */
-	function Translate($dir,$conf)
+	function __construct($dir,$conf)
 	{
 		if (! empty($conf->file->character_set_client)) $this->charset_output=$conf->file->character_set_client;	// If charset output is forced
 		if ($dir) $this->dir=array($dir);
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
index 6e60bd29b87..e81f59c3e67 100644
--- a/htdocs/core/db/mssql.class.php
+++ b/htdocs/core/db/mssql.class.php
@@ -80,7 +80,7 @@ class DoliDBMssql
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
      */
-	function DoliDBMssql($type, $host, $user, $pass, $name='', $port=0)
+	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
 		global $conf,$langs;
 
diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php
index 76825a2d08a..8d6b08d90de 100644
--- a/htdocs/core/db/mysql.class.php
+++ b/htdocs/core/db/mysql.class.php
@@ -80,7 +80,7 @@ class DoliDBMysql
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
 	 */
-	function DoliDBMysql($type, $host, $user, $pass, $name='', $port=0)
+	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
 		global $conf,$langs;
 
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 4dde08c9775..3db424d4db2 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -80,7 +80,7 @@ class DoliDBMysqli
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
      */
-    function DoliDBMysqli($type, $host, $user, $pass, $name='', $port=0)
+    function __construct($type, $host, $user, $pass, $name='', $port=0)
     {
         global $conf,$langs;
 
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index d43aee672ca..0992a97a68f 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -77,7 +77,7 @@ class DoliDBPgsql
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
 	 */
-	function DoliDBPgsql($type, $host, $user, $pass, $name='', $port=0)
+	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
 		global $conf,$langs;
 
diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index f7f72475fbe..8f63f701ea1 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -80,7 +80,7 @@ class DoliDBSqlite
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
      */
-    function DoliDBSqlite($type, $host, $user, $pass, $name='', $port=0)
+    function __construct($type, $host, $user, $pass, $name='', $port=0)
     {
         global $conf,$langs;
 
diff --git a/htdocs/core/login/functions_myopenid.php b/htdocs/core/login/functions_myopenid.php
index 958e4a63a88..b1ceaf3e1eb 100644
--- a/htdocs/core/login/functions_myopenid.php
+++ b/htdocs/core/login/functions_myopenid.php
@@ -129,7 +129,7 @@ class SimpleOpenID
     /**
      * Constructor
      */
-    function SimpleOpenID()
+    function __construct()
     {
         if (!function_exists('curl_exec'))
         {
diff --git a/htdocs/core/menus/smartphone/smartphone_backoffice.php b/htdocs/core/menus/smartphone/smartphone_backoffice.php
index f19ac45351a..ef7a1270812 100755
--- a/htdocs/core/menus/smartphone/smartphone_backoffice.php
+++ b/htdocs/core/menus/smartphone/smartphone_backoffice.php
@@ -38,7 +38,7 @@ class MenuSmart
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function MenuSmart($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/menus/smartphone/smartphone_frontoffice.php b/htdocs/core/menus/smartphone/smartphone_frontoffice.php
index 521b7467d07..cc2a8fd775e 100755
--- a/htdocs/core/menus/smartphone/smartphone_frontoffice.php
+++ b/htdocs/core/menus/smartphone/smartphone_frontoffice.php
@@ -38,7 +38,7 @@ class MenuSmart
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function MenuSmart($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/menus/standard/auguria_backoffice.php b/htdocs/core/menus/standard/auguria_backoffice.php
index 244cb85bd9b..8de0f9b43a7 100644
--- a/htdocs/core/menus/standard/auguria_backoffice.php
+++ b/htdocs/core/menus/standard/auguria_backoffice.php
@@ -46,7 +46,7 @@ class MenuTop
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function MenuTop($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
@@ -84,7 +84,7 @@ class MenuLeft
      *  @param  array		&$menu_array    	Table of menu entries to show before entries of menu handler
      *  @param  array		&$menu_array_after  Table of menu entries to show after entries of menu handler
      */
-    function MenuLeft($db,&$menu_array,&$menu_array_after)
+    function __construct($db,&$menu_array,&$menu_array_after)
     {
         $this->db=$db;
         $this->menu_array=$menu_array;
diff --git a/htdocs/core/menus/standard/auguria_frontoffice.php b/htdocs/core/menus/standard/auguria_frontoffice.php
index 47532b7ae1b..8048d255960 100644
--- a/htdocs/core/menus/standard/auguria_frontoffice.php
+++ b/htdocs/core/menus/standard/auguria_frontoffice.php
@@ -44,7 +44,7 @@ class MenuTop
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function MenuTop($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
@@ -83,7 +83,7 @@ class MenuLeft
      *  @param  array		&$menu_array    	Table of menu entries to show before entries of menu handler
      *  @param  array		&$menu_array_after  Table of menu entries to show after entries of menu handler
      */
-    function MenuLeft($db,&$menu_array,&$menu_array_after)
+    function __construct($db,&$menu_array,&$menu_array_after)
     {
         $this->db=$db;
         $this->menu_array=$menu_array;
diff --git a/htdocs/core/menus/standard/eldy_backoffice.php b/htdocs/core/menus/standard/eldy_backoffice.php
index bdd49579a73..5f383288ae2 100644
--- a/htdocs/core/menus/standard/eldy_backoffice.php
+++ b/htdocs/core/menus/standard/eldy_backoffice.php
@@ -44,7 +44,7 @@ class MenuTop
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function MenuTop($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
@@ -83,7 +83,7 @@ class MenuLeft
      *  @param  array		&$menu_array    	Table of menu entries to show before entries of menu handler
      *  @param  array		&$menu_array_after  Table of menu entries to show after entries of menu handler
      */
-    function MenuLeft($db,&$menu_array,&$menu_array_after)
+    function __construct($db,&$menu_array,&$menu_array_after)
     {
         $this->db=$db;
         $this->menu_array=$menu_array;
diff --git a/htdocs/core/menus/standard/eldy_frontoffice.php b/htdocs/core/menus/standard/eldy_frontoffice.php
index 4c967b33a92..d78e138d88f 100644
--- a/htdocs/core/menus/standard/eldy_frontoffice.php
+++ b/htdocs/core/menus/standard/eldy_frontoffice.php
@@ -43,7 +43,7 @@ class MenuTop
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function MenuTop($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
@@ -81,7 +81,7 @@ class MenuLeft
      *  @param  array		&$menu_array    	Table of menu entries to show before entries of menu handler
      *  @param  array		&$menu_array_after  Table of menu entries to show after entries of menu handler
      */
-    function MenuLeft($db,&$menu_array,&$menu_array_after)
+    function __construct($db,&$menu_array,&$menu_array_after)
     {
         $this->db=$db;
         $this->menu_array=$menu_array;
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 957b3fe4a52..9382f6bb333 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -37,7 +37,7 @@ class MenuTop
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function MenuTop($db)
+    function __construct($db)
     {
         $this->db=$db;
     }
@@ -155,7 +155,7 @@ class MenuLeft
      *  @param  array		&$menu_array    	Table of menu entries to show before entries of menu handler
      *  @param  array		&$menu_array_after  Table of menu entries to show after entries of menu handler
      */
-    function MenuLeft($db,&$menu_array,&$menu_array_after)
+    function __construct($db,&$menu_array,&$menu_array_after)
     {
         $this->db=$db;
         $this->menu_array=$menu_array;
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 02c208bd54c..8f3ef317dfa 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -37,7 +37,7 @@ class html_cerfafr extends ModeleDon
      *
      *  @param      DoliDb		$db      Database handler
      */
-    function html_cerfafr($db)
+    function __construct($db)
     {
         global $conf,$langs;
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
index d22c561d156..b4aa4ba1f06 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
@@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
  *	\class      pdf_expedition_merou
  *	\brief      Classe permettant de generer les borderaux envoi au modele Merou
  */
-Class pdf_expedition_merou extends ModelePdfExpedition
+class pdf_expedition_merou extends ModelePdfExpedition
 {
 	var $emetteur;	// Objet societe qui emet
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
index 050e6bd5b83..af28a00399f 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
@@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
  *	\class      pdf_expedition_dorade
  *	\brief      Classe permettant de generer les borderaux envoi au modele Rouget
  */
-Class pdf_expedition_rouget extends ModelePdfExpedition
+class pdf_expedition_rouget extends ModelePdfExpedition
 {
 	var $emetteur;	// Objet societe qui emet
 
diff --git a/htdocs/core/modules/expedition/methode_expedition.modules.php b/htdocs/core/modules/expedition/methode_expedition.modules.php
index 1ad8bc4bbba..1a918c0fc3e 100644
--- a/htdocs/core/modules/expedition/methode_expedition.modules.php
+++ b/htdocs/core/modules/expedition/methode_expedition.modules.php
@@ -36,7 +36,7 @@ class ModeleShippingMethod
      *
      * @param	DoliDB		$db		Database handler
      */
-	function ModeleShippingMethod($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->name = "NOT DEFINED";
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index e7635e808d6..57da94f1b9e 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -41,7 +41,7 @@ class MailingTargets    // This can't be abstract as it is used for some method
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function MailingTargets($db)
+	function __construct($db)
 	{
         $this->db = $db;
 	}
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 4fe5ea60f01..f04c436b2a1 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -41,7 +41,7 @@ class modAccounting extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modAccounting($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 767b8239afa..6b9de8fd21e 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -40,7 +40,7 @@ class modAdherent extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
      */
-    function modAdherent($db)
+    function __construct($db)
     {
         $this->db = $db;
         $this->numero = 310;
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 37cb02a7fa1..ad4b032a6f6 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -41,7 +41,7 @@ class modAgenda extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modAgenda($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 2400;
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index 8d726d7121f..3303c3bcb7a 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -43,7 +43,7 @@ class modBanque extends DolibarrModules
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function modBanque($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index 662972212c3..34cd7aac886 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -40,7 +40,7 @@ class modBarcode extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modBarcode($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 55;
diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
index ff29e9482c2..91a51dd00c6 100644
--- a/htdocs/core/modules/modBookmark.class.php
+++ b/htdocs/core/modules/modBookmark.class.php
@@ -40,7 +40,7 @@ class modBookmark extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modBookmark($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 330;
diff --git a/htdocs/core/modules/modBoutique.class.php b/htdocs/core/modules/modBoutique.class.php
index 3385a1bd26b..0aa50d7c578 100644
--- a/htdocs/core/modules/modBoutique.class.php
+++ b/htdocs/core/modules/modBoutique.class.php
@@ -41,7 +41,7 @@ class modBoutique extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modBoutique($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 800;
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index 0abf4fd46de..a7a6fa13478 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -36,7 +36,7 @@ class modCashDesk extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modCashDesk ($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 13e847f5d2a..cb0e349f70b 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -37,7 +37,7 @@ class modCategorie extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modCategorie($db)
+	function __construct($db)
 	{
 	    global $conf;
 
diff --git a/htdocs/core/modules/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php
index d0194997e19..0f673696d26 100644
--- a/htdocs/core/modules/modClickToDial.class.php
+++ b/htdocs/core/modules/modClickToDial.class.php
@@ -40,7 +40,7 @@ class modClickToDial extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modClickToDial($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 58;
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 839153be5e3..342f0d92480 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -43,7 +43,7 @@ class modCommande extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modCommande($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index dbdf75918c8..e6a5b6d3182 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -41,7 +41,7 @@ class modComptabilite extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
     */
-	function modComptabilite($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index 13bc3f7f2c0..4466efffdcd 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -41,7 +41,7 @@ class modContrat extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modContrat($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 54;
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index 84fa089ce66..7c3f60abe4d 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -36,13 +36,13 @@ class modDeplacement extends DolibarrModules
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
-	 *   @param      DoliDB		$DB      Database handler
+	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modDeplacement($DB)
+	function __construct($db)
 	{
 		global $conf;
 
-		$this->db = $DB ;
+		$this->db = $db;
 		$this->numero = 75 ;
 
 		$this->family = "financial";
diff --git a/htdocs/core/modules/modDocument.class.php b/htdocs/core/modules/modDocument.class.php
index 2a6b9c63d1e..d0d31cb3e67 100644
--- a/htdocs/core/modules/modDocument.class.php
+++ b/htdocs/core/modules/modDocument.class.php
@@ -41,7 +41,7 @@ class modDocument extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modDocument($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 51;
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 9899a800fba..e9acf254562 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -40,7 +40,7 @@ class modDon  extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modDon($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 700;
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 14b256d53f4..26eae1f353e 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -37,7 +37,7 @@ class modECM extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
     */
-	function modECM($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 235c80e873f..6d4dd923fad 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -41,7 +41,7 @@ class modExpedition extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modExpedition($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 80;
diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
index 9ff4f9662a4..86659deca25 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -39,7 +39,7 @@ class modExport extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modExport($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 240;
diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
index dcbcf9e63d5..0d946aa6dac 100644
--- a/htdocs/core/modules/modExternalRss.class.php
+++ b/htdocs/core/modules/modExternalRss.class.php
@@ -39,7 +39,7 @@ class modExternalRss extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modExternalRss($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
index bf9e18421a4..09311d199ba 100644
--- a/htdocs/core/modules/modExternalSite.class.php
+++ b/htdocs/core/modules/modExternalSite.class.php
@@ -40,7 +40,7 @@ class modExternalSite extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
     */
-	function modExternalSite($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
index 4b28a956481..04a66df1bd8 100644
--- a/htdocs/core/modules/modFTP.class.php
+++ b/htdocs/core/modules/modFTP.class.php
@@ -38,7 +38,7 @@ class modFTP extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
     */
-	function modFTP($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 577107a3586..e072907f403 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -40,7 +40,7 @@ class modFacture extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modFacture($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index 93347807f8d..9b1e0f8834d 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -40,7 +40,7 @@ class modFckeditor extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modFckeditor($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 2000;
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 8b088535d0c..f74d8d5eb32 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -43,7 +43,7 @@ class modFicheinter extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
      */
-    function modFicheinter($db)
+    function __construct($db)
     {
         global $conf;
 
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 468d1e8427f..1257905d567 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -38,7 +38,7 @@ class modFournisseur extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modFournisseur($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php
index e6b04d4652c..d4fe5f7bac8 100644
--- a/htdocs/core/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/core/modules/modGeoIPMaxmind.class.php
@@ -37,7 +37,7 @@ class modGeoIPMaxmind extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modGeoIPMaxmind($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 2900;
diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
index 2b3bbd2d561..7e17060838c 100644
--- a/htdocs/core/modules/modGravatar.class.php
+++ b/htdocs/core/modules/modGravatar.class.php
@@ -36,7 +36,7 @@ class modGravatar extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modGravatar($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
index acb905116b5..f131ee0ae72 100644
--- a/htdocs/core/modules/modImport.class.php
+++ b/htdocs/core/modules/modImport.class.php
@@ -38,7 +38,7 @@ class modImport extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modImport($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 250;
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 29eb657b20c..864f4273981 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -40,7 +40,7 @@ class modLabel extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modLabel($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 60;
diff --git a/htdocs/core/modules/modLdap.class.php b/htdocs/core/modules/modLdap.class.php
index 2aad6dfe570..1d2fee931e2 100644
--- a/htdocs/core/modules/modLdap.class.php
+++ b/htdocs/core/modules/modLdap.class.php
@@ -38,7 +38,7 @@ class modLdap extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modLdap($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 200;
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index ff7a97d1360..6f9a7e362e7 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -40,7 +40,7 @@ class modMailing extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modMailing($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 22;
diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php
index 6a7e6e10c7f..d122a4bb9dc 100644
--- a/htdocs/core/modules/modMailmanSpip.class.php
+++ b/htdocs/core/modules/modMailmanSpip.class.php
@@ -38,7 +38,7 @@ class modMailmanSpip extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modMailmanSpip($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 105;
diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index f76a5aa4f7a..4f60d51ee66 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -38,7 +38,7 @@ class modNotification extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modNotification($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 600;
diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index 9ddc35b1475..3d8d92d8153 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -36,7 +36,7 @@ class modPayBox extends DolibarrModules
      *
      *   @param      DoliDB		$db      Database handler
      */
-    function modPayBox($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 40bcd0ca96b..dd52eba0e09 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -37,7 +37,7 @@ class modPaypal extends DolibarrModules
      *
      *   @param      DoliDB		$db      Database handler
      */
-    function modPaypal($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index 8f440508b81..f63947bc4a6 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -41,7 +41,7 @@ class modPrelevement extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modPrelevement($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 9e09914d601..5f663f26a80 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -43,7 +43,7 @@ class modProduct extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modProduct($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 76b1628e68f..1c2adb531b7 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -42,7 +42,7 @@ class modProjet extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modProjet($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 400;
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 6712f23303f..9594418d487 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -43,7 +43,7 @@ class modPropale extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modPropale($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 4f51b13e116..c765bf23d36 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -42,7 +42,7 @@ class modService extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modService($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 56a41db58af..040e82fa668 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -42,7 +42,7 @@ class modSociete extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modSociete($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index f639933c1fc..057a9fe34ac 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -40,7 +40,7 @@ class modStock extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modStock($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index 9dffdf35e70..0ce4111f6e0 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -38,7 +38,7 @@ class modSyslog extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modSyslog($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->numero = 42;
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index 66f07f9a31e..49148d049e4 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -43,7 +43,7 @@ class modTax extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modTax($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 354ed76f818..5f98dd0b438 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -39,7 +39,7 @@ class modUser extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modUser($db)
+	function __construct($db)
 	{
 		global $conf;
 
diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
index a28d253f03a..03dfa798bab 100644
--- a/htdocs/core/modules/modWebServices.class.php
+++ b/htdocs/core/modules/modWebServices.class.php
@@ -38,7 +38,7 @@ class modWebServices extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
      */
-    function modWebServices($db)
+    function __construct($db)
     {
         $this->db = $db;
         $this->numero = 2600;
diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
index 95debcd7058..f13f16c418f 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
@@ -48,7 +48,7 @@ class modGeneratePassNone extends ModeleGenPassword
 	 *	@param		Translate	$langs		Handler de langue
 	 *	@param		User		$user		Handler du user connecte
 	 */
-	function modGeneratePassNone($db, $conf, $langs, $user)
+	function __construct($db, $conf, $langs, $user)
 	{
 		$this->id = "none";
 		$this->length = 0;
diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
index 76ec32db477..1eb42a9f715 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
@@ -48,7 +48,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	 *	@param		Translate	$langs		Handler de langue
 	 *	@param		User		$user		Handler du user connecte
 	 */
-	function modGeneratePassStandard($db, $conf, $langs, $user)
+	function __construct($db, $conf, $langs, $user)
 	{
 		$this->id = "standard";
 		$this->length = 8;
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index 6e757345df6..938a8b7c338 100755
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -41,7 +41,7 @@ class InterfaceLogevents
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfaceLogevents($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
index ab78856e65f..112c7bc053b 100755
--- a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
+++ b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
@@ -34,7 +34,7 @@ class InterfacePaypalWorkflow
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfacePaypalWorkflow($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index ff7b1843a2e..5615ef084ad 100755
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -36,7 +36,7 @@ class InterfaceWorkflowManager
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfaceWorkflowManager($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 8e0641e594f..d122546aa64 100755
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -42,7 +42,7 @@ class InterfaceActionsAuto
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfaceActionsAuto($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 3d6c7b01333..2f674860440 100755
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -38,7 +38,7 @@ class InterfaceLdapsynchro
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfaceLdapsynchro($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index cf47057966d..a6c68d809e6 100755
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -37,7 +37,7 @@ class InterfaceNotification
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfaceNotification($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
index 19143edb64a..9abcb164025 100755
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -42,7 +42,7 @@ class InterfaceDemo
      *
      *   @param		DoliDB		$db      Database handler
      */
-    function InterfaceDemo($db)
+    function __construct($db)
     {
         $this->db = $db;
     
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index a4cd7a79e64..d13ff95f03d 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -53,7 +53,7 @@ class EcmDirectory // extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function EcmDirectory($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		return 1;
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 243be7bc8ce..57238a97cde 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -38,7 +38,7 @@ class FormEcm
 	 *
 	 * 	@param	DoliDB	$db		Database handler
 	 */
-	function FormEcm($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 7c624d24ae3..06a23324d65 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -86,7 +86,7 @@ class Expedition extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Expedition($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->lines = array();
@@ -1269,7 +1269,7 @@ class ExpeditionLigne
      *
      *  @param		DoliDB		$db      Database handler
      */
-	function ExpeditionLigne($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php
index 3eecc073b5d..f06123f48c5 100644
--- a/htdocs/expedition/class/expeditionstats.class.php
+++ b/htdocs/expedition/class/expeditionstats.class.php
@@ -34,11 +34,11 @@ class ExpeditionStats
     /**
      * Constructor
      *
-     * @param		DoliDB		$DB      Database handler
+     * @param		DoliDB		$db      Database handler
      */
-    function ExpeditionStats($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
     }
 
     /**
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 013e41e2fea..4cdd9cda153 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -52,7 +52,7 @@ class Export
 	 *
 	 *    @param  	DoliDB		$db		Database handler
 	 */
-	function Export($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 466464dd37a..f8c801e237c 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -65,7 +65,7 @@ class Fichinter extends CommonObject
 	 */
 	function __construct($db)
 	{
-		$this->db = $db ;
+		$this->db = $db;
 		$this->products = array();
 		$this->fk_project = 0;
 		$this->statut = 0;
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index fe3ed8f2202..626cbb5dd23 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -87,7 +87,7 @@ class FactureFournisseur extends CommonInvoice
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function FactureFournisseur($db)
+    function __construct($db)
     {
         $this->db = $db;
 
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 3e020f463f6..0e86f2c9365 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -60,7 +60,7 @@ class PaiementFourn extends Paiement
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function PaiementFourn($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 73bee41c4ce..05d312cc755 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -45,7 +45,7 @@ class Import
 	 *
 	 *    @param  	DoliDB		$db		Database handler
 	 */
-	function Import($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 77786d2c328..b4f59ee7a7d 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -62,7 +62,7 @@ class Livraison extends CommonObject
 	 *
 	 * @param	DoliDB	$db		Database handler
 	 */
-	function Livraison($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->lines = array();
@@ -900,7 +900,7 @@ class LivraisonLigne
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function LivraisonLigne($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index b21db469db1..92182531d01 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 aec1d5f65ea..ff96ccf80f1 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -43,7 +43,7 @@ class FormProduct
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function FormProduct($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 06bd03043df..aff8a64e7fc 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -147,7 +147,7 @@ class Product extends CommonObject
 	 *
 	 *  @param      DoliDB		$db      Database handler
 	 */
-	function Product($db)
+	function __construct($db)
 	{
 		global $langs;
 
diff --git a/htdocs/product/class/service.class.php b/htdocs/product/class/service.class.php
index 8d12267ea0b..0e828ac43d0 100644
--- a/htdocs/product/class/service.class.php
+++ b/htdocs/product/class/service.class.php
@@ -47,7 +47,7 @@ class Service extends CommonObject
 	*
 	*  @param      DoliDB		$db      Database handler
 	*/
-	function Service($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index c2afa0950d0..6321813fdb9 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -36,11 +36,11 @@ class MouvementStock
     /**
 	 *  Constructor
 	 *
-	 *  @param      DoliDB		$DB      Database handler
+	 *  @param      DoliDB		$db      Database handler
      */
-	function MouvementStock($DB)
+	function __construct($db)
 	{
-		$this->db = $DB;
+		$this->db = $db;
 	}
 
 	/**
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 300f2dfb8bf..51b05e910e7 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -147,7 +147,7 @@ class Societe extends CommonObject
      *
      *    @param	DoliDB		$db		Database handler
      */
-    public function Societe($db)
+    public function __construct($db)
     {
         global $conf;
 
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 4ec4d7fbed7..b6506045c1d 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -55,7 +55,7 @@ class UserGroup extends CommonObject
      *
      *    @param   DoliDb  $db     Database handler
 	 */
-	function UserGroup($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 9575f1e88a3..f87a0af3db9 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -58,7 +58,7 @@ class AdherentTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return AdherentTest
 	 */
-	function AdherentTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
index c652b6bf759..2ec8c130267 100644
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -58,7 +58,7 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return AdminLibTest
 	 */
-	function AdminLibTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php
index 25843dbfbdc..c2da51ae06a 100644
--- a/test/phpunit/BankAccountTest.php
+++ b/test/phpunit/BankAccountTest.php
@@ -60,7 +60,7 @@ class BankAccountTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return BankAccountTest
 	 */
-	function BankAccountTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index 554ba45289e..1ea69754035 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -88,7 +88,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return BuildDocTest
 	 */
-	function BuildDocTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
@@ -112,8 +112,8 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
         if (! $conf->propal->enabled) { print __METHOD__." propal module not enabled\n"; die(); }
         if (! $conf->projet->enabled) { print __METHOD__." project module not enabled\n"; die(); }
         if (! $conf->expedition->enabled) { print __METHOD__." shipment module not enabled\n"; die(); }
-        if (! $conf->ficheinter->enabled) { print __METHOD__." intervention module not enabled\n"; die(); }
-        if (! $conf->deplacement->enabled) { print __METHOD__." trip module not enabled\n"; die(); }
+        if (! $conf->ficheinter->enabled) { print __METHOD__." intervention module not enabled\n"; die(); }
+        if (! $conf->deplacement->enabled) { print __METHOD__." trip module not enabled\n"; die(); }
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php
index 6891401179b..73820d14ff4 100755
--- a/test/phpunit/CMailFileTest.php
+++ b/test/phpunit/CMailFileTest.php
@@ -58,7 +58,7 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CMailFile
 	 */
-	function CMailFileTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index 54dba76bd34..fe9ab89008a 100755
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -59,7 +59,7 @@ class CategorieTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CategorieTest
 	 */
-	function CategorieTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ChargeSocialesTest.php b/test/phpunit/ChargeSocialesTest.php
index 9562d11bf7a..9b520a8f993 100755
--- a/test/phpunit/ChargeSocialesTest.php
+++ b/test/phpunit/ChargeSocialesTest.php
@@ -58,7 +58,7 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ChargeSocialesTest
 	 */
-	function ChargeSocialesTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index eb5e2028ada..d73e8661c8c 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -59,7 +59,7 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CommandeFournisseurTest
 	 */
-	function CommandeFournisseurTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php
index 2b46d0ee45b..ce253e65208 100644
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@@ -58,7 +58,7 @@ class CommandeTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CommandeTest
 	 */
-	function CommandeTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CommonObjectTest.php b/test/phpunit/CommonObjectTest.php
index 42f5503e152..8759fce9a36 100644
--- a/test/phpunit/CommonObjectTest.php
+++ b/test/phpunit/CommonObjectTest.php
@@ -59,7 +59,7 @@ class CommonObjectTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CommonObjectTest
 	 */
-	function CommonObjectTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php
index 5595c919768..9778c8aea60 100644
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@@ -58,7 +58,7 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CompanyBankAccountTest
 	 */
-	function CompanyBankAccountTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
index 00c5c99985a..ed235a9fb85 100755
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@@ -60,7 +60,7 @@ class ContactTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ContactTest
 	 */
-	function ContactTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php
index 2a827af2665..62e46c47502 100644
--- a/test/phpunit/ContratTest.php
+++ b/test/phpunit/ContratTest.php
@@ -58,7 +58,7 @@ class ContratTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ContratTest
 	 */
-	function ContratTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php
index 24101beedbe..fbce577aa98 100755
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
@@ -60,7 +60,7 @@ class CoreTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return CoreTest
 	 */
-	function CoreTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 222fb62a86a..c56b39f5cf4 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -58,7 +58,7 @@ class DateLibTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return DateLibTest
 	 */
-	function DateLibTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/DiscountTest.php b/test/phpunit/DiscountTest.php
index 7d9a1dde834..1fc7c0e1ca0 100755
--- a/test/phpunit/DiscountTest.php
+++ b/test/phpunit/DiscountTest.php
@@ -58,7 +58,7 @@ class DiscountTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return DiscountTest
 	 */
-	function DiscountTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index d7ba76dae2b..267af4057fc 100755
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -61,7 +61,7 @@ class ExportTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ExportTest
 	 */
-	function ExportTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FactureFournisseurTest.php b/test/phpunit/FactureFournisseurTest.php
index 9a1afe73f53..2313c03f854 100644
--- a/test/phpunit/FactureFournisseurTest.php
+++ b/test/phpunit/FactureFournisseurTest.php
@@ -58,7 +58,7 @@ class FactureFournisseurTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return FactureFournisseurTest
 	 */
-	function FactureFournisseurTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 99c845c4555..0470b70e57a 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -58,7 +58,7 @@ class FactureTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return FactureTest
 	 */
-	function FactureTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FactureTestRounding.php b/test/phpunit/FactureTestRounding.php
index a345fdb436c..0644c860aa2 100644
--- a/test/phpunit/FactureTestRounding.php
+++ b/test/phpunit/FactureTestRounding.php
@@ -58,7 +58,7 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase
 	 *
 	 * @return FactureTest
 	 */
-	function FactureTestRounding()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index 76e19726e26..cc47f70d38e 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -59,7 +59,7 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return FilesLibTest
 	 */
-	function FilesLibTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/Functions2Test.php b/test/phpunit/Functions2Test.php
index 9a6cc1163f2..e8f7ceb3619 100755
--- a/test/phpunit/Functions2Test.php
+++ b/test/phpunit/Functions2Test.php
@@ -61,7 +61,7 @@ class Functions2Test extends PHPUnit_Framework_TestCase
      *
      * @return CoreTest
      */
-    function Functions2Test()
+    function __construct()
     {
         //$this->sharedFixture
         global $conf,$user,$langs,$db;
diff --git a/test/phpunit/FunctionsTest.php b/test/phpunit/FunctionsTest.php
index 4797301b575..7a65f198951 100755
--- a/test/phpunit/FunctionsTest.php
+++ b/test/phpunit/FunctionsTest.php
@@ -62,7 +62,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase
      *
      * @return CoreTest
      */
-    function FunctionsTest()
+    function __construct()
     {
         //$this->sharedFixture
         global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ImagesLibTest.php b/test/phpunit/ImagesLibTest.php
index d1e25797e0d..d6dd3d5a16f 100644
--- a/test/phpunit/ImagesLibTest.php
+++ b/test/phpunit/ImagesLibTest.php
@@ -59,7 +59,7 @@ class ImagesLibTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ImagesLibTest
 	 */
-	function ImagesLibTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php
index 913b9bd4b33..04c49742c49 100755
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
@@ -60,7 +60,7 @@ class ImportTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ImportTest
 	 */
-	function ImportTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index 9b2924270e7..023caa2fd3a 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -57,7 +57,7 @@ class ModulesTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return BuildDocTest
 	 */
-	function ModulesTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index 8f092b1a6ba..5914248ce5f 100755
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -61,7 +61,7 @@ class PdfDocTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return PdfDocTest
 	 */
-	function PdfDocTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PgsqlTest.php b/test/phpunit/PgsqlTest.php
index 52f159ddf5f..ac290161b06 100755
--- a/test/phpunit/PgsqlTest.php
+++ b/test/phpunit/PgsqlTest.php
@@ -60,7 +60,7 @@ class PgsqlTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ContactTest
 	 */
-	function PgsqlTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
index 7416fa9937a..d0be9c47e27 100755
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -59,7 +59,7 @@ class PricesTest extends PHPUnit_Framework_TestCase
      *
      * @return CoreTest
      */
-    function PricesTest()
+    function __construct()
     {
         //$this->sharedFixture
         global $conf,$user,$langs,$db;
diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php
index 799b16da232..5ec451598c9 100755
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -58,7 +58,7 @@ class ProductTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return ProductTest
 	 */
-	function ProductTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php
index c9ff64b3655..c8fd6b732f9 100644
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@@ -58,7 +58,7 @@ class PropalTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return PropalTest
 	 */
-	function PropalTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 10d395ff94e..9ee2a99f744 100755
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -70,7 +70,7 @@ class SecurityTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return SecurityTest
 	 */
-	function SecurityTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 7f212843bd5..d781698fefc 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -59,7 +59,7 @@ class SocieteTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return SocieteTest
 	 */
-	function SocieteTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/UserGroupTest.php b/test/phpunit/UserGroupTest.php
index b82878f3349..02a5809fee0 100644
--- a/test/phpunit/UserGroupTest.php
+++ b/test/phpunit/UserGroupTest.php
@@ -58,7 +58,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return UserGroupTest
 	 */
-	function UserGroupTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 223b94397e3..a82d24060e7 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -58,7 +58,7 @@ class UserTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return UserTest
 	 */
-	function UserTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesTest.php
index 10e8b57a384..be152dcf06c 100755
--- a/test/phpunit/WebservicesTest.php
+++ b/test/phpunit/WebservicesTest.php
@@ -60,7 +60,7 @@ class WebservicesTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return DateLibTest
 	 */
-	function WebservicesTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
diff --git a/test/phpunit/_NumberingModulesTest.php b/test/phpunit/_NumberingModulesTest.php
index 430986a9ef6..31c88f8dfa1 100644
--- a/test/phpunit/_NumberingModulesTest.php
+++ b/test/phpunit/_NumberingModulesTest.php
@@ -57,7 +57,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 	 *
 	 * @return NumberingModulesTest
 	 */
-	function NumberingModulesTest()
+	function __construct()
 	{
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
-- 
GitLab