diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 3d1885799c3..1c6505a260b 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -898,7 +898,7 @@ if ($rowid > 0)
                     'moreattr' => 'maxlength="128"',
                 );
 			}
-			// @TODO Add other extrafields mandatory for thirdparty creation
+			// @todo Add other extrafields mandatory for thirdparty creation
 
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id, $langs->trans("CreateDolibarrThirdParty"), $langs->trans("ConfirmCreateThirdParty"), "confirm_create_thirdparty", $formquestion, 1);
 		}
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 98d77d47118..526c8785681 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -432,7 +432,7 @@ print '</td>';
 print '</tr>';
 */
 
-// @TODO Use module notification instead...
+// @todo Use module notification instead...
 
 // Email de réception des notifications
 print '<tr class="oddeven"><td>'.$langs->trans("TicketEmailNotificationTo").'</td>';
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index b9d58fc76f1..acbffa109a2 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -98,7 +98,7 @@ class Categorie extends CommonObject
 	/**
 	 * @var array Foreign keys mapping from type string
 	 *
-	 * @TODO Move to const array when PHP 5.6 will be our minimum target
+	 * @todo Move to const array when PHP 5.6 will be our minimum target
 	 */
 	protected $MAP_CAT_FK = array(
 		'product'  => 'product',
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 69f748412a1..38af9bfd4fd 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1112,7 +1112,7 @@ class ActionComm extends CommonObject
 
     /**
      *  Load all objects with filters.
-     *  @TODO WARNING: This make a fetch on all records instead of making one request with a join.
+     *  @todo WARNING: This make a fetch on all records instead of making one request with a join.
      *
      *  @param		DoliDb	$db				Database handler
      *  @param		int		$socid			Filter by thirdparty
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index ef88c586ede..9f2a69ff6c5 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -248,7 +248,7 @@ if ($action == "create" || $action == "start")
 			$vartouse = 'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse;
 			$bankid = $conf->global->$vartouse; // This value is ok for 'Terminal 0' for module 'CashDesk' and 'TakePos' (they manage only 1 terminal)
 			// Hook to get the good bank id according to posmodule and posnumber.
-			// @TODO add hook here
+			// @todo add hook here
 
 			if ($bankid > 0)
 			{
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 851a6450b8b..740a1e47784 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -280,7 +280,7 @@ class RejetPrelevement
 	 *
 	 * @param 	int		$amounts 	If you want to get the amount of the order for each invoice
 	 * @return	array				Array List of invoices related to the withdrawal line
-	 * @TODO	A withdrawal line is today linked to one and only one invoice. So the function should return only one object ?
+	 * @todo	A withdrawal line is today linked to one and only one invoice. So the function should return only one object ?
 	 */
 	private function getListInvoices($amounts = 0)
 	{
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 9af5a559f5e..6e91ef53e2b 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -420,7 +420,7 @@ elseif ($modecompta=="BOOKKEEPING")
 				foreach ($cpts as $i => $cpt)    // Loop on each account.
 				{
 					// We make 1 loop for each account because we may want detail per account.
-					// @TODO Optimize to ask a 'group by' account and a filter with account in (..., ...) in request
+					// @todo Optimize to ask a 'group by' account and a filter with account in (..., ...) in request
 
 					// Each month
 					$resultN = 0;
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index ac3e800e6e4..df9ac7d3a7e 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -194,7 +194,7 @@ elseif ($modecompta=="BOOKKEEPING")
 	$sql  = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.credit) as amount_ttc";
 	$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
 	$sql.= " WHERE b.entity = ".$conf->entity;
-	$sql.= " AND b.code_journal = aj.code AND aj.nature = 2" ; // @TODO currently count amount in sale journal, but we need to define a category group for turnover
+	$sql.= " AND b.code_journal = aj.code AND aj.nature = 2" ; // @todo currently count amount in sale journal, but we need to define a category group for turnover
 }
 
 $sql.= " GROUP BY dm";
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 35009811fe2..f379cd0c82f 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1280,7 +1280,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 }
 
 // Generate document foreach object according to model linked to object
-// @TODO : propose model selection
+// @todo : propose model selection
 if (!$error && $massaction == 'generate_doc' && $permissiontoread)
 {
     $db->begin();
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index f490397754d..3f13eec2b34 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -431,7 +431,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 						$object->socid			= $sendtosocid;	   // To link to a company
 						$object->sendtoid		= $sendtoid;	   // To link to contact addresses. This is an array.
 						$object->actiontypecode	= $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-						$object->actionmsg		= $actionmsg;      // Long text (@TODO Replace this with $message, we already have details of email in dedicated properties)
+						$object->actionmsg		= $actionmsg;      // Long text (@todo Replace this with $message, we already have details of email in dedicated properties)
 						$object->actionmsg2		= $actionmsg2;     // Short text ($langs->transnoentities('MailSentBy')...);
 
 						$object->trackid        = $trackid;
@@ -444,7 +444,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 							$object->sendtouserid	= $sendtouserid;
 						}
 
-						$object->email_msgid = $mailfile->msgid;	// @TODO Set msgid into $mailfile after sending
+						$object->email_msgid = $mailfile->msgid;	// @todo Set msgid into $mailfile after sending
 						$object->email_from = $from;
 						$object->email_subject = $subject;
 						$object->email_to = $sendto;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 544063bc4c8..25588323103 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2598,7 +2598,7 @@ abstract class CommonObject
 	 */
 	public function updateRangOfLine($rowid, $rang)
 	{
-		$fieldposition = 'rang'; // @TODO Rename 'rang' into 'position'
+		$fieldposition = 'rang'; // @todo Rename 'rang' into 'position'
 		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
@@ -4883,7 +4883,7 @@ abstract class CommonObject
 
 	/**
 	 *  Build thumb
-	 *  @TODO Move this into files.lib.php
+	 *  @todo Move this into files.lib.php
 	 *
 	 *  @param      string	$file           Path file in UTF8 to original file to create thumbs from.
 	 *	@return		void
@@ -6607,7 +6607,7 @@ abstract class CommonObject
 				// Show only the key field in params
 				if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;
 
-				// @TODO Add test also on 'enabled' (different than 'list' that is 'visibility')
+				// @todo Add test also on 'enabled' (different than 'list' that is 'visibility')
 				$enabled = 1;
 
 				$visibility = 1;
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 0352700d91a..c78fe06693b 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -971,7 +971,7 @@ class FormFile
 		}
 
 		// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files and get only generated files)
-		// @TODO Why not showing by default all files by just removing the '[^\-]+' at end of regex ?
+		// @todo Why not showing by default all files by just removing the '[^\-]+' at end of regex ?
 		if (!empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
 		{
 			$filterforfilesearch = preg_quote(basename($modulesubdir), '/');
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 12be3854ed6..7a3508c7d2f 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -65,7 +65,7 @@ class Notify
 	// Les codes actions sont definis dans la table llx_notify_def
 
 	// codes actions supported are
-	// @TODO defined also into interface_50_modNotificiation_Notificiation.class.php
+	// @todo defined also into interface_50_modNotificiation_Notificiation.class.php
 	public $arrayofnotifsupported = array(
 		'BILL_VALIDATE',
 		'BILL_PAYED',
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index f467040a00d..490727f9521 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -44,7 +44,7 @@ class InterfaceNotification extends DolibarrTriggers
 	 */
 	public $picto = 'email';
 
-	// @TODO Defined also into notify.class.php)
+	// @todo Defined also into notify.class.php)
 	public $listofmanagedevents=array(
 		'BILL_VALIDATE',
 		'BILL_PAYED',
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index ad21603efce..79ea7552237 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2712,8 +2712,8 @@ class ExpenseReportLine
 		if (!empty($this->id)) $sql.= ' AND d.rowid <> '.$this->id;
 		$sql .= ' AND d.fk_c_type_fees = '.$rule->fk_c_type_fees;
 		if ($mode == 'day' || $mode == 'EX_DAY') $sql .= ' AND d.date = \''.dol_print_date($this->date, '%Y-%m-%d').'\'';
-		elseif ($mode == 'mon' || $mode == 'EX_MON') $sql .= ' AND DATE_FORMAT(d.date, \'%Y-%m\') = \''.dol_print_date($this->date, '%Y-%m').'\'';    // @TODO DATE_FORMAT is forbidden
-		elseif ($mode == 'year' || $mode == 'EX_YEA') $sql .= ' AND DATE_FORMAT(d.date, \'%Y\') = \''.dol_print_date($this->date, '%Y').'\'';         // @TODO DATE_FORMAT is forbidden
+		elseif ($mode == 'mon' || $mode == 'EX_MON') $sql .= ' AND DATE_FORMAT(d.date, \'%Y-%m\') = \''.dol_print_date($this->date, '%Y-%m').'\'';    // @todo DATE_FORMAT is forbidden
+		elseif ($mode == 'year' || $mode == 'EX_YEA') $sql .= ' AND DATE_FORMAT(d.date, \'%Y\') = \''.dol_print_date($this->date, '%Y').'\'';         // @todo DATE_FORMAT is forbidden
 
 		dol_syslog('ExpenseReportLine::getExpAmount');
 
diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php
index 4692687220a..7e4abfb5692 100644
--- a/htdocs/stripe/payment.php
+++ b/htdocs/stripe/payment.php
@@ -28,7 +28,7 @@
 /**
  *	\file       htdocs/stripe/payment.php
  *	\ingroup    stripe
- *	\brief      Payment page for customers invoices. @TODO Seems deprecated and bugged and not used (no link to this page) !
+ *	\brief      Payment page for customers invoices. @todo Seems deprecated and bugged and not used (no link to this page) !
  */
 
 // Load Dolibarr environment
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index ffb8c15e3c3..7ade356a360 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1971,7 +1971,7 @@ class User extends CommonObject
 	 *
 	 *  @param	User	$user           Object user that send email
 	 *  @param	string	$password       New password
-	 *	@param	int		$changelater	0=Send clear passwod into email, 1=Change password only after clicking on confirm email. @TODO Add method 2 = Send link to reset password
+	 *	@param	int		$changelater	0=Send clear passwod into email, 1=Change password only after clicking on confirm email. @todo Add method 2 = Send link to reset password
 	 *  @return int 		            < 0 si erreur, > 0 si ok
 	 */
 	public function send_password($user, $password = '', $changelater = 0)