diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index f4838e1663e..fabaa069a9b 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -189,7 +189,8 @@ else
 	Header('Location: index.php');
 }
 
-$db->close();
 
 llxFooter();
+
+$db->close();
 ?>
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 e37346e12b9..f8417ecae04 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
@@ -132,8 +132,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
     /**
      * Define array with couple substitution key => substitution value
      *
-     * @param   $line
-     * @param   $outputlangs        Lang object to use for output
+     * @param   array		$line			Array of lines
+     * @param   Translate	$outputlangs    Lang object to use for output
+     * @return	array						Return substitution array
      */
     function get_substitutionarray_lines($line,$outputlangs)
     {
@@ -159,8 +160,8 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 	/**
 	 * Return description of a module
 	 *
-     * @param      langs        Lang object to use for output
-	 * @return     string       Description
+     * @param	Translate	$langs      Lang object to use for output
+	 * @return	string      			Description
 	 */
 	function info($langs)
 	{
@@ -350,11 +351,14 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
                 // Open and load template
 				require_once(ODTPHP_PATH.'odf.php');
-				$odfHandler = new odf($srctemplatepath, array(
+				$odfHandler = new odf(
+				    $srctemplatepath,
+				    array(
 						'PATH_TO_TMP'	  => $conf->facture->dir_temp,
 						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
-						'DELIMITER_RIGHT' => '}')
+						'DELIMITER_RIGHT' => '}'
+					)
 				);
 				// After construction $odfHandler->contentXml contains content and
 				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index bd4bf381765..1340fb06ae1 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -446,11 +446,11 @@ class pdf_crabe extends ModelePDFFactures
 	/**
 	 *  Show payments table
 	 *
-     *  @param      pdf             Object PDF
-     *  @param      object          Object invoice
-     *  @param      posy            Position y in PDF
-     *  @param      outputlangs     Object langs for output
-     *  @return     int             <0 if KO, >0 if OK
+     *  @param	PDF			&$pdf           Object PDF
+     *  @param  Object		$object         Object invoice
+     *  @param  int			$posy           Position y in PDF
+     *  @param  Translate	$outputlangs    Object langs for output
+     *  @return int             			<0 if KO, >0 if OK
 	 */
 	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
diff --git a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php
index d0c3da92bcf..813c51e0368 100755
--- a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php
@@ -332,12 +332,13 @@ class pdf_oursin extends ModelePDFFactures
 
 
 	/**
-	 *  \brief      Affiche tableau des versement
-	 *  \param      pdf     		Objet PDF
-	 *  \param      fac     		Objet facture
-	 *	\param		posy			Position y in PDF
-	 *	\param		outputlangs		Object langs for output
-	 *	\return 	int				<0 if KO, >0 if OK
+	 *  Show payments table
+	 *
+     *  @param	PDF			&$pdf           Object PDF
+     *  @param  Object		$object         Object invoice
+     *  @param  int			$posy           Position y in PDF
+     *  @param  Translate	$outputlangs    Object langs for output
+     *  @return int             			<0 if KO, >0 if OK
 	 */
 	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index e10423bf761..673c8e7db7c 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -107,11 +107,13 @@ class mod_facture_mercure extends ModeleNumRefFactures
         return $numExample;
     }
 
-    /**		Return next value
-     *      @param      objsoc      Object third party
-     *      @param      facture		Object invoice
-     *      @param      mode        'next' for next value or 'last' for last value
-     *      @return     string      Value if OK, 0 if KO
+    /**
+     * Return next value
+     *
+     * @param      objsoc      Object third party
+     * @param      facture		Object invoice
+     * @param      mode        'next' for next value or 'last' for last value
+     * @return     string      Value if OK, 0 if KO
      */
     function getNextValue($objsoc,$facture,$mode='next')
     {
@@ -140,11 +142,13 @@ class mod_facture_mercure extends ModeleNumRefFactures
     }
 
 
-    /**		Return next free value
-     *      @param      objsoc      Object third party
-     * 		@param		objforref	Object for number to search
-     *      @param      mode        'next' for next value or 'last' for last value
-     *   	@return     string      Next free value
+    /**
+     * Return next free value
+     *
+     * @param	Societe		$objsoc     	Object third party
+     * @param	string		$objforref		Object for number to search
+     * @param   string		$mode       	'next' for next value or 'last' for last value
+     * @return  string      				Next free value
      */
     function getNumRef($objsoc,$objforref,$mode='next')
     {
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 47ba8c69077..e0ee2d98eb9 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -115,6 +115,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 	}
 
 	/**     Return next value not used or last value used
+	 *
 	 *      @param     objsoc		Object third party
 	 *      @param     facture		Object invoice
      *      @param     mode         'next' for next value or 'last' for last value
@@ -181,11 +182,13 @@ class mod_facture_terre extends ModeleNumRefFactures
 		else dol_print_error('','Bad parameter for getNextValue');
 	}
 
-	/**		Return next free value
-	 *     	@param      objsoc      Object third party
-	 * 		@param		objforref	Object for number to search
-     *      @param      mode        'next' for next value or 'last' for last value
-	 *   	@return     string      Next free value
+	/**
+	 * Return next free value
+	 *
+     * @param	Societe		$objsoc     	Object third party
+     * @param	string		$objforref		Object for number to search
+     * @param   string		$mode       	'next' for next value or 'last' for last value
+     * @return  string      				Next free value
 	 */
 	function getNumRef($objsoc,$objforref,$mode='next')
 	{
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index 77f105bb445..e98cb3840d6 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -68,16 +68,20 @@ abstract class ModeleNumRefFactures
 {
 	var $error='';
 
-	/**  Return if a module can be used or not
-	 *   @return	boolean     true if module can be used
+	/**
+	 * Return if a module can be used or not
+	 *
+	 * @return	boolean     true if module can be used
 	 */
 	function isEnabled()
 	{
 		return true;
 	}
 
-	/**	 Renvoi la description par defaut du modele de numerotation
-	 *   @return    string      Texte descripif
+	/**
+	 * Renvoi la description par defaut du modele de numerotation
+	 *
+	 * @return    string      Texte descripif
 	 */
 	function info()
 	{
@@ -86,8 +90,10 @@ abstract class ModeleNumRefFactures
 		return $langs->trans("NoDescription");
 	}
 
-	/**  Renvoi un exemple de numerotation
-	 *	 @return	string      Example
+	/**
+	 * Renvoi un exemple de numerotation
+	 *
+	 * @return	string      Example
 	 */
 	function getExample()
 	{
@@ -96,19 +102,23 @@ abstract class ModeleNumRefFactures
 		return $langs->trans("NoExample");
 	}
 
-	/**  Test si les numeros deja en vigueur dans la base ne provoquent pas
-	 *   de conflits qui empecheraient 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 conflits qui empecheraient cette numerotation de fonctionner.
+	 *
+	 * @return	boolean     false si conflit, true si ok
 	 */
 	function canBeActivated()
 	{
 		return true;
 	}
 
-	/**  Renvoi prochaine valeur attribuee
-	 *   @param     objsoc		Objet societe
-	 *   @param     facture		Objet facture
-	 *   @return    string      Valeur
+	/**
+	 * Renvoi prochaine valeur attribuee
+	 *
+	 * @param     objsoc		Objet societe
+	 * @param     facture		Objet facture
+	 * @return    string      Valeur
 	 */
 	function getNextValue($objsoc,$facture)
 	{
@@ -116,8 +126,10 @@ abstract class ModeleNumRefFactures
 		return $langs->trans("NotAvailable");
 	}
 
-	/**  Renvoi version du modele de numerotation
-	 *   @return    string      Valeur
+	/**
+	 * Renvoi version du modele de numerotation
+	 *
+	 * @return    string      Valeur
 	 */
 	function getVersion()
 	{