diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index d8b93c52b8e..757e8125a4f 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -23,9 +23,9 @@
  */
 
 /**
- *	    \file       htdocs/admin/propale.php
+ *	    \file       htdocs/admin/propal.php
  *		\ingroup    propale
- *		\brief      Page d'administration/configuration du module Propale
+ *		\brief      Setup page for commercial proposal module
  */
 
 require("../main.inc.php");
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 7aa1f4280b6..0cbfdb0393d 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -46,7 +46,7 @@ class CommandeStats extends Stats
 	/**
 	 * Constructor
 	 *
-	 * @param 	DoliDB	$DB		   Database handler
+	 * @param 	DoliDB	$db		   Database handler
 	 * @param 	int		$socid	   Id third party for filter
 	 * @param 	string	$mode	   Option
 	 * @param   int		$userid    Id user for filter
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index ffb3e7efff5..c20336291d5 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *	\file       htdocs/core/class/infobox.php
+ *	\file       htdocs/core/class/infobox.class.php
  *	\brief      File of class to manage widget boxes
  */
 
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 8ed2d0cbbb6..de270b12964 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -1012,7 +1012,7 @@ class Ldap
 	 *	Required by Active Directory
 	 *
 	 *	@param	string		$hex			Hex value
-	 *	@return	string						Little endian		
+	 *	@return	string						Little endian
 	 */
 	function littleEndian($hex)
 	{
@@ -1027,7 +1027,7 @@ class Ldap
 	 *  Recupere le SID de l'utilisateur
 	 *	Required by Active Directory
 	 *
-	 * 	@param	string		$ldapuser		Login de l'utilisateur
+	 * 	@param	string		$ldapUser		Login de l'utilisateur
 	 * 	@return	string						Sid
 	 */
 	function getObjectSid($ldapUser)
diff --git a/htdocs/core/doxygen.php b/htdocs/core/doxygen.php
index 90d48fd5a4d..286708b247a 100644
--- a/htdocs/core/doxygen.php
+++ b/htdocs/core/doxygen.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *	    \file       htdocs/lib/doxygen.php
+ *	    \file       htdocs/core/doxygen.php
  *      \ingroup    core
  *		\mainpage	Dolibarr project
  *
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index 05fe6f9e8d9..151e09077d7 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *	\file       htdocs/core/barcode.lib.php
+ *	\file       htdocs/core/lib/barcode.lib.php
  *	\brief      Set of functions used for barcode generation
  *	\ingroup    core
  */
@@ -289,9 +289,7 @@ function barcode_encode_genbarcode($code,$encoding)
  *
  * @param	string	$text		the text-line (<position>:<font-size>:<character> ...)
  * @param	string	$bars   	where to place the bars  (<space-width><bar-width><space-width><bar-width>...)
- * @param	int		$scale		scale factor ( 1 < scale < unlimited (scale 50 will produce
- *                                                   5400x300 pixels when
- *                                                   using EAN-13!!!))
+ * @param	int		$scale		scale factor ( 1 < scale < unlimited (scale 50 will produce 5400x300 pixels when using EAN-13!!!))
  * @param	string	$mode   	png,gif,jpg (default='png')
  * @param	int		$total_y	the total height of the image ( default: scale * 60 )
  * @param	array	$space		default:  $space[top]   = 2 * $scale; $space[bottom]= 2 * $scale;  $space[left]  = 2 * $scale;  $space[right] = 2 * $scale;
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index f535ab2ae29..7e741918d72 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -103,8 +103,8 @@ function getServerTimeZoneInt($refgmtdate='now')
  * Return server timezone string
  *
  * @return string			Parent company timezone string ('Europe/Paris')
- */
-/*function getParentCompanyTimeZoneString()
+ *
+function getParentCompanyTimeZoneString()
 {
     if (function_exists('date_default_timezone_get')) return date_default_timezone_get();
     else return '';
@@ -117,8 +117,8 @@ function getServerTimeZoneInt($refgmtdate='now')
  *
  * @param	string	$refdate	Reference date for timezone (timezone differs on winter and summer)
  * @return 	int					An offset in hour (+1 for Europe/Paris on winter and +2 for Europe/Paris on summer)
- */
-/*function getParentCompanyTimeZoneInt($refgmtdate='now')
+ *
+function getParentCompanyTimeZoneInt($refgmtdate='now')
 {
     global $conf;
     if (class_exists('DateTime') && ! empty($conf->global->MAIN_NEW_DATE))
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 d61bba6447c..09c338c9e08 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
@@ -18,8 +18,8 @@
  */
 
 /**
- *	\file       htdocs/core/modules/commande/doc_generic_order_odt.modules.php
- *	\ingroup    societe
+ *	\file       htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+ *	\ingroup    commande
  *	\brief      File of class to build ODT documents for third parties
  */
 
diff --git a/htdocs/core/modules/commande/doc/pdf_edison.modules.php b/htdocs/core/modules/commande/doc/pdf_edison.modules.php
index fcf5d698c85..4121ffe7fe5 100644
--- a/htdocs/core/modules/commande/doc/pdf_edison.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_edison.modules.php
@@ -20,7 +20,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/commande/pdf_edison.modules.php
+ *	\file       htdocs/core/modules/commande/doc/pdf_edison.modules.php
  *	\ingroup    commande
  *	\brief      Fichier de la classe permettant de generer les commandes au modele Edison
  */
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index b6f0408c494..aeb0b2ca0a9 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -20,7 +20,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/commande/pdf_einstein.modules.php
+ *	\file       htdocs/core/modules/commande/doc/pdf_einstein.modules.php
  *	\ingroup    commande
  *	\brief      Fichier de la classe permettant de generer les commandes au modele Einstein
  *	\author	    Laurent Destailleur
@@ -309,7 +309,7 @@ class pdf_einstein extends ModelePDFCommandes
 					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
-					
+
 					$vatrate=(string) $object->lines[$i]->tva_tx;
 					$localtax1rate=(string) $object->lines[$i]->localtax1_tx;
 					$localtax2rate=(string) $object->lines[$i]->localtax2_tx;
diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php
index 114bcc77b61..cfb3b2e7271 100755
--- a/htdocs/core/modules/contract/modules_contract.php
+++ b/htdocs/core/modules/contract/modules_contract.php
@@ -85,7 +85,7 @@ class ModelNumRefContracts
 	 *	@param	Object		$contract	contract object
 	 *	@return	string					Value
 	 */
-	function getNextValue($objsoc, $contrat)
+	function getNextValue($objsoc, $contract)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
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 2270319ce3f..e00615047fd 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
@@ -18,7 +18,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/propale/doc_generic_proposal_odt.modules.php
+ *	\file       htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
  *	\ingroup    societe
  *	\brief      File of class to build ODT documents for third parties
  */
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index f67af8c43c5..1ef0f907ba9 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -20,7 +20,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/propale/pdf_azur.modules.php
+ *	\file       htdocs/core/modules/propale/doc/pdf_azur.modules.php
  *	\ingroup    propale
  *	\brief      Fichier de la classe permettant de generer les propales au modele Azur
  *	\author	    Laurent Destailleur
diff --git a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php
index 705df1cd9b1..5303dc75409 100644
--- a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php
@@ -20,7 +20,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/propale/pdf_jaune.modules.php
+ *	\file       htdocs/core/modules/propale/doc/pdf_jaune.modules.php
  *	\ingroup    propale
  *	\brief      Fichier de la classe permettant de generer les propales au modele Jaune
  *	\author	    Laurent Destailleur
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 dc49c2566bd..183261ad2e9 100755
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -58,7 +58,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *	Constructor
 	 *
 	 *  @param	DoliDB		$db     	Database handler
-	 *  @param	Societe		$object		Third party providing invoice
+	 *  @param	Societe		$object		Supplier invoice
 	 */
 	function __construct($db,$object)
 	{
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 a999e435111..d06c0d3a424 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -60,7 +60,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$db      Database handler
+	 *  @param	DoliDB		$db      	Database handler
+	 *  @param	Object		$object		Supplier order
 	 */
 	function __construct($db,$object)
 	{
@@ -98,7 +99,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$this->franchise=!$mysoc->tva_assuj;
 
         // Get source company
-        $this->emetteur=$mysoc;
+        //if (! is_object($object->thirdparty)) $object->fetch_thirdparty();
+        //$this->emetteur=$object->thirdparty;
+        //if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+		$this->emetteur=$mysoc;
         if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
 
 		// Defini position des colonnes
@@ -1008,7 +1012,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			{
 				$carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
 			}
-			
+
 			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,$object->contact,$usecontact,'target');
 
 			// Show recipient
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 69436f3b4ae..c00ec226cb6 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -153,7 +153,7 @@ class ProductFournisseur extends Product
 
         $error=0;
         $this->db->begin();
-        
+
         if ($this->product_fourn_price_id)
         {
         	// Supprime prix courant du fournisseur pour cette quantite
@@ -237,43 +237,6 @@ class ProductFournisseur extends Product
         }
     }
 
-
-    /**
-     *    Load information about a provider
-     *
-     *    @param      fournid         Supplier ID
-     *    @return     int             < 0 if error, > 0 if ok
-     */
-    /*function fetch_fourn_data($fournid)
-    {
-        global $conf;
-
-        // Check parameters
-        if (empty($fournid)) return -1;
-
-        $sql = "SELECT rowid, ref_fourn";
-        $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-        $sql.= " WHERE fk_product = ".$this->id;
-        $sql.= " AND fk_soc = ".$fournid;
-        $sql.= " AND entity = ".$conf->entity;
-
-        dol_syslog(get_class($this)."::fetch_fourn_data sql=".$sql);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $result = $this->db->fetch_array($result);
-            $this->ref_fourn = $result["ref_fourn"];
-            $this->product_fourn_price_id = $result["rowid"];
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::fetch_fourn_data error=".$this->error, LOG_ERR);
-            return -1;
-        }
-    }*/
-
     /**
      *    Loads the price information of a provider
      *
@@ -328,7 +291,7 @@ class ProductFournisseur extends Product
     function list_product_fournisseur_price($prodid)
     {
         global $conf;
-        
+
         $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
         $sql.= " pfp.rowid as product_fourn_pri_id, pfp.ref_fourn,";
         $sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.fk_availability";
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 3df46970edc..5e4acbea39d 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -22,9 +22,9 @@
  */
 
 /**
- *  \file       htdocs/product/admin/produit.php
+ *  \file       htdocs/product/admin/product.php
  *  \ingroup    produit
- *  \brief      Page d'administration/configuration du module Produit
+ *  \brief      Setup page of product module
  */
 
 require("../../main.inc.php");
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index ff6cf960ff0..e9ebdd00d1c 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -54,7 +54,7 @@ class Project extends CommonObject
     /**
      *  Constructor
      *
-     *  @param      DoliDB		$DB      Database handler
+     *  @param      DoliDB		$db      Database handler
      */
     function __construct($db)
     {
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index d551dbf429a..225b5343757 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -64,7 +64,7 @@ class Task extends CommonObject
     /**
      *  Constructor
      *
-     *  @param      DoliDB		$DB      Database handler
+     *  @param      DoliDB		$db      Database handler
      */
     function __construct($db)
     {
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index 0576b7dd614..b9fb643f626 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012	   Florian Henry  <florian.henry@open-concept.pro>
@@ -20,7 +20,7 @@
 
 
 /**
- *      \file       scripts/emailings/mailing-read.php
+ *      \file       public/emailing/mailing-read.php
  *      \ingroup    mailing
  *      \brief      Script use to update mail status if destinaries read it (if images during mail read are display)
  */
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index 3d361b10e3c..c3614023fae 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012	   Florian Henry  <florian.henry@open-concept.pro>
@@ -20,7 +20,7 @@
 
 
 /**
- *      \file       scripts/emailings/mailing-unsubscribe.php
+ *      \file       public/emailing/mailing-unsubscribe.php
  *      \ingroup    mailing
  *      \brief      Script use to update unsubcribe contact to prospect mailing list
  */