diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index b2911b95fb7..234b7527dd1 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1780,7 +1780,7 @@ class Facture extends CommonObject
             if ($result > 0)
             {
                 // Mise a jour informations denormalisees au niveau de la facture meme
-                $this->id=$facid;	// \TODO A virer
+                $this->id=$facid;	// TODO To move this we must remove parameter facid into this function declaration
                 $result=$this->update_price();
                 if ($result > 0)
                 {
diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php
index a7ef50a5186..08ebd92ddf0 100644
--- a/htdocs/compta/payment_sc/fiche.php
+++ b/htdocs/compta/payment_sc/fiche.php
@@ -84,8 +84,7 @@ if ($_REQUEST['action'] == 'confirm_valide' && $_REQUEST['confirm'] == 'yes' &&
 	{
 		$db->commit();
 
-		// \TODO Boucler sur les facture liees a ce paiement et regenerer le pdf
-		$factures=array();
+		$factures=array();	// TODO Get all id of invoices linked to this payment
 		foreach($factures as $id)
 		{
 			$fac = new Facture($db);
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index de65ba51672..f490f64287f 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -866,7 +866,7 @@ class Contrat extends CommonObject
 			$total_ttc = $tabprice[2];
 			$total_localtax1= $tabprice[9];
 			$total_localtax2= $tabprice[10];
-			// \TODO A virer
+			// TODO A virer
 			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
 			$remise = 0;
 			$price = price2num(round($pu_ht, 2));
@@ -882,7 +882,7 @@ class Contrat extends CommonObject
 			$sql.= " localtax1_tx, localtax2_tx, remise_percent, subprice,";
 			$sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,";
 			$sql.= " info_bits,";
-			$sql.= " price_ht, remise";								// \TODO A virer
+			$sql.= " price_ht, remise";								// TODO A virer
 			if ($date_start > 0) { $sql.= ",date_ouverture_prevue"; }
 			if ($date_end > 0)  { $sql.= ",date_fin_validite"; }
 			$sql.= ") VALUES ($this->id, '" . $this->db->escape($label) . "','" . $this->db->escape($desc) . "',";
@@ -894,7 +894,7 @@ class Contrat extends CommonObject
 			$sql.= " ".price2num($remise_percent).",".price2num($pu_ht).",";
 			$sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).",";
 			$sql.= " '".$info_bits."',";
-			$sql.= " ".price2num($price).",".price2num( $remise);	// \TODO A virer
+			$sql.= " ".price2num($price).",".price2num( $remise);	// TODO A virer
 			if ($date_start > 0) { $sql.= ",".$this->db->idate($date_start); }
 			if ($date_end > 0) { $sql.= ",".$this->db->idate($date_end); }
 			$sql.= ")";
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index d61c53aa6b1..7d8a0f3632e 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -61,7 +61,7 @@ class FormOrder
 		print '<select class="flat" name="'.$htmlname.'" '.$htmloption.'>';
 		if ($addempty) print '<option value="-1" selected="selected">&nbsp;</option>';
 
-		// \TODO Aller chercher les sources dans dictionnaire
+		// TODO Aller chercher les sources dans dictionnaire
 		print '<option value="0"'.($selected=='0'?' selected="selected"':'').'>'.$langs->trans('OrderSource0').'</option>';
 		print '<option value="1"'.($selected=='1'?' selected="selected"':'').'>'.$langs->trans('OrderSource1').'</option>';
 		print '<option value="2"'.($selected=='2'?' selected="selected"':'').'>'.$langs->trans('OrderSource2').'</option>';
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 8838332bca4..2dd33f56feb 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -912,7 +912,7 @@ class CommandeFournisseur extends Commande
 
 			$subprice = price2num($pu,'MU');
 
-			// \TODO A virer
+			// TODO A virer
 			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
 			$remise = 0;
 			if ($remise_percent > 0)
@@ -1148,10 +1148,10 @@ class CommandeFournisseur extends Commande
 	}
 
 	/**
-	 * 	\bref		Set a delivery in database for this supplier order
-	 *	\param		user		User that input data
-	 *	\param		date		Date of reception
-	 *	\param		type		Type of receipt
+	 * 	Set a delivery in database for this supplier order
+	 *	@param		user		User that input data
+	 *	@param		date		Date of reception
+	 *	@param		type		Type of receipt
 	 */
 	function Livraison($user, $date, $type, $comment)
 	{