diff --git a/htdocs/core/class/address.class.php b/htdocs/core/class/address.class.php
index bcaa22cfd06..44b1b50e258 100644
--- a/htdocs/core/class/address.class.php
+++ b/htdocs/core/class/address.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
-        \file       htdocs/core/address.class.php
+        \file       htdocs/core/class/address.class.php
         \brief      Fichier de la classe des adresses postales
         \version    $Id$
 */
@@ -39,7 +39,7 @@ class Address {
 
   function Address() {
 
-  }  
+  }
 
 }
 ?>
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index edaa3711d13..b00bb0a894d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *	\file       htdocs/commonobject.class.php
+ *	\file       htdocs/core/class/commonobject.class.php
  *	\ingroup    core
  *	\brief      Fichier de la classe mere des classes metiers (facture, contrat, propal, commande, etc...)
  *	\version    $Id$
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 4bc0caeca8d..697ae2f46fa 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -21,7 +21,7 @@
  */
 
 /**
- *	\file       	htdocs/core/conf.class.php
+ *	\file       	htdocs/core/class/conf.class.php
  *	\ingroup		core
  *  \brief      	Fichier de la classe de stockage de la config courante
  *  \remarks		La config est stockee dans le fichier conf/conf.php
diff --git a/htdocs/core/class/cookie.class.php b/htdocs/core/class/cookie.class.php
index bd570e73b96..403b6ffe82f 100644
--- a/htdocs/core/class/cookie.class.php
+++ b/htdocs/core/class/cookie.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/core/cookie.class.php
+ *	\file       htdocs/core/class/cookie.class.php
  *	\ingroup    core
  *	\version	$Id$
  *	\brief      File of class to manage cookies
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 97a97394d69..bbc5a2345be 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *	\file       htdocs/core/dolgraph.class.php
+ *	\file       htdocs/core/class/dolgraph.class.php
  *	\brief      Fichier de la classe mere de gestion des graph
  *	\version    $Id$
  *	\remarks    Usage:
@@ -55,14 +55,14 @@ class DolGraph
 	var $SetShading=0;
 
 	var $PrecisionY=-1;
-	
+
 	var $horizTickIncrement=-1;
 	var $SetNumXTicks=-1;
 	var $labelInterval=-1;
-	
+
 	var $hideXGrid=false;
 	var $hideYGrid=false;
-	
+
 	var $Legend=array();
 	var $LegendWidthMin=0;
 
@@ -154,7 +154,7 @@ class DolGraph
 		$this->labelInterval = $x;
 		return true;
 	}
-	
+
 	/**
 	 * 		\brief		Hide X grid
 	 */
@@ -172,7 +172,7 @@ class DolGraph
 		$this->hideYGrid = $bool;
 		return true;
 	}
-	
+
 	function SetYLabel($label)
 	{
 		$this->YLabel = $label;
@@ -250,7 +250,7 @@ class DolGraph
 		return $this->error;
 	}
 
-	
+
 	/**
 	 *	\brief		Definie la couleur de fond de l'image complete
 	 *	\param		bg_color		array(R,G,B) ou 'onglet' ou 'default'
@@ -384,7 +384,7 @@ class DolGraph
 		{
 			$factor*=10;
 		}
-		
+
 		$res=floor($min/$factor)*$factor;
 
 		//print "min=".$min." res=".$res;
@@ -433,7 +433,7 @@ class DolGraph
 		$colorsemitrans=new Color(255,255,255,60);
 		$colorgradient= new LinearGradient(new Color(235, 235, 235),new Color(255, 255, 255),0);
 		$colorwhite=new Color(255,255,255);
-		
+
 		// Graph
 		$graph = new Graph($this->width, $this->height);
 		$graph->border->hide();
@@ -465,7 +465,7 @@ class DolGraph
 
 		if ($this->hideXGrid)	$group->grid->hideVertical(true);
 		if ($this->hideYGrid)	$group->grid->hideHorizontal(true);
-		
+
 		// On boucle sur chaque lot de donnees
 		$legends=array();
 		$i=0;
@@ -499,7 +499,7 @@ class DolGraph
 
 				$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
 				$colorbis=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),50);
-				
+
 				$colorgrey=new Color(100,100,100);
 				$colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
 
@@ -509,7 +509,7 @@ class DolGraph
 				$plot->barBorder->setColor($colorgrey);
 				//$plot->setBarColor($color);
 				$plot->setBarGradient( new LinearGradient($colorbis, $color, 90) );
-				
+
 				if ($this->mode == 'side')  $plot->setBarPadding(0.1, 0.1);
 				if ($this->mode == 'depth') $plot->setBarPadding(0.1, 0.4);
 				if ($this->mode == 'side')  $plot->setBarSpace(5);
@@ -532,11 +532,11 @@ class DolGraph
 				$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
 				$colorbis=new Color(min($this->datacolor[$i][0]+20,255),min($this->datacolor[$i][1]+20,255),min($this->datacolor[$i][2]+20,255),60);
 				$colorter=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),90);
-				
+
 				$plot = new LinePlot($newvalues);
 				//$plot->setSize(1, 0.96);
 				//$plot->setCenter(0.5, 0.52);
-				
+
 				$plot->setColor($color);
 				$plot->setThickness(1);
 
@@ -544,14 +544,14 @@ class DolGraph
 				$plot->setFillGradient( new LinearGradient($colorter, $colorbis, 90) );
 
 				$plot->xAxis->setLabelText($legends);
-				
+
 				// Le mode automatique est plus efficace
 				$plot->SetYMax($this->MaxValue);
 				$plot->SetYMin($this->MinValue);
 				//$plot->setYAxis(0);
 				//$plot->hideLine(true);
 			}
-		
+
 			//$plot->reduce(80);		// Evite temps d'affichage trop long et nombre de ticks absisce satures
 
 			$group->legend->setTextFont(new Tuffy(10)); // This is to force Artichow to use awFileFontDriver to
@@ -571,7 +571,7 @@ class DolGraph
 
 		//print $group->axis->bottom->getLabelNumber();
 		if ($this->labelInterval > 0) $group->axis->bottom->setLabelInterval($this->labelInterval);
-		
+
 		$graph->add($group);
 
 		// Generate file
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 6aacf9256b3..5a512e2dc67 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *      \file       htdocs/core/events.class.php
+ *      \file       htdocs/core/class/events.class.php
  *      \ingroup    core
  *		\brief      Events class file.
  *		\version    $Id$
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2f2762cb483..890b0a8bda9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -26,7 +26,7 @@
  */
 
 /**
- *	\file       htdocs/html.form.class.php
+ *	\file       htdocs/core/class/html.form.class.php
  *	\brief      Fichier de la classe des fonctions predefinie de composants html
  *	\version	$Id$
  */
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index c13878863e4..e4d3605ef97 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
-        \file       htdocs/html.formactions.class.php
+        \file       htdocs/core/class/html.formactions.class.php
         \brief      Fichier de la classe des fonctions predefinie de composants html actions
 		\version	$Id$
 */
@@ -25,7 +25,7 @@
 
 /**
         \class      FormActions
-        \brief      Classe permettant la g�n�ration de composants html actions
+        \brief      Classe permettant la generation de composants html actions
 */
 class FormActions
 {
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index e44e11db7e8..276b94c328f 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *      \file       htdocs/html.formadmin.class.php
+ *      \file       htdocs/core/class/html.formadmin.class.php
  *      \brief      File of class for html functions for admin pages
  *		\version	$Id$
  */
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 7f629562f47..0d0c015076e 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/html.formcompany.class.php
+ *	\file       htdocs/core/class/html.formcompany.class.php
  *	\brief      File of class to build HTML component for third parties management
  *	\version	$Id$
  */
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index a60e28876ca..c5b8ca737db 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/html.formfile.class.php
+ *	\file       htdocs/core/class/html.formfile.class.php
  *	\brief      Fichier de la classe des fonctions predefinie de composants html fichiers
  *	\version	$Id$
  */
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 14ade64a27a..c89651c1061 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *       \file       htdocs/html.formmail.class.php
+ *       \file       htdocs/core/class/html.formmail.class.php
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
  *       \version    $Id$
  */
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index 5c1fb4c0469..ce818810813 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/html.formorder.class.php
+ *	\file       htdocs/core/class/html.formorder.class.php
  *	\brief      File of predefined functions for HTML forms for order module
  *	\version	$Id$
  */
@@ -81,10 +81,10 @@ class FormOrder
 	{
 		global $conf,$langs;
 		$listemethodes=array();
-		
+
 		require_once(DOL_DOCUMENT_ROOT."/core/class/html.form.class.php");
 		$form=new Form($this->db);
-		
+
 		$sql = "SELECT rowid, libelle ";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_methode_commande_fournisseur";
 		$sql.= " WHERE active = 1";
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 1b5837e5e6e..4f1037e4dae 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -26,7 +26,7 @@
  */
 
 /**
- *	\file       htdocs/html.formother.class.php
+ *	\file       htdocs/core/class/html.formother.class.php
  *	\brief      Fichier de la classe des fonctions predefinie de composants html autre
  *	\version	$Id$
  */
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 90dc93c740a..c4b149f4a43 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *  \file       htdocs/core/menubase.class.php
+ *  \file       htdocs/core/class/menubase.class.php
  *  \ingroup    core
  *  \version	$Id$
  *  \brief      File of class to manage dynamic menu entries
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 2ad09fde739..aac03d10a47 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
-        \file       htdocs/notify.class.php
+        \file       htdocs/core/class/notify.class.php
         \brief      Fichier de la classe de gestion des notifications
         \version    $Id$
 */
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index 22004e76f90..431ad9e4e62 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *       \file       htdocs/stats.class.php
+ *       \file       htdocs/core/class/stats.class.php
  *       \ingroup    core
  *       \brief      Common class to manage statistics reports
  *       \version    $Id$
@@ -47,7 +47,7 @@ class Stats
 	function getNbByMonthWithPrevYear($endyear,$startyear)
 	{
 		$datay=array();
-			
+
 		$year=$startyear;
 		while($year <= $endyear)
 		{
@@ -67,8 +67,8 @@ class Stats
 				$year++;
 			}
 		}
-		
-		// return array(array('Month',val1,val2,val3),...)		
+
+		// return array(array('Month',val1,val2,val3),...)
 		return $data;
 	}
 
@@ -82,7 +82,7 @@ class Stats
 	function getAmountByMonthWithPrevYear($endyear,$startyear)
 	{
 		$datay=array();
-			
+
 		$year=$startyear;
 		while($year <= $endyear)
 		{
@@ -115,7 +115,7 @@ class Stats
 	function _getNbByYear($sql)
 	{
 		$result = array();
-		
+
 		dol_syslog("Stats::_getNbByYear sql=".$sql);
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -144,7 +144,7 @@ class Stats
 	function _getAllByYear($sql)
 	{
 		$result = array();
-		
+
 		dol_syslog("Stats::_getAllByYear sql=".$sql);
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -166,8 +166,8 @@ class Stats
 			dol_print_error($this->db);
 		}
 		return $result;
-	}	
-	
+	}
+
 	/**
 	 * \brief  Renvoie le nombre de proposition par mois pour une annee donnee
 	 *
@@ -195,7 +195,7 @@ class Stats
 		{
 			dol_print_error($this->db);
 		}
-		
+
 		for ($i = 1 ; $i < 13 ; $i++)
 		{
 			$res[$i] = $result[$i] + 0;
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 3e507151f66..6cecaddf9c6 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *   	\file       htdocs/translate.class.php
+ *   	\file       htdocs/core/class/translate.class.php
  *		\brief      File for Tanslate class
  *		\author	    Eric Seigne
  *		\author	    Laurent Destailleur