diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index 498615f129d..d86e9394130 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -50,7 +50,7 @@ class CommActionRapport
 	 * @param	int		$month	Month
 	 * @param	int		$year	Year
 	 */
-	function CommActionRapport($db, $month, $year)
+	function __construct($db, $month, $year)
 	{
 		global $langs;
 		$langs->load("commercial");
diff --git a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
index 79c1e692c9c..92e51460e84 100644
--- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
@@ -43,7 +43,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function BordereauChequeBlochet($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 2430e695950..f7622881e8e 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -47,7 +47,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function doc_generic_order_odt($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/commande/doc/pdf_edison.modules.php b/htdocs/core/modules/commande/doc/pdf_edison.modules.php
index 0d0a68086f5..962100e8b16 100644
--- a/htdocs/core/modules/commande/doc/pdf_edison.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_edison.modules.php
@@ -41,7 +41,7 @@ class pdf_edison extends ModelePDFCommandes
      *
 	 *	@param		DoliDb	$db		Database access handler
 	 */
-	function pdf_edison($db=0)
+	function __construct($db=0)
 	{
         global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index a6dd2189605..8ac3f34bacc 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -63,7 +63,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *
 	 *  @param		DoliDB		$DB      Database handler
 	 */
-	function pdf_einstein($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index cd060ae4a11..277de8f5312 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -35,8 +35,10 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 	var $nom='Marbre';
 
 
-    /**     \brief      Return description of numbering module
-     *      \return     string      Text with description
+    /**
+     *  Return description of numbering module
+     *
+     *  @return     string      Text with description
      */
     function info()
     {
@@ -45,8 +47,10 @@ class mod_commande_marbre extends ModeleNumRefCommandes
     }
 
 
-	/**     \brief      Renvoi un exemple de numerotation
-	 *      \return     string      Example
+	/**
+	 *  Renvoi un exemple de numerotation
+	 *
+	 *  @return     string      Example
 	 */
 	function getExample()
 	{
@@ -54,9 +58,11 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 	}
 
 
-	/**     \brief      Test si les numeros deje en vigueur dans la base ne provoquent pas de
-	 *                  de conflits qui empechera cette numerotation de fonctionner.
-	 *      \return     boolean     false si conflit, true si ok
+	/**
+	 *  Test si les numeros deje en vigueur dans la base ne provoquent pas de
+	 *  de conflits qui empechera cette numerotation de fonctionner.
+	 *
+	 *  @return     boolean     false si conflit, true si ok
 	 */
 	function canBeActivated()
 	{
@@ -86,10 +92,12 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 		return true;
 	}
 
-	/**		\brief      Return next value
-	 *      \param      objsoc      Objet third party
-	 *		\param		commande	Object order
-	 *      \return     string      Value if OK, 0 if KO
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param	Societe		$objsoc     Object thirdparty
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
 	 */
 	function getNextValue($objsoc,$commande)
 	{
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index 9d26ed47ef1..6dc9a9219a1 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -39,8 +39,10 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 	var $nom = 'Saphir';
 
 
-    /**     \brief      Renvoi la description du modele de numerotation
-     *      \return     string      Texte descripif
+    /**
+     *  Renvoi la description du modele de numerotation
+     *
+     *  @return     string      Texte descripif
      */
 	function info()
     {
@@ -77,8 +79,10 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 		return $texte;
     }
 
-    /**     \brief      Renvoi un exemple de numerotation
-     *      \return     string      Example
+    /**
+     *  Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
      */
     function getExample()
     {
@@ -96,11 +100,13 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 		return $numExample;
     }
 
-	/**		\brief      Return next value
-	*      	\param      objsoc      Objet third party
-	*		\param		commande	Object order
-	*      	\return     string      Value if OK, 0 if KO
-	*/
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param	Societe		$objsoc     Object thirdparty
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
+	 */
     function getNextValue($objsoc,$commande)
     {
 		global $db,$conf;
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index f963e3d02e5..ca7236189e1 100755
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -35,6 +35,7 @@ class mod_contract_magre extends ModelNumRefContracts
 
 	/**
 	 *	Return default description of numbering model
+	 *
 	 *	@return     string      text description
 	 */
 	function info()
@@ -68,8 +69,9 @@ class mod_contract_magre extends ModelNumRefContracts
 		return $texte;
     }
 
-	/**     
+	/**
 	 *	Return numbering example
+	 *
 	 *	@return     string      Example
 	 */
     function getExample()
@@ -88,8 +90,9 @@ class mod_contract_magre extends ModelNumRefContracts
 		return $numExample;
     }
 
-	/**		
+	/**
 	 *	Return next value
+	 *
 	 *	@param      objsoc      third party object
 	 *	@param		contract	contract object
 	 *	@return     string      Value if OK, 0 if KO
@@ -113,8 +116,9 @@ class mod_contract_magre extends ModelNumRefContracts
 		return  $numFinal;
 	}
 
-	/**		
-	 *Return next free value
+	/**
+	 *  Return next free value
+	 *
 	 *	@param      objsoc      Object third party
 	 *	@param		objforref	Object for number to search
 	 *	@return     string      Next free value
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index 9972aeb7f4e..6ea87f6bcb6 100755
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -36,6 +36,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 
 	/**
 	 *	Return default description of numbering model
+	 *
 	 *	@return     string      text description
 	 */
     function info()
@@ -45,8 +46,9 @@ class mod_contract_serpis extends ModelNumRefContracts
     }
 
 
-	/**     
+	/**
 	 *	Return numbering example
+	 *
 	 *	@return     string      Example
 	 */
 	function getExample()
@@ -55,8 +57,9 @@ class mod_contract_serpis extends ModelNumRefContracts
 	}
 
 
-	/**     
+	/**
 	 *	Test if existing numbers make problems with numbering
+	 *
 	 *	@return     boolean     false if conflit, true if ok
 	 */
 	function canBeActivated()
@@ -87,8 +90,9 @@ class mod_contract_serpis extends ModelNumRefContracts
 		return true;
 	}
 
-	/**		
+	/**
 	 *	Return next value
+	 *
 	 *	@param      objsoc      third party object
 	 *	@param		contract	contract object
 	 *	@return     string      Value if OK, 0 if KO
@@ -125,8 +129,9 @@ class mod_contract_serpis extends ModelNumRefContracts
 	}
 
 
-	/**		
-	 *Return next free value
+	/**
+	 *  Return next free value
+	 *
 	 *	@param      objsoc      Object third party
 	 *	@param		objforref	Object for number to search
 	 *	@return     string      Next free value
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 eca5df7abd3..1b8890aa7cc 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
@@ -44,7 +44,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function pdf_expedition_merou($db=0)
+	function __construct($db=0)
 	{
 		global $conf,$langs,$mysoc;
 
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 4a813247a3b..9bef1894bf8 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
@@ -41,9 +41,9 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
 	/**
 	 *	Constructor
 	 *
-	 *	@param	db		Database handler
+	 *	@param	DoliDB	$db		Database handler
 	 */
-	function pdf_expedition_rouget($db=0)
+	function __construct($db=0)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php b/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php
index 49e1c2542dc..fa659bd3d0f 100644
--- a/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php
+++ b/htdocs/core/modules/expedition/methode_expedition_colsui.modules.php
@@ -25,8 +25,12 @@ include_once "methode_expedition.modules.php";
 
 class methode_expedition_colsui extends ModeleShippingMethod
 {
-
-	function methode_expedition_colsui($db=0)
+    /**
+     * Constructor
+     *
+     * @param	DoliDB		$db		Database handler
+     */
+	function __construct($db=0)
 	{
 		$this->db = $db;
 		$this->id = 3; // Do not change this value
@@ -35,6 +39,12 @@ class methode_expedition_colsui extends ModeleShippingMethod
 		$this->description = "Colissimo Suivi";
 	}
 
+	/**
+	 * Return URL of provider
+	 *
+	 * @param	string	$tracking_number	Tracking number
+	 * @return	string						URL for tracking
+	 */
 	function provider_url_status($tracking_number)
 	{
 		return sprintf("http://www.coliposte.net/particulier/suivi_particulier.jsp?colispart=%s",$tracking_number);
diff --git a/htdocs/core/modules/expedition/methode_expedition_enl.modules.php b/htdocs/core/modules/expedition/methode_expedition_enl.modules.php
index d59eb771429..86c5df15a87 100644
--- a/htdocs/core/modules/expedition/methode_expedition_enl.modules.php
+++ b/htdocs/core/modules/expedition/methode_expedition_enl.modules.php
@@ -24,8 +24,12 @@ include_once "methode_expedition.modules.php";
 
 class methode_expedition_enl extends ModeleShippingMethod
 {
-
-	function methode_expedition_enl($db=0)
+    /**
+     * Constructor
+     *
+     * @param	DoliDB		$db		Database handler
+     */
+	function __construct($db=0)
 	{
 		global $langs;
 		$this->db = $db;
@@ -35,7 +39,13 @@ class methode_expedition_enl extends ModeleShippingMethod
 		$this->description = $langs->trans("Enlevement");
 	}
 
-	Function provider_url_status($tracking_number)
+	/**
+	 * Return URL of provider
+	 *
+	 * @param	string	$tracking_number	Tracking number
+	 * @return	string						URL for tracking
+	 */
+	function provider_url_status($tracking_number)
 	{
 		return '';
 	}
diff --git a/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php b/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php
index d7170ec8764..894479a83a9 100644
--- a/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php
+++ b/htdocs/core/modules/expedition/methode_expedition_lettremax.modules.php
@@ -25,8 +25,12 @@ include_once "methode_expedition.modules.php";
 
 class methode_expedition_lettremax extends ModeleShippingMethod
 {
-
-	function methode_expedition_lettremax($db=0)
+    /**
+     * Constructor
+     *
+     * @param	DoliDB		$db		Database handler
+     */
+	function __construct($db=0)
 	{
 		$this->db = $db;
 		$this->id = 4; // Do not change this value
@@ -35,6 +39,12 @@ class methode_expedition_lettremax extends ModeleShippingMethod
 		$this->description = "Courrier suivi et lettre max";
 	}
 
+	/**
+	 * Return URL of provider
+	 *
+	 * @param	string	$tracking_number	Tracking number
+	 * @return	string						URL for tracking
+	 */
 	function provider_url_status($tracking_number)
 	{
 		return sprintf("http://www.csuivi.courrier.laposte.fr/default.asp?EZ_ACTION=rechercheRapide&numObjet=%s",$tracking_number);
diff --git a/htdocs/core/modules/expedition/methode_expedition_trans.modules.php b/htdocs/core/modules/expedition/methode_expedition_trans.modules.php
index eb971030ac4..77f185d33b9 100644
--- a/htdocs/core/modules/expedition/methode_expedition_trans.modules.php
+++ b/htdocs/core/modules/expedition/methode_expedition_trans.modules.php
@@ -25,7 +25,12 @@ include_once "methode_expedition.modules.php";
 class methode_expedition_trans extends ModeleShippingMethod
 {
 
-	function methode_expedition_trans($db=0)
+    /**
+     * Constructor
+     *
+     * @param	DoliDB		$db		Database handler
+     */
+	function __construct($db=0)
 	{
 		global $langs;
 
@@ -36,7 +41,13 @@ class methode_expedition_trans extends ModeleShippingMethod
 		$this->description = $langs->trans("GenericTransport");
 	}
 
-	Function provider_url_status($tracking_number)
+	/**
+	 * Return URL of provider
+	 *
+	 * @param	string	$tracking_number	Tracking number
+	 * @return	string						URL for tracking
+	 */
+	function provider_url_status($tracking_number)
 	{
 		return '';
 	}
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
index bf832c4042b..3abdd89eef7 100755
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -35,6 +35,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 
 	/**
 	 *	Return default description of numbering model
+	 *
 	 *	@return     string      text description
 	 */
 	function info()
@@ -68,8 +69,9 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 		return $texte;
     }
 
-	/**     
+	/**
 	 *	Return numbering example
+	 *
 	 *	@return     string      Example
 	 */
     function getExample()
@@ -88,8 +90,9 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 		return $numExample;
     }
 
-	/**		
+	/**
 	 *	Return next value
+	 *
 	 *	@param      objsoc      third party object
 	 *	@param		shipment	shipment object
 	 *	@return     string      Value if OK, 0 if KO
@@ -113,8 +116,9 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 		return  $numFinal;
 	}
 
-	/**		
-	 *Return next free value
+	/**
+	 *  Return next free value
+	 *
 	 *	@param      objsoc      Object third party
 	 *	@param		objforref	Object for number to search
 	 *	@return     string      Next free value
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index 502c5f2ac77..9b7e631fd40 100755
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -36,6 +36,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 
 	/**
 	 *	Return default description of numbering model
+	 *
 	 *	@return     string      text description
 	 */
     function info()
@@ -47,6 +48,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 
 	/**
 	 *	Return numbering example
+	 *
 	 *	@return     string      Example
 	 */
 	function getExample()
@@ -57,6 +59,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 
 	/**
 	 *	Test if existing numbers make problems with numbering
+	 *
 	 *	@return     boolean     false if conflit, true if ok
 	 */
 	function canBeActivated()
@@ -89,6 +92,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 
 	/**
 	 *	Return next value
+	 *
 	 *	@param      objsoc      third party object
 	 *	@param		shipment	shipment object
 	 *	@return     string      Value if OK, 0 if KO
@@ -125,7 +129,8 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	}
 
 	/**
-	 *Return next free value
+	 *  Return next free value
+	 *
 	 *	@param      objsoc      Object third party
 	 *	@param		objforref	Object for number to search
 	 *	@return     string      Next free value
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index ff3217cfe99..36e4e91115b 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -49,7 +49,7 @@ class ExportCsv extends ModeleExports
 	 *
 	 *	@param	    DoliDB	$db      Database handler
 	 */
-	function ExportCsv($db)
+	function __construct($db)
 	{
 		global $conf,$langs;
 		$this->db = $db;
diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php
index a6022c567b0..ba8df1e61c7 100644
--- a/htdocs/core/modules/export/export_excel.modules.php
+++ b/htdocs/core/modules/export/export_excel.modules.php
@@ -52,7 +52,7 @@ class ExportExcel extends ModeleExports
 	 *
 	 *	@param	    DoliDB	$db      Database handler
 	 */
-	function ExportExcel($db)
+	function __construct($db)
 	{
 		global $conf;
 		$this->db = $db;
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index 76786ee86dc..393a05d1530 100755
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -53,7 +53,7 @@ class ExportExcel2007 extends ExportExcel
 	 *
 	 *	@param	    DoliDB	$db      Database handler
 	 */
-	function ExportExcel2007($db)
+	function __construct($db)
 	{
 		global $conf;
 		$this->db = $db;
diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php
index 934ed7516f4..8e807aa2fcd 100644
--- a/htdocs/core/modules/export/export_tsv.modules.php
+++ b/htdocs/core/modules/export/export_tsv.modules.php
@@ -49,7 +49,7 @@ class ExportTsv extends ModeleExports
 	 *
 	 *	@param	    DoliDB	$db      Database handler
      */
-    function ExportTsv($db)
+    function __construct($db)
     {
         global $conf;
         $this->db = $db;
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 4fe6b53da3d..e37346e12b9 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -46,7 +46,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function doc_generic_invoice_odt($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index f684ad21d0b..bd4bf381765 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -61,7 +61,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function pdf_crabe($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php
index d70e2bfea7c..d0c3da92bcf 100755
--- a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php
@@ -50,9 +50,9 @@ class pdf_oursin extends ModelePDFFactures
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function pdf_oursin($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index b1ee4c11bf6..e10423bf761 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -37,8 +37,10 @@ class mod_facture_mercure extends ModeleNumRefFactures
     var $error = '';
 
 
-    /**     \brief      Renvoi la description du modele de numerotation
-     *      \return     string      Texte descripif
+    /**
+     *  Renvoi la description du modele de numerotation
+     *
+     *  @return     string      Texte descripif
      */
     function info()
     {
@@ -81,8 +83,10 @@ class mod_facture_mercure extends ModeleNumRefFactures
         return $texte;
     }
 
-    /**     \brief      Return an example of number value
-     *      \return     string      Example
+    /**
+     *  Return an example of number value
+     *
+     *  @return     string      Example
      */
     function getExample()
     {
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index a6f6f09188f..47ba8c69077 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -34,8 +34,10 @@ class mod_facture_terre extends ModeleNumRefFactures
 	var $prefixcreditnote='AV';
 	var $error='';
 
-	/**     \brief      Renvoi la description du modele de numerotation
-	 *      \return     string      Texte descripif
+	/**
+	 *  Renvoi la description du modele de numerotation
+	 *
+	 *  @return     string      Texte descripif
 	 */
 	function info()
 	{
@@ -44,17 +46,21 @@ class mod_facture_terre extends ModeleNumRefFactures
 		return $langs->trans('TerreNumRefModelDesc1',$this->prefixinvoice,$this->prefixcreditnote);
 	}
 
-	/**     \brief      Renvoi un exemple de numerotation
-	 *      \return     string      Example
+	/**
+	 *  Renvoi un exemple de numerotation
+	 *
+	 *  @return     string      Example
 	 */
 	function getExample()
 	{
 		return $this->prefixinvoice."0501-0001";
 	}
 
-	/**     \brief      Test si les numeros deja en vigueur dans la base ne provoquent pas de
-	 *                  de conflits qui empechera cette numerotation de fonctionner.
-	 *      \return     boolean     false si conflit, true si ok
+	/**
+	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+	 *  de conflits qui empechera cette numerotation de fonctionner.
+	 *
+	 *  @return     boolean     false si conflit, true si ok
 	 */
 	function canBeActivated()
 	{
diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index 102adb29f46..39e915f1fcf 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -33,21 +33,12 @@ class mod_arctic extends ModeleNumRefFicheinter
 {
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $error = '';
-	var $nom = 'Artic';
+	var $nom = 'arctic';
+
 
 	/**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
- 	 */
-	function mod_arctic()
-	{
-		$this->nom = "arctic";
-	}
-
-    /**
      *  Renvoi la description du modele de numerotation
-     * 
+     *
      *  @return     string      Texte descripif
      */
 	function info()
@@ -87,7 +78,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 
     /**
      * Renvoi un exemple de numerotation
-     * 
+     *
      * @return     string      Example
      */
     function getExample()
@@ -107,11 +98,11 @@ class mod_arctic extends ModeleNumRefFicheinter
     }
 
 	/**
-	 *  Renvoi prochaine valeur attribuee
-	 * 
-	 *  @param  Societe		$objsoc     Objet societe
-	 *  @param	Ficheinter	$object		Object ficheinter
-	 *  @return string      			Valeur
+	 * 	Return next free value
+	 *
+	 *  @param	Societe		$objsoc     Object thirdparty
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
 	 */
     function getNextValue($objsoc=0,$object='')
     {
@@ -136,7 +127,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 
 	/**
 	 * 	Return next free value
-	 * 
+	 *
      *  @param	Societe		$objsoc     Object third party
 	 * 	@param	Object		$objforref	Object for number to search
      *  @return string      			Next free value
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index feaffc5962c..cb83633c023 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -37,7 +37,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 
 	/**
 	 *  Return description of numbering module
-	 * 
+	 *
      *  @return     string      Text with description
      */
     function info()
@@ -48,7 +48,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 
 	/**
 	 *  Renvoi un exemple de numerotation
-	 * 
+	 *
 	 *  @return     string      Example
 	 */
 	function getExample()
@@ -56,10 +56,10 @@ class mod_pacific extends ModeleNumRefFicheinter
 		return $this->prefix."0501-0001";
 	}
 
-	/** 
+	/**
 	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
 	 *  de conflits qui empechera cette numerotation de fonctionner.
-	 * 
+	 *
 	 *  @return     boolean     false si conflit, true si ok
 	 */
 	function canBeActivated()
@@ -94,12 +94,12 @@ class mod_pacific extends ModeleNumRefFicheinter
 		}
 	}
 
-	/**	
-	 * 	Renvoi prochaine valeur attribuee
-	 * 
-	 *  @param      objsoc      Objet societe
-	 *  @param      ficheinter	Object ficheinter
-	 *  @return     string      Valeur
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param	Societe		$objsoc     Object thirdparty
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
 	 */
 	function getNextValue($objsoc=0,$object='')
 	{
@@ -128,9 +128,9 @@ class mod_pacific extends ModeleNumRefFicheinter
 		return $this->prefix.$yymm."-".$num;
 	}
 
-	/**		
+	/**
 	 * 	Return next free value
-	 * 
+	 *
 	 *  @param	Societe	$objsoc     Object third party
 	 * 	@param	Object	$objforref	Object for number to search
 	 *  @return string      		Next free value
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 1dfd94036da..bc80f69fd21 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -59,7 +59,7 @@ class ImportCsv extends ModeleImports
 	 *	@param	DoliDB		$db				Database handler
 	 *	@param	string		$datatoimport	String code describing import set (ex: 'societe_1')
 	 */
-	function ImportCsv($db,$datatoimport)
+	function __construct($db,$datatoimport)
 	{
 		global $conf,$langs;
 		$this->db = $db;
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index 265264d97be..8178d661e5b 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -55,7 +55,7 @@ class ModeleImports
 	/**
      *  Constructor
 	 */
-	function ModeleImports()
+	function __construct()
 	{
 	}
 
diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php
index 6783ad6a02a..950c284924f 100644
--- a/htdocs/core/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/core/modules/livraison/mod_livraison_jade.php
@@ -42,8 +42,9 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 
 
 	/**
-	 *     \brief      Renvoi la description du modele de numerotation
-	 *     \return     string      Texte descripif
+	 *   Renvoi la description du modele de numerotation
+	 *
+	 *   @return     string      Texte descripif
 	 */
 	function info()
 	{
@@ -52,17 +53,20 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 	}
 
 	/**
-	 *      \brief      Renvoi un exemple de numerotation
-     *      \return     string      Example
+	 *  Renvoi un exemple de numerotation
+	 *
+     *  @return     string      Example
      */
     function getExample()
     {
         return $this->prefix."0501-0001";
     }
 
-    /**     \brief      Test si les numeros deja en vigueur dans la base ne provoquent pas de
-     *                  de conflits qui empechera cette numerotation de fonctionner.
-     *      \return     boolean     false si conflit, true si ok
+    /**
+     *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
+     *  de conflits qui empechera cette numerotation de fonctionner.
+     *
+     *  @return     boolean     false si conflit, true si ok
      */
     function canBeActivated()
     {
diff --git a/htdocs/core/modules/livraison/mod_livraison_saphir.php b/htdocs/core/modules/livraison/mod_livraison_saphir.php
index 8ebe1591c68..8a3c9536b92 100644
--- a/htdocs/core/modules/livraison/mod_livraison_saphir.php
+++ b/htdocs/core/modules/livraison/mod_livraison_saphir.php
@@ -36,8 +36,10 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
 	var $nom = 'Saphir';
 
 
-    /**     \brief      Renvoi la description du modele de numerotation
-     *      \return     string      Texte descripif
+    /**
+     *  Renvoi la description du modele de numerotation
+     *
+     *  @return     string      Texte descripif
      */
 	function info()
 	{
@@ -74,8 +76,10 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
 		return $texte;
     }
 
-    /**     \brief      Renvoi un exemple de num�rotation
-     *      \return     string      Example
+    /**
+     *  Return an example of number
+     *
+     *  @return     string      Example
      */
     function getExample()
     {
@@ -94,11 +98,13 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
     }
 
 
-	/**		\brief      Return next value
-	*      	\param      objsoc      Object third party
-	*      	\param      livraison	Object delivery
-	*      	\return     string      Value if OK, 0 if KO
-	*/
+	/**
+	 *  Return next value
+	 *
+	 *  @param	Societe		$objsoc     	Object third party
+	 *  @param  Object		$livraison		Object delivery
+	 *  @return string      				Value if OK, 0 if KO
+	 */
     function getNextValue($objsoc=0,$livraison='')
     {
 		global $db,$conf;
@@ -120,21 +126,25 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
     }
 
 
-	/**		\brief      Return next free value
-    *      	\param      objsoc      Object third party
-	* 		\param		objforref	Object for number to search
-    *   	\return     string      Next free value
-    */
+	/**
+	 *  Return next free value
+	 *
+     *  @param	Societe		$objsoc     Object third party
+	 * 	@param	string		$objforref	Object for number to search
+     *  @return string      			Next free value
+     */
     function getNumRef($objsoc,$objforref)
     {
         return $this->getNextValue($objsoc,$objforref);
     }
 
 
-	/**     \brief      Renvoie la r�f�rence de commande suivante non utilis�e
-     *      \param      objsoc      Objet soci�t�
-     *      \param      livraison	Objet livraison
-     *      \return     string      Texte descripif
+	/**
+	 *  Return next free ref
+	 *
+     *  @param	Societe		$objsoc      	Object thirdparty
+     *  @param  Object		$livraison		Objet livraison
+     *  @return string      				Texte descripif
      */
     function livraison_get_num($objsoc=0,$livraison='')
     {
diff --git a/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php
index e401d748da7..459d0f571cc 100644
--- a/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -40,9 +40,9 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function pdf_sirocco($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
index dc129126ccb..d550f73b495 100644
--- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
@@ -44,9 +44,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function pdf_typhon($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 7ef9713bd46..15657559b2b 100755
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -47,7 +47,7 @@ class mailing_contacts1 extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function mailing_contacts1($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php
index e862004d0c1..b3a6f059a3d 100755
--- a/htdocs/core/modules/mailings/contacts2.modules.php
+++ b/htdocs/core/modules/mailings/contacts2.modules.php
@@ -46,7 +46,7 @@ class mailing_contacts2 extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    function mailing_contacts2($db)
+    function __construct($db)
     {
         $this->db=$db;
     }
diff --git a/htdocs/core/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php
index 9457ec43bdc..296a3fa925e 100755
--- a/htdocs/core/modules/mailings/contacts3.modules.php
+++ b/htdocs/core/modules/mailings/contacts3.modules.php
@@ -46,7 +46,7 @@ class mailing_contacts3 extends MailingTargets
     *
     *  @param		DoliDB		$db      Database handler
     */
-    function mailing_contacts3($db)
+    function __construct($db)
     {
         $this->db=$db;
     }
diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php
index 623303453fa..8783f305044 100644
--- a/htdocs/core/modules/mailings/example.modules.php
+++ b/htdocs/core/modules/mailings/example.modules.php
@@ -44,7 +44,7 @@ class mailing_example extends MailingTargets
 	 *
 	 *  @param		DoliDB		$DB      Database handler
 	 */
-    function mailing_example($DB)
+    function __construct($DB)
     {
         $this->db=$DB;
     }
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 0d2eeecd775..46691ba7a62 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -52,7 +52,7 @@ class mailing_fraise extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    function mailing_fraise($db)
+    function __construct($db)
     {
         $this->db=$db;
     }
diff --git a/htdocs/core/modules/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php
index 86afa59054b..76da4b23714 100644
--- a/htdocs/core/modules/mailings/framboise.modules.php
+++ b/htdocs/core/modules/mailings/framboise.modules.php
@@ -42,7 +42,7 @@ class mailing_framboise extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function mailing_framboise($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/modules/mailings/peche.modules.php b/htdocs/core/modules/mailings/peche.modules.php
index b3f857bd93c..2e9be21c9fa 100644
--- a/htdocs/core/modules/mailings/peche.modules.php
+++ b/htdocs/core/modules/mailings/peche.modules.php
@@ -45,7 +45,7 @@ class mailing_peche extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function mailing_peche($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 30f154416a3..6567381cae1 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -45,7 +45,7 @@ class mailing_pomme extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function mailing_pomme($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 9bfda30d8f9..33c59091a3d 100755
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -42,7 +42,7 @@ class mailing_thirdparties extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function mailing_thirdparties($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index cb79bf014af..3325747f3ba 100755
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -38,7 +38,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
      *
      *  @param		DoliDB		$db      Database handler
      */
-    function mailing_thirdparties_services_expired($db)
+    function __construct($db)
     {
         $this->db=$db;
 
diff --git a/htdocs/core/modules/member/cards/pdf_standard.class.php b/htdocs/core/modules/member/cards/pdf_standard.class.php
index e9de0f61667..e984e65812c 100644
--- a/htdocs/core/modules/member/cards/pdf_standard.class.php
+++ b/htdocs/core/modules/member/cards/pdf_standard.class.php
@@ -70,7 +70,8 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
  *	\class      pdf_standard
  *	\brief      Classe afin d'editer au format PDF des cartes de visite au format Avery ou personnalise
  */
-class pdf_standard {
+class pdf_standard
+{
 
 	var $code;		// Code of format
 	var $format;	// Array with informations
@@ -98,9 +99,9 @@ class pdf_standard {
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function pdf_standard($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
@@ -108,7 +109,8 @@ class pdf_standard {
 
 	//Methode qui permet de modifier la taille des caracteres
 	// Cela modiera aussi l'espace entre chaque ligne
-	function Set_Char_Size(&$pdf,$pt) {
+	function Set_Char_Size(&$pdf,$pt)
+	{
 		if ($pt > 3) {
 			$this->_Char_Size = $pt;
 			$this->_Line_Height = $this->_Get_Height_Chars($pt);
@@ -118,7 +120,7 @@ class pdf_standard {
 
 
 	// On imprime une etiquette
-	function Add_PDF_card(&$pdf,$textleft,$header='',$footer='',$outputlangs,$textright='',$idmember,$photomember)
+	function Add_PDF_card(&$pdf,$textleft,$header,$footer,$outputlangs,$textright='',$idmember=0,$photomember='')
 	{
 		global $mysoc,$conf,$langs;
 
diff --git a/htdocs/core/modules/member/labels/pdf_standardlabel.class.php b/htdocs/core/modules/member/labels/pdf_standardlabel.class.php
index 5664ac9fff9..bbb85f780f4 100644
--- a/htdocs/core/modules/member/labels/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/member/labels/pdf_standardlabel.class.php
@@ -70,7 +70,8 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
  *	\class      pdf_standardlabel
  *	\brief      Classe afin d'editer au format PDF des pages d'etiquette adresse au format Avery ou personnalise
  */
-class pdf_standardlabel {
+class pdf_standardlabel
+{
 
 	var $code;		// Code of format
 	var $format;	// Array with informations
@@ -99,9 +100,9 @@ class pdf_standardlabel {
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function pdf_standard($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
@@ -146,7 +147,7 @@ class pdf_standardlabel {
 		}
 		// Define photo
 		$photo='';
-		
+
 		// Print lines
 		if ($this->code == "CARD")
 		{
diff --git a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
index 75aa75ac154..cd669386f3b 100644
--- a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
@@ -42,9 +42,9 @@ class pdf_baleine extends ModelePDFProjects
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function pdf_baleine($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 04c07f9fa04..5b2c22e7414 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -47,7 +47,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function doc_generic_proposal_odt($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 4ff5d2922f6..e5218d17829 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -44,9 +44,9 @@ class pdf_azur extends ModelePDFPropales
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function pdf_azur($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php
index 6f916f4a470..5673b38463f 100644
--- a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php
@@ -44,9 +44,9 @@ class pdf_jaune extends ModelePDFPropales
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function pdf_jaune($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index 7a0bad694c4..5796c7480af 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -37,8 +37,10 @@ class mod_propale_marbre extends ModeleNumRefPropales
 	var $nom = "Marbre";
 
 
-    /**     \brief      Return description of numbering module
-     *      \return     string      Text with description
+    /**
+     *  Return description of numbering module
+     *
+     *  @return     string      Text with description
      */
     function info()
     {
@@ -47,8 +49,10 @@ class mod_propale_marbre extends ModeleNumRefPropales
     }
 
 
-	/**     \brief      Return an example of numbering module values
-	 *      \return     string      Example
+	/**
+	 *  Return an example of numbering module values
+	 *
+	 *  @return     string      Example
 	 */
 	function getExample()
 	{
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
index 8249fa30604..ef9c505a9fd 100644
--- a/htdocs/core/modules/propale/mod_propale_saphir.php
+++ b/htdocs/core/modules/propale/mod_propale_saphir.php
@@ -39,8 +39,10 @@ class mod_propale_saphir extends ModeleNumRefPropales
 	var $nom = 'Saphir';
 
 
-    /**     \brief      Return description of module
-     *      \return     string      Texte descripif
+    /**
+     *  Return description of module
+     *
+     *  @return     string      Texte descripif
      */
 	function info()
     {
@@ -77,8 +79,10 @@ class mod_propale_saphir extends ModeleNumRefPropales
 		return $texte;
     }
 
-    /**     \brief      Renvoi un exemple de numerotation
-     *      \return     string      Example
+    /**
+     *  Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
      */
     function getExample()
     {
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 9152cc32b06..944e770ae50 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -36,7 +36,7 @@ class pdf_paiement
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function pdf_paiement($db)
+	function __construct($db)
 	{
 		global $langs;
 		$langs->load("bills");
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 0e7d7b08c92..164ff25c917 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -44,7 +44,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function doc_generic_odt($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 3d87eef5085..da960e26fce 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -50,7 +50,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	/**
 	 *	Constructor
 	 */
-	function mod_codeclient_elephant()
+	function __construct()
 	{
 		$this->code_null = 0;
 		$this->code_modifiable = 1;
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 07fb0370d99..bf963876368 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -51,7 +51,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	/**
 	 *	Constructor
 	 */
-	function mod_codeclient_leopard()
+	function __construct()
 	{
 		$this->code_null = 1;
 		$this->code_modifiable = 1;
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index e0453093c39..66750c6c5dc 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -48,7 +48,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	/**
 	 * 	Constructor
 	 */
-	function mod_codeclient_monkey()
+	function __construct()
 	{
 		$this->nom = "Monkey";
 		$this->version = "dolibarr";
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index f34b4c59d81..0116c4866e5 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -41,7 +41,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	/**
 	 * 	Constructor
 	 */
-	function mod_codecompta_aquarium()
+	function __construct()
 	{
 	    global $conf;
 		if (empty($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER)) $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411';
diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php
index b677200c091..e5c39a2ed34 100644
--- a/htdocs/core/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php
@@ -38,7 +38,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 	/**
 	 * 	Constructor
 	 */
-	function mod_codecompta_panicum()
+	function __construct()
 	{
 	}
 
@@ -53,11 +53,13 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 		return $langs->trans("ModuleCompanyCode".$this->nom);
 	}
 
-	/**		Return an example of result returned by getNextValue
+	/**
+	 *  Return an example of result returned by getNextValue
 	 *
-	 *      @param	Translate	$langs		Object langs
-	 *      @param	Societe		$objsoc		Object thirdparty
-	 *      @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 *  @param	Translate	$langs		Object langs
+	 *  @param	Societe		$objsoc		Object thirdparty
+	 *  @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 *  @return	string					Example
 	 */
 	function getExample($langs,$objsoc=0,$type=-1)
 	{
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 46f3bb96904..a1145f80846 100755
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -58,9 +58,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function pdf_canelle($db,$object)
+	function __construct($db,$object)
 	{
 		global $conf,$langs,$mysoc;
 
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index ed6bc8e7f17..2ffd11d2fcf 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -37,8 +37,10 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 	var $prefix='CF';
 
 
-    /**     \brief      Return description of numbering module
-     *      \return     string      Text with description
+    /**
+     * 	Return description of numbering module
+     *
+     *  @return     string      Text with description
      */
     function info()
     {
@@ -47,8 +49,10 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
     }
 
 
-    /**     \brief      Renvoi un exemple de numerotation
-     *      \return     string      Example
+    /**
+     * 	Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
      */
     function getExample()
     {
@@ -56,9 +60,11 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
     }
 
 
-    /**     \brief      Test si les numeros deja en vigueur dans la base ne provoquent pas de
-     *                  de conflits qui empechera cette numerotation de fonctionner.
-     *      \return     boolean     false si conflit, true si ok
+    /**
+     * 	Test si les numeros deja en vigueur dans la base ne provoquent pas de
+     *  de conflits qui empechera cette numerotation de fonctionner.
+     *
+     *  @return     boolean     false si conflit, true si ok
      */
     function canBeActivated()
     {
@@ -89,11 +95,13 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
         }
     }
 
-    /**     \brief      Return next value
-	*      	\param      objsoc      Object third party
-	*      	\param      object		Object
-	*       \return     string      Valeur
-    */
+    /**
+     * 	Return next value
+	 *
+	 *  @param	Societe		$objsoc     Object third party
+	 *  @param  Object		$object		Object
+	 *  @return string      			Value if OK, 0 if KO
+     */
     function getNextValue($objsoc=0,$object='')
     {
         global $db,$conf;
@@ -123,11 +131,13 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
     }
 
 
-    /**     \brief      Renvoie la reference de commande suivante non utilisee
-	*      	\param      objsoc      Object third party
-	*      	\param      object		Object
-    *      	\return     string      Texte descripif
-    */
+    /**
+     * 	Renvoie la reference de commande suivante non utilisee
+     *
+	 *  @param	Societe		$objsoc     Object third party
+	 *  @param  Object	    $object		Object
+     *  @return string      			Texte descripif
+     */
     function commande_get_num($objsoc=0,$object='')
     {
         return $this->getNextValue($objsoc,$object);
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index ae153661fb3..7e0c7e8719e 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -38,8 +38,10 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 	var $nom = 'Orchidee';
 
 
-    /**     \brief      Renvoi la description du modele de numerotation
-     *      \return     string      Texte descripif
+    /**
+     *  Renvoi la description du modele de numerotation
+     *
+     * 	@return     string      Texte descripif
      */
 	function info()
     {
@@ -77,8 +79,10 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 		return $texte;
     }
 
-    /**     \brief      Renvoi un exemple de numerotation
-     *      \return     string      Example
+    /**
+     *  Renvoi un exemple de numerotation
+     *
+     *  @return     string      Example
      */
     function getExample()
     {
@@ -96,10 +100,12 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 		return $numExample;
     }
 
-	/**		\brief      Return next value
-	*      	\param      objsoc      Object third party
-	*      	\param      commande	Object supplier order
-	*      	\return     string      Value if OK, 0 if KO
+	/**
+	 *  Return next value
+	 *
+	 *  @param	Societe		$objsoc     Object third party
+	 *  @param  Object	    $object		Object
+     *  @return string      			Value if OK, 0 if KO
 	*/
     function getNextValue($objsoc=0,$commande='')
     {
@@ -122,10 +128,12 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 	}
 
 
-    /**     \brief      Renvoie la reference de commande suivante non utilisee
-     *      \param      objsoc      Objet societe
-     *      \param      commande		Objet commande
-     *      \return     string      Texte descripif
+    /**
+     *  Renvoie la reference de commande suivante non utilisee
+     *
+	 *  @param	Societe		$objsoc     Object third party
+	 *  @param  Object	    $object		Object
+     *  @return string      			Texte descripif
      */
     function commande_get_num($objsoc=0,$commande='')
     {
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 36632cde0bf..da2c981e998 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -63,7 +63,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function pdf_muscadet($db)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;