From a82df7e6ea2efee2b04f6e3fec755b05f85c1b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 26 Feb 2021 18:49:22 +0100
Subject: [PATCH] code syntax project

---
 htdocs/projet/activity/index.php              | 271 +++---
 htdocs/projet/activity/perday.php             | 293 +++---
 htdocs/projet/activity/permonth.php           | 230 +++--
 htdocs/projet/activity/perweek.php            | 363 ++++---
 htdocs/projet/admin/project.php               | 352 +++----
 htdocs/projet/admin/project_extrafields.php   |  17 +-
 .../projet/admin/project_task_extrafields.php |  17 +-
 htdocs/projet/admin/website.php               |  17 +-
 htdocs/projet/ajax/projects.php               |  32 +-
 htdocs/projet/card.php                        | 513 +++++-----
 htdocs/projet/class/api_projects.class.php    | 250 ++---
 htdocs/projet/class/api_tasks.class.php       | 317 ++++---
 htdocs/projet/class/project.class.php         | 625 ++++++------
 htdocs/projet/class/projectstats.class.php    |  94 +-
 htdocs/projet/class/task.class.php            | 804 ++++++++--------
 htdocs/projet/class/taskstats.class.php       |  34 +-
 htdocs/projet/comment.php                     |  26 +-
 htdocs/projet/contact.php                     | 112 ++-
 htdocs/projet/document.php                    |  40 +-
 htdocs/projet/element.php                     | 705 ++++++++------
 htdocs/projet/event.php                       |  90 +-
 htdocs/projet/ganttchart.inc.php              |  39 +-
 htdocs/projet/ganttview.php                   | 104 +-
 htdocs/projet/graph_opportunities.inc.php     |  63 +-
 htdocs/projet/index.php                       | 116 ++-
 htdocs/projet/info.php                        |  62 +-
 htdocs/projet/jsgantt_language.js.php         |  58 +-
 htdocs/projet/list.php                        | 834 ++++++++++------
 htdocs/projet/note.php                        |  17 +-
 htdocs/projet/stats/index.php                 |  80 +-
 htdocs/projet/tasks.php                       | 314 ++++---
 htdocs/projet/tasks/comment.php               |  94 +-
 htdocs/projet/tasks/contact.php               | 166 ++--
 htdocs/projet/tasks/document.php              |  92 +-
 htdocs/projet/tasks/list.php                  | 828 ++++++++++------
 htdocs/projet/tasks/note.php                  |  77 +-
 htdocs/projet/tasks/stats/index.php           |  50 +-
 htdocs/projet/tasks/task.php                  | 202 ++--
 htdocs/projet/tasks/time.php                  | 887 ++++++++++--------
 39 files changed, 5067 insertions(+), 4218 deletions(-)

diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 2ca149a18ca..c49ca736bbb 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -32,13 +32,19 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $search_project_user = GETPOST('search_project_user', 'int');
 $mine = GETPOST('mode', 'aZ09') == 'mine' ? 1 : 0;
-if ($search_project_user == $user->id) $mine = 1;
+if ($search_project_user == $user->id) {
+	$mine = 1;
+}
 
 // Security check
 $socid = 0;
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 //$result = restrictedArea($user, 'projet', $projectid);
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 $hookmanager = new HookManager($db);
 
@@ -73,8 +79,11 @@ llxHeader("", $title);
 
 // Title for combo list see all projects
 $titleall = $langs->trans("AllAllowedProjects");
-if (!empty($user->rights->projet->all->lire) && !$socid) $titleall = $langs->trans("AllProjects");
-else $titleall = $langs->trans("AllAllowedProjects").'<br><br>';
+if (!empty($user->rights->projet->all->lire) && !$socid) {
+	$titleall = $langs->trans("AllProjects");
+} else {
+	$titleall = $langs->trans("AllAllowedProjects").'<br><br>';
+}
 
 
 $morehtml = '';
@@ -85,10 +94,14 @@ $morehtml .= '<option name="mine" value="'.$user->id.'"'.(($search_project_user
 $morehtml .= '</SELECT>';
 $morehtml .= '<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
 
-if ($mine) $tooltiphelp = $langs->trans("MyTasksDesc");
-else {
-	if ($user->rights->projet->all->lire && !$socid) $tooltiphelp = $langs->trans("TasksDesc");
-	else $tooltiphelp = $langs->trans("TasksPublicDesc");
+if ($mine) {
+	$tooltiphelp = $langs->trans("MyTasksDesc");
+} else {
+	if ($user->rights->projet->all->lire && !$socid) {
+		$tooltiphelp = $langs->trans("TasksDesc");
+	} else {
+		$tooltiphelp = $langs->trans("TasksPublicDesc");
+	}
 }
 
 print_barre_liste($form->textwithpicto($title, $tooltiphelp), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'projecttask', 0, $morehtml);
@@ -96,27 +109,27 @@ print_barre_liste($form->textwithpicto($title, $tooltiphelp), 0, $_SERVER["PHP_S
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
-{
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
 	// Search project
-	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
-	{
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
 		$listofsearchfields['search_task'] = array('text'=>'Task');
 	}
 
-	if (count($listofsearchfields))
-	{
+	if (count($listofsearchfields)) {
 		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder nohover centpercent">';
 		$i = 0;
-		foreach ($listofsearchfields as $key => $value)
-		{
-			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+		foreach ($listofsearchfields as $key => $value) {
+			if ($i == 0) {
+				print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			}
 			print '<tr '.$bc[false].'>';
 			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			if ($i == 0) {
+				print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			}
 			print '</tr>';
 			$i++;
 		}
@@ -149,12 +162,10 @@ $sql .= " AND p.rowid in (".$db->sanitize($projectsListId).")";
 $sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$total = 0;
 
-	while ($row = $db->fetch_object($resql))
-	{
+	while ($row = $db->fetch_object($resql)) {
 		print '<tr class="oddeven">';
 		print '<td>';
 		$projectstatic->id = $row->rowid;
@@ -204,12 +215,10 @@ $sql .= " AND p.rowid in (".$db->sanitize($projectsListId).")";
 $sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$total = 0;
 
-	while ($row = $db->fetch_object($resql))
-	{
+	while ($row = $db->fetch_object($resql)) {
 		print '<tr class="oddeven">';
 		print '<td>';
 		$projectstatic->id = $row->rowid;
@@ -239,66 +248,65 @@ print '</div>';
 /*
 if ($db->type != 'pgsql')
 {
-    print '<br>';
+	print '<br>';
 
-    // Affichage de la liste des projets de la semaine
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("ActivityOnProjectThisWeek").'</td>';
-    print '<td class="right">'.$langs->trans("Time").'</td>';
-    print "</tr>\n";
+	// Affichage de la liste des projets de la semaine
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("ActivityOnProjectThisWeek").'</td>';
+	print '<td class="right">'.$langs->trans("Time").'</td>';
+	print "</tr>\n";
 
-    $sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
-    $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-    $sql.= " , ".MAIN_DB_PREFIX."projet_task as t";
-    $sql.= " , ".MAIN_DB_PREFIX."projet_task_time as tt";
-    $sql.= " WHERE t.fk_projet = p.rowid";
-    $sql.= " AND p.entity = ".$conf->entity;
-    $sql.= " AND tt.fk_task = t.rowid";
-    $sql.= " AND tt.fk_user = ".$user->id;
-    $sql.= " AND task_date >= '".$db->idate(dol_get_first_day($year, $month)).'" AND ...";
-    $sql.= " AND p.rowid in (".$db->sanitize($projectsListId).")";
-    $sql.= " GROUP BY p.rowid, p.ref, p.title";
+	$sql = "SELECT p.rowid, p.ref, p.title, p.public, SUM(tt.task_duration) as nb";
+	$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+	$sql.= " , ".MAIN_DB_PREFIX."projet_task as t";
+	$sql.= " , ".MAIN_DB_PREFIX."projet_task_time as tt";
+	$sql.= " WHERE t.fk_projet = p.rowid";
+	$sql.= " AND p.entity = ".$conf->entity;
+	$sql.= " AND tt.fk_task = t.rowid";
+	$sql.= " AND tt.fk_user = ".$user->id;
+	$sql.= " AND task_date >= '".$db->idate(dol_get_first_day($year, $month)).'" AND ...";
+	$sql.= " AND p.rowid in (".$db->sanitize($projectsListId).")";
+	$sql.= " GROUP BY p.rowid, p.ref, p.title";
 
-    $resql = $db->query($sql);
-    if ( $resql )
-    {
-    	$total = 0;
+	$resql = $db->query($sql);
+	if ( $resql )
+	{
+		$total = 0;
 
-    	while ($row = $db->fetch_object($resql))
-    	{
-    		print '<tr class="oddeven">';
-    		print '<td>';
-    		$projectstatic->id=$row->rowid;
-    		$projectstatic->ref=$row->ref;
-    		$projectstatic->title=$row->title;
-    		$projectstatic->public=$row->public;
-    		print $projectstatic->getNomUrl(1, '', 1);
-    		print '</td>';
-    		print '<td class="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
-    		print "</tr>\n";
-    		$total += $row->nb;
-    	}
+		while ($row = $db->fetch_object($resql))
+		{
+			print '<tr class="oddeven">';
+			print '<td>';
+			$projectstatic->id=$row->rowid;
+			$projectstatic->ref=$row->ref;
+			$projectstatic->title=$row->title;
+			$projectstatic->public=$row->public;
+			print $projectstatic->getNomUrl(1, '', 1);
+			print '</td>';
+			print '<td class="right">'.convertSecondToTime($row->nb, 'allhourmin').'</td>';
+			print "</tr>\n";
+			$total += $row->nb;
+		}
 
-    	$db->free($resql);
-    }
-    else
-    {
-    	dol_print_error($db);
-    }
-    print '<tr class="liste_total">';
-    print '<td>'.$langs->trans('Total').'</td>';
-    print '<td class="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
-    print "</tr>\n";
-    print "</table></div><br>";
+		$db->free($resql);
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+	print '<tr class="liste_total">';
+	print '<td>'.$langs->trans('Total').'</td>';
+	print '<td class="right">'.convertSecondToTime($total, 'allhourmin').'</td>';
+	print "</tr>\n";
+	print "</table></div><br>";
 
 }
 */
 
 /* Affichage de la liste des projets du mois */
-if (!empty($conf->global->PROJECT_TASK_TIME_MONTH))
-{
+if (!empty($conf->global->PROJECT_TASK_TIME_MONTH)) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -319,10 +327,8 @@ if (!empty($conf->global->PROJECT_TASK_TIME_MONTH))
 	$sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
-		while ($row = $db->fetch_object($resql))
-		{
+	if ($resql) {
+		while ($row = $db->fetch_object($resql)) {
 			print '<tr class="oddeven">';
 			print '<td>';
 			$projectstatic->id = $row->rowid;
@@ -346,8 +352,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_MONTH))
 }
 
 /* Affichage de la liste des projets de l'annee */
-if (!empty($conf->global->PROJECT_TASK_TIME_YEAR))
-{
+if (!empty($conf->global->PROJECT_TASK_TIME_YEAR)) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<br><table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -368,10 +373,8 @@ if (!empty($conf->global->PROJECT_TASK_TIME_YEAR))
 	$sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
-		while ($row = $db->fetch_object($resql))
-		{
+	if ($resql) {
+		while ($row = $db->fetch_object($resql)) {
 			print '<tr class="oddeven">';
 			print '<td>';
 			$projectstatic->id = $row->rowid;
@@ -395,36 +398,39 @@ if (!empty($conf->global->PROJECT_TASK_TIME_YEAR))
 	print '</div>';
 }
 
-if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA))
-{
+if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA)) {
 	// Get id of types of contacts for projects (This list never contains a lot of elements)
 	$listofprojectcontacttype = array();
 	$sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
 	$sql .= " WHERE ctc.element = '".$db->escape($projectstatic->element)."'";
 	$sql .= " AND ctc.source = 'internal'";
 	$resql = $db->query($sql);
-	if ($resql)
-	{
-		while ($obj = $db->fetch_object($resql))
-		{
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
 			$listofprojectcontacttype[$obj->rowid] = $obj->code;
 		}
-	} else dol_print_error($db);
-	if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
+	} else {
+		dol_print_error($db);
+	}
+	if (count($listofprojectcontacttype) == 0) {
+		$listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
+	}
 	// Get id of types of contacts for tasks (This list never contains a lot of elements)
 	$listoftaskcontacttype = array();
 	$sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
 	$sql .= " WHERE ctc.element = '".$db->escape($taskstatic->element)."'";
 	$sql .= " AND ctc.source = 'internal'";
 	$resql = $db->query($sql);
-	if ($resql)
-	{
-		while ($obj = $db->fetch_object($resql))
-		{
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
 			$listoftaskcontacttype[$obj->rowid] = $obj->code;
 		}
-	} else dol_print_error($db);
-	if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
+	} else {
+		dol_print_error($db);
+	}
+	if (count($listoftaskcontacttype) == 0) {
+		$listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
+	}
 
 
 	// Tasks for all resources of all opened projects and time spent for each task/resource
@@ -440,17 +446,19 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tasktime on tasktime.fk_task = t.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on tasktime.fk_user = u.rowid";
-	if ($mine)
-	{
+	if ($mine) {
 		$sql .= ", ".MAIN_DB_PREFIX."element_contact as ect";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity('project').")";
-	if ($mine || empty($user->rights->projet->all->lire)) $sql .= " AND p.rowid IN (".$db->sanitize($projectsListId).")"; // project i have permission on
-	if ($mine)     // this may duplicate record if we are contact twice
-	{
+	if ($mine || empty($user->rights->projet->all->lire)) {
+		$sql .= " AND p.rowid IN (".$db->sanitize($projectsListId).")"; // project i have permission on
+	}
+	if ($mine) {     // this may duplicate record if we are contact twice
 		$sql .= " AND ect.fk_c_type_contact IN (".join(',', array_keys($listoftaskcontacttype)).") AND ect.element_id = t.rowid AND ect.fk_socpeople = ".$user->id;
 	}
-	if ($socid)	$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	if ($socid) {
+		$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	}
 	$sql .= " AND p.fk_statut=1";
 	$sql .= " GROUP BY p.ref, p.title, p.rowid, p.fk_statut, p.fk_opp_status, p.public, t.label, t.rowid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee";
 	$sql .= " ORDER BY t.dateo desc, t.rowid desc, t.datee";
@@ -458,8 +466,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 
 	dol_syslog('projet:index.php: affectationpercent', LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
@@ -470,7 +477,9 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 		print '<tr class="liste_titre">';
 		//print '<th>'.$langs->trans('TaskRessourceLinks').'</th>';
 		print '<th>'.$langs->trans('OpenedProjects').'</th>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) print '<th>'.$langs->trans('OpportunityStatus').'</th>';
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			print '<th>'.$langs->trans('OpportunityStatus').'</th>';
+		}
 		print '<th>'.$langs->trans('Task').'</th>';
 		print '<th class="center">'.$langs->trans('DateStart').'</th>';
 		print '<th class="center">'.$langs->trans('DateEnd').'</th>';
@@ -480,8 +489,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 		print '<th class="right">'.$langs->trans("ProgressDeclared").'</td>';
 		print '</tr>';
 
-		while ($i < $num && $i < $max)
-		{
+		while ($i < $num && $i < $max) {
 			$obj = $db->fetch_object($resql);
 
 			$projectstatic->id = $obj->projectid;
@@ -499,37 +507,44 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 			$taskstatic->datee = $db->jdate($obj->datee);
 
 			$username = '';
-			if ($obj->userid && $userstatic->id != $obj->userid)	// We have a user and it is not last loaded user
-			{
+			if ($obj->userid && $userstatic->id != $obj->userid) {	// We have a user and it is not last loaded user
 				$result = $userstatic->fetch($obj->userid);
-				if (!$result) $userstatic->id = 0;
+				if (!$result) {
+					$userstatic->id = 0;
+				}
+			}
+			if ($userstatic->id) {
+				$username = $userstatic->getNomUrl(0, 0);
 			}
-			if ($userstatic->id) $username = $userstatic->getNomUrl(0, 0);
 
 			print '<tr class="oddeven">';
 			//print '<td>'.$username.'</td>';
 			print '<td>';
 			print $projectstatic->getNomUrl(1, '', 0, '', '<br>');
 			print '</td>';
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-			{
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 				print '<td>';
 				$code = dol_getIdFromCode($db, $obj->opp_status, 'c_lead_status', 'rowid', 'code');
-				if ($code) print $langs->trans("OppStatus".$code);
+				if ($code) {
+					print $langs->trans("OppStatus".$code);
+				}
 				print '</td>';
 			}
 			print '<td>';
-			if (!empty($obj->taskid))
-			{
+			if (!empty($obj->taskid)) {
 				$tasktmp->id = $obj->taskid;
 				$tasktmp->ref = $obj->ref;
 				$tasktmp->label = $obj->label;
 				print $tasktmp->getNomUrl(1, 'withproject', 'task', 1, '<br>');
-			} else print $langs->trans("NoTasks");
+			} else {
+				print $langs->trans("NoTasks");
+			}
 			print '</td>';
 			print '<td class="center">'.dol_print_date($db->jdate($obj->dateo), 'day').'</td>';
 			print '<td class="center">'.dol_print_date($db->jdate($obj->datee), 'day');
-			if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late"));
+			if ($taskstatic->hasDelay()) {
+				print img_warning($langs->trans("Late"));
+			}
 			print '</td>';
 			print '<td class="right"><a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$obj->taskid.'&withproject=1">';
 			print convertSecondToTime($obj->planned_workload, 'allhourmin');
@@ -538,8 +553,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 			print convertSecondToTime($obj->timespent, 'allhourmin');
 			print '</a></td>';
 			print '<td class="right">';
-			if (!empty($obj->taskid))
-			{
+			if (!empty($obj->taskid)) {
 				if (empty($obj->planned_workload) > 0) {
 					$percentcompletion = $langs->trans("WorkloadNotDefined");
 				} else {
@@ -556,10 +570,11 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 			$i++;
 		}
 
-		if ($num > $max)
-		{
+		if ($num > $max) {
 			$colspan = 6;
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) $colspan++;
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+				$colspan++;
+			}
 			print '<tr><td colspan="'.$colspan.'">'.$langs->trans("WarningTooManyDataPleaseUseMoreFilters").'</td></tr>';
 		}
 
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index c6b38390ac9..1bc0d49d424 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -46,7 +46,9 @@ $taskid = GETPOST('taskid', 'int');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'perdaycard';
 
 $mine = 0;
-if ($mode == 'mine') $mine = 1;
+if ($mode == 'mine') {
+	$mine = 1;
+}
 
 $projectid = isset($_GET["id"]) ? GETPOST("id", "int", 1) : GETPOST("projectid", "int");
 
@@ -84,16 +86,17 @@ $dayofday = GETPOST('addtimeday');
 $yearofday = GETPOST('addtimeyear');
 
 $daytoparse = $now;
-if ($yearofday && $monthofday && $dayofday) $daytoparse = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday); // xxxofday is value of day after submit action 'addtime'
-elseif ($year && $month && $day) $daytoparse = dol_mktime(0, 0, 0, $month, $day, $year); // this are value submited after submit of action 'submitdateselect'
+if ($yearofday && $monthofday && $dayofday) {
+	$daytoparse = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday); // xxxofday is value of day after submit action 'addtime'
+} elseif ($year && $month && $day) {
+	$daytoparse = dol_mktime(0, 0, 0, $month, $day, $year); // this are value submited after submit of action 'submitdateselect'
+}
 
 
-if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
-{
+if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id) {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
-} elseif ($search_usertoprocessid > 0)
-{
+} elseif ($search_usertoprocessid > 0) {
 	$usertoprocess = new User($db);
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
@@ -124,12 +127,11 @@ $arrayfields['t.progress'] = array('label'=>'ProgressDeclared', 'checked'=>1, 'e
  );
  */
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
 			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+		}
 	}
 }
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -145,10 +147,11 @@ $search_array_options_task = $extrafields->getOptionalsFromPost($object->table_e
 
 $parameters = array('id' => $id, 'taskid' => $taskid, 'projectid' => $projectid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 // Purge criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 	$action = '';
 	$search_categ = '';
 	$search_usertoprocessid = $user->id;
@@ -164,15 +167,12 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	// We redefine $usertoprocess
 	$usertoprocess = $user;
 }
-if (GETPOST("button_search_x", 'alpha') || GETPOST("button_search.x", 'alpha') || GETPOST("button_search", 'alpha'))
-{
+if (GETPOST("button_search_x", 'alpha') || GETPOST("button_search.x", 'alpha') || GETPOST("button_search", 'alpha')) {
 	$action = '';
 }
 
-if (GETPOST('submitdateselect'))
-{
-	if (GETPOST('remonth', 'int') && GETPOST('reday', 'int') && GETPOST('reyear', 'int'))
-	{
+if (GETPOST('submitdateselect')) {
+	if (GETPOST('remonth', 'int') && GETPOST('reday', 'int') && GETPOST('reyear', 'int')) {
 		$daytoparse = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 	}
 
@@ -181,46 +181,40 @@ if (GETPOST('submitdateselect'))
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask') && GETPOST('formfilteraction') != 'listafterchangingselectedfields')
-{
+if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask') && GETPOST('formfilteraction') != 'listafterchangingselectedfields') {
 	$action = 'assigntask';
 
-	if ($taskid > 0)
-	{
+	if ($taskid > 0) {
 		$result = $object->fetch($taskid, $ref);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 	} else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
-	if (!GETPOST('type'))
-	{
+	if (!GETPOST('type')) {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), '', 'errors');
 		$error++;
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		$idfortaskuser = $usertoprocess->id;
 		$result = $object->add_contact($idfortaskuser, GETPOST("type"), 'internal');
 
-		if ($result >= 0 || $result == -2)	// Contact add ok or already contact of task
-		{
+		if ($result >= 0 || $result == -2) {	// Contact add ok or already contact of task
 			// Test if we are already contact of the project (should be rare but sometimes we can add as task contact without being contact of project, like when admin user has been removed from contact of project)
 			$sql = 'SELECT ec.rowid FROM '.MAIN_DB_PREFIX.'element_contact as ec, '.MAIN_DB_PREFIX.'c_type_contact as tc WHERE tc.rowid = ec.fk_c_type_contact';
 			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = '.$object->fk_project.' AND tc.element = 'project' AND source = 'internal'";
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if (!$obj)	// User is not already linked to project, so we will create link to first type
-				{
+				if (!$obj) {	// User is not already linked to project, so we will create link to first type
 					$project = new Project($db);
 					$project->fetch($object->fk_project);
 					// Get type
 					$listofprojcontact = $project->liste_type_contact('internal');
 
-					if (count($listofprojcontact))
-					{
+					if (count($listofprojcontact)) {
 						$typeforprojectcontact = reset(array_keys($listofprojcontact));
 						$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
 					}
@@ -231,11 +225,9 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		}
 	}
 
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		$error++;
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
 		} else {
@@ -243,8 +235,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages("TaskAssignedToEnterTime", null);
 		$taskid = 0;
 	}
@@ -252,49 +243,47 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	$action = '';
 }
 
-if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilteraction') != 'listafterchangingselectedfields')
-{
+if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilteraction') != 'listafterchangingselectedfields') {
 	$timespent_duration = array();
 
-	if (is_array($_POST))
-	{
-		foreach ($_POST as $key => $time)
-		{
-			if (intval($time) > 0)
-			{
+	if (is_array($_POST)) {
+		foreach ($_POST as $key => $time) {
+			if (intval($time) > 0) {
 				$matches = array();
 				// Hours or minutes of duration
-				if (preg_match("/([0-9]+)duration(hour|min)/", $key, $matches))
-				{
+				if (preg_match("/([0-9]+)duration(hour|min)/", $key, $matches)) {
 					$id = $matches[1];
-					if ($id > 0)
-					{
+					if ($id > 0) {
 						// We store HOURS in seconds
-						if ($matches[2] == 'hour') $timespent_duration[$id] += $time * 60 * 60;
+						if ($matches[2] == 'hour') {
+							$timespent_duration[$id] += $time * 60 * 60;
+						}
 
 						// We store MINUTES in seconds
-						if ($matches[2] == 'min') $timespent_duration[$id] += $time * 60;
+						if ($matches[2] == 'min') {
+							$timespent_duration[$id] += $time * 60;
+						}
 					}
 				}
 			}
 		}
 	}
 
-	if (count($timespent_duration) > 0)
-	{
-		foreach ($timespent_duration as $key => $val)
-		{
+	if (count($timespent_duration) > 0) {
+		foreach ($timespent_duration as $key => $val) {
 			$object->fetch($key);
 			$taskid = $object->id;
 
-			if (GETPOSTISSET($taskid.'progress')) $object->progress = GETPOST($taskid.'progress', 'int');
-			else unset($object->progress);
+			if (GETPOSTISSET($taskid.'progress')) {
+				$object->progress = GETPOST($taskid.'progress', 'int');
+			} else {
+				unset($object->progress);
+			}
 
 			$object->timespent_duration = $val;
 			$object->timespent_fk_user = $usertoprocess->id;
 			$object->timespent_note = GETPOST($key.'note');
-			if (GETPOST($key."hour", 'int') != '' && GETPOST($key."hour", 'int') >= 0)	// If hour was entered
-			{
+			if (GETPOST($key."hour", 'int') != '' && GETPOST($key."hour", 'int') >= 0) {	// If hour was entered
 				$object->timespent_datehour = dol_mktime(GETPOST($key."hour", 'int'), GETPOST($key."min", 'int'), 0, $monthofday, $dayofday, $yearofday);
 				$object->timespent_withhour = 1;
 			} else {
@@ -302,8 +291,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			}
 			$object->timespent_date = $object->timespent_datehour;
 
-			if ($object->timespent_date > 0)
-			{
+			if ($object->timespent_date > 0) {
 				$result = $object->addTimeSpent($user);
 			} else {
 				setEventMessages("ErrorBadDate", null, 'errors');
@@ -311,16 +299,14 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 				break;
 			}
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 				break;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 
 			// Redirect to avoid submit twice on back
@@ -328,7 +314,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			exit;
 		}
 	} else {
-   		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
+		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	}
 }
 
@@ -362,8 +348,7 @@ $title = $langs->trans("TimeSpent");
 
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertoprocess, (empty($usertoprocess->id) ? 2 : 0), 1); // Return all project i have permission on. I want my tasks and some of my task may be on a public projet that is not my project
 
-if ($id)
-{
+if ($id) {
 	$project->fetch($id);
 	$project->fetch_thirdparty();
 }
@@ -371,11 +356,21 @@ if ($id)
 $onlyopenedproject = 1; // or -1
 $morewherefilter = '';
 
-if ($search_project_ref) $morewherefilter .= natural_search(array("p.ref", "p.title"), $search_project_ref);
-if ($search_task_ref)    $morewherefilter .= natural_search("t.ref", $search_task_ref);
-if ($search_task_label)  $morewherefilter .= natural_search(array("t.ref", "t.label"), $search_task_label);
-if ($search_thirdparty)  $morewherefilter .= natural_search("s.nom", $search_thirdparty);
-if ($search_declared_progress)  $morewherefilter .= natural_search("t.progress", $search_declared_progress, 1);
+if ($search_project_ref) {
+	$morewherefilter .= natural_search(array("p.ref", "p.title"), $search_project_ref);
+}
+if ($search_task_ref) {
+	$morewherefilter .= natural_search("t.ref", $search_task_ref);
+}
+if ($search_task_label) {
+	$morewherefilter .= natural_search(array("t.ref", "t.label"), $search_task_label);
+}
+if ($search_thirdparty) {
+	$morewherefilter .= natural_search("s.nom", $search_thirdparty);
+}
+if ($search_declared_progress) {
+	$morewherefilter .= natural_search("t.progress", $search_declared_progress, 1);
+}
 
 $sql = &$morewherefilter;
 
@@ -392,8 +387,7 @@ $extrafieldsobjectkey = 'projet_task';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
 $tasksarray = $taskstatic->getTasksArray(0, 0, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
-if ($morewherefilter)	// Get all task without any filter, so we can show total of time spent for not visible tasks
-{
+if ($morewherefilter) {	// Get all task without any filter, so we can show total of time spent for not visible tasks
 	$tasksarraywithoutfilter = $taskstatic->getTasksArray(0, 0, ($project->id ? $project->id : 0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
 }
 $projectsrole = $taskstatic->getUserRolesForProjectsOrTasks($usertoprocess, 0, ($project->id ? $project->id : 0), 0, $onlyopenedproject);
@@ -451,16 +445,18 @@ print dol_get_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, $
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
-if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-else {
-	if (empty($usertoprocess->id) || $usertoprocess->id < 0)
-	{
-		if ($user->rights->projet->all->lire && !$socid) print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-		else print $langs->trans("ProjectsPublicTaskDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
+if ($mine || ($usertoprocess->id == $user->id)) {
+	print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
+} else {
+	if (empty($usertoprocess->id) || $usertoprocess->id < 0) {
+		if ($user->rights->projet->all->lire && !$socid) {
+			print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
+		} else {
+			print $langs->trans("ProjectsPublicTaskDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
+		}
 	}
 }
-if ($mine || ($usertoprocess->id == $user->id))
-{
+if ($mine || ($usertoprocess->id == $user->id)) {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
 } else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
@@ -474,7 +470,9 @@ print '<div class="floatright right'.($conf->dol_optimize_smallscreen ? ' centpe
 
 print '<div class="colorbacktimesheet float valignmiddle">';
 $titleassigntask = $langs->transnoentities("AssignTaskToMe");
-if ($usertoprocess->id != $user->id) $titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
+if ($usertoprocess->id != $user->id) {
+	$titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
+}
 print '<div class="taskiddiv inline-block">';
 print img_picto('', 'projecttask');
 $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
@@ -503,12 +501,13 @@ $moreforfilter = '';
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= '<div class="inline-block hideonsmartphone"></div>';
 $includeonly = 'hierarchyme';
-if (empty($user->rights->user->user->lire)) $includeonly = array($user->id);
+if (empty($user->rights->user->user->lire)) {
+	$includeonly = array($user->id);
+}
 $moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200 marginleftonly');
 $moreforfilter .= '</div>';
 
-if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
-{
+if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block"></div>';
 	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project').'<input type="text" size="4" name="search_project_ref" class="marginleftonly" value="'.dol_escape_htmltag($search_project_ref).'">';
@@ -520,8 +519,7 @@ if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 	$moreforfilter .= '</div>';
 }
 
-if (!empty($moreforfilter))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	$parameters = array();
@@ -535,19 +533,28 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 
 // This must be after the $selectedfields
 $addcolspan = 0;
-if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
-if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
-foreach ($arrayfields as $key => $val)
-{
-	if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
+if (!empty($arrayfields['t.planned_workload']['checked'])) {
+	$addcolspan++;
+}
+if (!empty($arrayfields['t.progress']['checked'])) {
+	$addcolspan++;
+}
+foreach ($arrayfields as $key => $val) {
+	if ($val['checked'] && substr($key, 0, 5) == 'efpt.') {
+		$addcolspan++;
+	}
 }
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
+if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+	print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
+}
+if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+	print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
+}
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 // TASK fields
 $search_options_pattern = 'search_task_options_';
@@ -555,12 +562,10 @@ $extrafieldsobjectkey = 'projet_task';
 $extrafieldsobjectprefix = 'efpt.';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['t.planned_workload']['checked']))
-{
+if (!empty($arrayfields['t.planned_workload']['checked'])) {
 	print '<td class="liste_titre right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
 }
-if (!empty($arrayfields['t.progress']['checked']))
-{
+if (!empty($arrayfields['t.progress']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
 print '<td class="liste_titre"></td>';
@@ -575,19 +580,21 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<th>'.$langs->trans("Project").'</th>';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<th>'.$langs->trans("ThirdParty").'</th>';
+if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+	print '<th>'.$langs->trans("Project").'</th>';
+}
+if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+	print '<th>'.$langs->trans("ThirdParty").'</th>';
+}
 print '<th>'.$langs->trans("Task").'</th>';
 // TASK fields
 $extrafieldsobjectkey = 'projet_task';
 $extrafieldsobjectprefix = 'efpt.';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-if (!empty($arrayfields['t.planned_workload']['checked']))
-{
+if (!empty($arrayfields['t.planned_workload']['checked'])) {
 	print '<th class="right leftborder plannedworkload maxwidth100">'.$langs->trans("PlannedWorkload").'</th>';
 }
-if (!empty($arrayfields['t.progress']['checked']))
-{
+if (!empty($arrayfields['t.progress']['checked'])) {
 	print '<th class="right maxwidth100">'.$langs->trans("ProgressDeclared").'</th>';
 }
 /*print '<td class="right maxwidth100">'.$langs->trans("TimeSpent").'</td>';
@@ -602,11 +609,9 @@ $restrictviewformytask = ((!isset($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSI
 
 // Get if user is available or not for each day
 $isavailable = array();
-if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS))
-{
+if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)) {
 	$tmparray = explode('-', $conf->global->MAIN_DEFAULT_WORKING_DAYS);
-	if (count($tmparray) >= 2)
-	{
+	if (count($tmparray) >= 2) {
 		$numstartworkingday = $tmparray[0];
 		$numendworkingday = $tmparray[1];
 	}
@@ -617,24 +622,29 @@ $isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoproces
 $isavailable[$daytoparse] = $isavailablefordayanduser; // in projectLinesPerWeek later, we are using $firstdaytoshow and dol_time_plus_duree to loop on each day
 
 $test = num_public_holiday($daytoparse, $daytoparse + 86400, $mysoc->country_code);
-if ($test) $isavailable[$daytoparse] = array('morning'=>false, 'afternoon'=>false, 'morning_reason'=>'public_holiday', 'afternoon_reason'=>'public_holiday');
+if ($test) {
+	$isavailable[$daytoparse] = array('morning'=>false, 'afternoon'=>false, 'morning_reason'=>'public_holiday', 'afternoon_reason'=>'public_holiday');
+}
 
 $tmparray = dol_getdate($daytoparse, true); // detail of current day
 // For monday, must be 0 for monday if MAIN_START_WEEK = 1, must be 1 for monday if MAIN_START_WEEK = 0
 $idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK) ? 0 : 1));
 // numstartworkingday and numendworkingday are default start and end date of working days (1 means sunday if MAIN_START_WEEK is 0, 1 means monday if MAIN_START_WEEK is 1)
 $cssweekend = '';
-if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
-{
+if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) {	// This is a day is not inside the setup of working days, so we use a week-end css.
 	$cssweekend = 'weekend';
 }
 
 $tmpday = dol_time_plus_duree($daytoparse, $idw, 'd');
 
 $cssonholiday = '';
-if (!$isavailable[$daytoparse]['morning'] && !$isavailable[$daytoparse]['afternoon'])   $cssonholiday .= 'onholidayallday ';
-elseif (!$isavailable[$daytoparse]['morning'])   $cssonholiday .= 'onholidaymorning ';
-elseif (!$isavailable[$daytoparse]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
+if (!$isavailable[$daytoparse]['morning'] && !$isavailable[$daytoparse]['afternoon']) {
+	$cssonholiday .= 'onholidayallday ';
+} elseif (!$isavailable[$daytoparse]['morning']) {
+	$cssonholiday .= 'onholidaymorning ';
+} elseif (!$isavailable[$daytoparse]['afternoon']) {
+	$cssonholiday .= 'onholidayafternoon ';
+}
 
 print '<th class="center'.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">'.$langs->trans("Duration").'</th>';
 print '<th class="center">'.$langs->trans("Note").'</th>';
@@ -645,8 +655,7 @@ print "</tr>\n";
 
 $colspan = 4 + (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : 2);
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	print '<tr class="liste_total">';
 	print '<td class="liste_total" colspan="'.($colspan - 1 + $addcolspan).'">';
 	print $langs->trans("Total");
@@ -663,8 +672,7 @@ if ($conf->use_javascript_ajax)
 }
 
 
-if (count($tasksarray) > 0)
-{
+if (count($tasksarray) > 0) {
 	//var_dump($tasksarray);				// contains only selected tasks
 	//var_dump($tasksarraywithoutfilter);	// contains all tasks (if there is a filter, not defined if no filter)
 	//var_dump($tasksrole);
@@ -678,21 +686,17 @@ if (count($tasksarray) > 0)
 
 	// Calculate total for all tasks
 	$listofdistinctprojectid = array(); // List of all distinct projects
-	if (is_array($tasksarraywithoutfilter) && count($tasksarraywithoutfilter))
-	{
-		foreach ($tasksarraywithoutfilter as $tmptask)
-		{
+	if (is_array($tasksarraywithoutfilter) && count($tasksarraywithoutfilter)) {
+		foreach ($tasksarraywithoutfilter as $tmptask) {
 			$listofdistinctprojectid[$tmptask->fk_project] = $tmptask->fk_project;
 		}
 	}
 	//var_dump($listofdistinctprojectid);
 	$totalforeachday = array();
-	foreach ($listofdistinctprojectid as $tmpprojectid)
-	{
+	foreach ($listofdistinctprojectid as $tmpprojectid) {
 		$projectstatic->id = $tmpprojectid;
 		$projectstatic->loadTimeSpent($daytoparse, 0, $usertoprocess->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-		for ($idw = 0; $idw < 7; $idw++)
-		{
+		for ($idw = 0; $idw < 7; $idw++) {
 			$tmpday = dol_time_plus_duree($daytoparse, $idw, 'd');
 			$totalforeachday[$tmpday] += $projectstatic->weekWorkLoad[$tmpday];
 		}
@@ -701,18 +705,15 @@ if (count($tasksarray) > 0)
 
 	// Is there a diff between selected/filtered tasks and all tasks ?
 	$isdiff = 0;
-	if (count($totalforeachday))
-	{
+	if (count($totalforeachday)) {
 		$timeonothertasks = ($totalforeachday[$daytoparse] - $totalforvisibletasks[$daytoparse]);
-		if ($timeonothertasks)
-		{
+		if ($timeonothertasks) {
 			$isdiff = 1;
 		}
 	}
 
 	// There is a diff between total shown on screen and total spent by user, so we add a line with all other cumulated time of user
-	if ($isdiff)
-	{
+	if ($isdiff) {
 		print '<tr class="oddeven othertaskwithtime">';
 		print '<td colspan="'.($colspan - 1).'" class="opacitymedium">';
 		print $langs->trans("OtherFilteredTasks");
@@ -723,7 +724,9 @@ if (count($tasksarray) > 0)
 		//if ($timeonothertasks)
 		//{
 			print '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center" size="2" disabled="" id="timespent[-1][0]" name="task[-1][0]" value="';
-			if ($timeonothertasks) print convertSecondToTime($timeonothertasks, 'allhourmin');
+		if ($timeonothertasks) {
+			print convertSecondToTime($timeonothertasks, 'allhourmin');
+		}
 			print '"></span>';
 		//}
 		print '</td>';
@@ -732,8 +735,7 @@ if (count($tasksarray) > 0)
 		print '</tr>';
 	}
 
-	if ($conf->use_javascript_ajax)
-	{
+	if ($conf->use_javascript_ajax) {
 		print '<tr class="liste_total">';
 		print '<td class="liste_total" colspan="'.($colspan - 1 + $addcolspan).'">';
 		print $langs->trans("Total");
@@ -764,8 +766,7 @@ print '</form>';
 
 $modeinput = 'hours';
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	print "\n<!-- JS CODE TO ENABLE Tooltips on all object with class classfortooltip -->\n";
 	print '<script type="text/javascript">'."\n";
 	print "jQuery(document).ready(function () {\n";
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 626634b13cd..3902cd83ed0 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -44,7 +44,9 @@ $id = GETPOST('id', 'int');
 $taskid = GETPOST('taskid', 'int');
 
 $mine = 0;
-if ($mode == 'mine') $mine = 1;
+if ($mode == 'mine') {
+	$mine = 1;
+}
 
 $projectid = isset($_GET["id"]) ? GETPOST("id", "int", 1) : GETPOST("projectid", "int");
 
@@ -91,12 +93,10 @@ $TFirstDays = getFirstDayOfEachWeek($TWeek, $year);
 $TFirstDays[reset($TWeek)] = '01'; //first day of month
 $TLastDays = getLastDayOfEachWeek($TWeek, $year);
 $TLastDays[end($TWeek)] = date("t", strtotime($year.'-'.$month.'-'.$day)); //last day of month
-if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
-{
+if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id) {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
-} elseif ($search_usertoprocessid > 0)
-{
+} elseif ($search_usertoprocessid > 0) {
 	$usertoprocess = new User($db);
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
@@ -112,11 +112,12 @@ $object = new Task($db);
  */
 $parameters = array('id' => $id, 'taskid' => $taskid, 'projectid' => $projectid, 'TWeek' => $TWeek, 'TFirstDays' => $TFirstDays, 'TLastDays' => $TLastDays);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 // Purge criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 	$action = '';
 	$search_categ = '';
 	$search_usertoprocessid = $user->id;
@@ -126,58 +127,50 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_thirdparty = '';
 	$search_declared_progress = '';
 }
-if (GETPOST("button_search_x", 'alpha') || GETPOST("button_search.x", 'alpha') || GETPOST("button_search", 'alpha'))
-{
+if (GETPOST("button_search_x", 'alpha') || GETPOST("button_search.x", 'alpha') || GETPOST("button_search", 'alpha')) {
 	$action = '';
 }
 
-if (GETPOST('submitdateselect'))
-{
+if (GETPOST('submitdateselect')) {
 	$daytoparse = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 
 	$action = '';
 }
-if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask'))
-{
+if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')) {
 	$action = 'assigntask';
 
-	if ($taskid > 0)
-	{
+	if ($taskid > 0) {
 		$result = $object->fetch($taskid, $ref);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 	} else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
-	if (!GETPOST('type'))
-	{
+	if (!GETPOST('type')) {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), '', 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$idfortaskuser = $usertoprocess->id;
 		$result = $object->add_contact($idfortaskuser, GETPOST("type"), 'internal');
 
-		if ($result >= 0 || $result == -2)	// Contact add ok or already contact of task
-		{
+		if ($result >= 0 || $result == -2) {	// Contact add ok or already contact of task
 			// Test if we are already contact of the project (should be rare but sometimes we can add as task contact without being contact of project, like when admin user has been removed from contact of project)
 			$sql = 'SELECT ec.rowid FROM '.MAIN_DB_PREFIX.'element_contact as ec, '.MAIN_DB_PREFIX.'c_type_contact as tc WHERE tc.rowid = ec.fk_c_type_contact';
 			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = '.$object->fk_project.' AND tc.element = 'project' AND source = 'internal'";
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if (!$obj)	// User is not already linked to project, so we will create link to first type
-				{
+				if (!$obj) {	// User is not already linked to project, so we will create link to first type
 					$project = new Project($db);
 					$project->fetch($object->fk_project);
 					// Get type
 					$listofprojcontact = $project->liste_type_contact('internal');
 
-					if (count($listofprojcontact))
-					{
+					if (count($listofprojcontact)) {
 						$typeforprojectcontact = reset(array_keys($listofprojcontact));
 						$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
 					}
@@ -188,11 +181,9 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		}
 	}
 
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		$error++;
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
 		} else {
@@ -200,8 +191,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages("TaskAssignedToEnterTime", null);
 		$taskid = 0;
 	}
@@ -209,29 +199,29 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	$action = '';
 }
 
-if ($action == 'addtime' && $user->rights->projet->lire)
-{
+if ($action == 'addtime' && $user->rights->projet->lire) {
 	$timetoadd = $_POST['task'];
-	if (empty($timetoadd))
-	{
+	if (empty($timetoadd)) {
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	} else {
-		foreach ($timetoadd as $taskid => $value)     // Loop on each task
-		{
+		foreach ($timetoadd as $taskid => $value) {     // Loop on each task
 			$updateoftaskdone = 0;
-			foreach ($value as $key => $val)          // Loop on each day
-			{
+			foreach ($value as $key => $val) {          // Loop on each day
 				$amountoadd = $timetoadd[$taskid][$key];
-				if (!empty($amountoadd))
-				{
+				if (!empty($amountoadd)) {
 					$tmpduration = explode(':', $amountoadd);
 					$newduration = 0;
-					if (!empty($tmpduration[0])) $newduration += ($tmpduration[0] * 3600);
-					if (!empty($tmpduration[1])) $newduration += ($tmpduration[1] * 60);
-					if (!empty($tmpduration[2])) $newduration += ($tmpduration[2]);
+					if (!empty($tmpduration[0])) {
+						$newduration += ($tmpduration[0] * 3600);
+					}
+					if (!empty($tmpduration[1])) {
+						$newduration += ($tmpduration[1] * 60);
+					}
+					if (!empty($tmpduration[2])) {
+						$newduration += ($tmpduration[2]);
+					}
 
-					if ($newduration > 0)
-					{
+					if ($newduration > 0) {
 						$object->fetch($taskid);
 						$object->progress = GETPOST($taskid.'progress', 'int');
 						$object->timespent_duration = $newduration;
@@ -240,8 +230,7 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 						$object->timespent_datehour = $object->timespent_date;
 
 						$result = $object->addTimeSpent($user);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							setEventMessages($object->error, $object->errors, 'errors');
 							$error++;
 							break;
@@ -252,16 +241,13 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 				}
 			}
 
-			if (!$updateoftaskdone)  // Check to update progress if no update were done on task.
-			{
+			if (!$updateoftaskdone) {  // Check to update progress if no update were done on task.
 				$object->fetch($taskid);
 				//var_dump($object->progress);var_dump(GETPOST($taskid . 'progress', 'int')); exit;
-				if ($object->progress != GETPOST($taskid.'progress', 'int'))
-				{
+				if ($object->progress != GETPOST($taskid.'progress', 'int')) {
 					$object->progress = GETPOST($taskid.'progress', 'int');
 					$result = $object->update($user);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 						break;
@@ -270,8 +256,7 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 
 			$param = '';
@@ -313,8 +298,7 @@ $title = $langs->trans("TimeSpent");
 
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertoprocess, (empty($usertoprocess->id) ? 2 : 0), 1); // Return all project i have permission on (assigned to me+public). I want my tasks and some of my task may be on a public projet that is not my project
 //var_dump($projectsListId);
-if ($id)
-{
+if ($id) {
 	$project->fetch($id);
 	$project->fetch_thirdparty();
 }
@@ -322,15 +306,24 @@ if ($id)
 $onlyopenedproject = 1; // or -1
 $morewherefilter = '';
 
-if ($search_project_ref) $morewherefilter .= natural_search(array("p.ref", "p.title"), $search_project_ref);
-if ($search_task_ref)    $morewherefilter .= natural_search("t.ref", $search_task_ref);
-if ($search_task_label)  $morewherefilter .= natural_search(array("t.ref", "t.label"), $search_task_label);
-if ($search_thirdparty)  $morewherefilter .= natural_search("s.nom", $search_thirdparty);
-if ($search_declared_progress)  $morewherefilter .= natural_search("t.progress", $search_declared_progress, 1);
+if ($search_project_ref) {
+	$morewherefilter .= natural_search(array("p.ref", "p.title"), $search_project_ref);
+}
+if ($search_task_ref) {
+	$morewherefilter .= natural_search("t.ref", $search_task_ref);
+}
+if ($search_task_label) {
+	$morewherefilter .= natural_search(array("t.ref", "t.label"), $search_task_label);
+}
+if ($search_thirdparty) {
+	$morewherefilter .= natural_search("s.nom", $search_thirdparty);
+}
+if ($search_declared_progress) {
+	$morewherefilter .= natural_search("t.progress", $search_declared_progress, 1);
+}
 
 $tasksarray = $taskstatic->getTasksArray(0, 0, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
-if ($morewherefilter)	// Get all task without any filter, so we can show total of time spent for not visible tasks
-{
+if ($morewherefilter) {	// Get all task without any filter, so we can show total of time spent for not visible tasks
 	$tasksarraywithoutfilter = $taskstatic->getTasksArray(0, 0, ($project->id ? $project->id : 0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
 }
 $projectsrole = $taskstatic->getUserRolesForProjectsOrTasks($usertoprocess, 0, ($project->id ? $project->id : 0), 0, $onlyopenedproject);
@@ -376,16 +369,18 @@ print dol_get_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1,
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
-if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-else {
-	if (empty($usertoprocess->id) || $usertoprocess->id < 0)
-	{
-		if ($user->rights->projet->all->lire && !$socid) print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-		else print $langs->trans("ProjectsPublicTaskDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
+if ($mine || ($usertoprocess->id == $user->id)) {
+	print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
+} else {
+	if (empty($usertoprocess->id) || $usertoprocess->id < 0) {
+		if ($user->rights->projet->all->lire && !$socid) {
+			print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
+		} else {
+			print $langs->trans("ProjectsPublicTaskDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
+		}
 	}
 }
-if ($mine || ($usertoprocess->id == $user->id))
-{
+if ($mine || ($usertoprocess->id == $user->id)) {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
 } else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
@@ -398,7 +393,9 @@ print '<div class="floatright right'.($conf->dol_optimize_smallscreen ? ' centpe
 
 print '<div class="colorbacktimesheet float valignmiddle">';
 $titleassigntask = $langs->transnoentities("AssignTaskToMe");
-if ($usertoprocess->id != $user->id) $titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
+if ($usertoprocess->id != $user->id) {
+	$titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
+}
 print '<div class="taskiddiv inline-block">';
 print img_picto('', 'projecttask');
 $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1);
@@ -428,12 +425,13 @@ if (! empty($conf->categorie->enabled))
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= '<div class="inline-block hideonsmartphone"></div>';
 $includeonly = 'hierachyme';
-if (empty($user->rights->user->user->lire)) $includeonly = array($user->id);
+if (empty($user->rights->user->user->lire)) {
+	$includeonly = array($user->id);
+}
 $moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
-if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
-{
+if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block"></div>';
 	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project').'<input type="text" size="4" name="search_project_ref" class="marginleftonly" value="'.dol_escape_htmltag($search_project_ref).'">';
@@ -445,8 +443,7 @@ if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 	$moreforfilter .= '</div>';
 }
 
-if (!empty($moreforfilter))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	$parameters = array();
@@ -460,15 +457,18 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
+if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+	print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
+}
+if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+	print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
+}
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
-foreach ($TWeek as $week_number)
-{
+foreach ($TWeek as $week_number) {
 	print '<td class="liste_titre"></td>';
 }
 // Action column
@@ -479,8 +479,12 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td>'.$langs->trans("Project").'</td>';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td>'.$langs->trans("ThirdParty").'</td>';
+if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+	print '<td>'.$langs->trans("Project").'</td>';
+}
+if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+	print '<td>'.$langs->trans("ThirdParty").'</td>';
+}
 print '<td>'.$langs->trans("Task").'</td>';
 print '<td align="right" class="leftborder plannedworkload maxwidth75">'.$langs->trans("PlannedWorkload").'</td>';
 print '<td align="right" class="maxwidth75">'.$langs->trans("ProgressDeclared").'</td>';
@@ -490,8 +494,7 @@ print '<td align="right" class="maxwidth75">'.$langs->trans("ProgressDeclared").
 print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'<br><span class="opacitymedium">'.$langs->trans("Everybody").'</span></td>';
 print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br>'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</td>';
 
-foreach ($TWeek as $week_number)
-{
+foreach ($TWeek as $week_number) {
 	print '<td width="6%" align="center" class="bold hide">'.$langs->trans("Week").' '.$week_number.'<br>('.$TFirstDays[$week_number].'...'.$TLastDays[$week_number].')</td>';
 }
 print '<td></td>';
@@ -507,8 +510,7 @@ $isavailable = array();
 // TODO See code into perweek.php to initialize isavailable array
 
 
-if (count($tasksarray) > 0)
-{
+if (count($tasksarray) > 0) {
 	//var_dump($tasksarray);				// contains only selected tasks
 	//var_dump($tasksarraywithoutfilter);	// contains all tasks (if there is a filter, not defined if no filter)
 	//var_dump($tasksrole);
@@ -522,21 +524,17 @@ if (count($tasksarray) > 0)
 
 	// Calculate total for all tasks
 	$listofdistinctprojectid = array(); // List of all distinct projects
-	if (is_array($tasksarraywithoutfilter) && count($tasksarraywithoutfilter))
-	{
-		foreach ($tasksarraywithoutfilter as $tmptask)
-		{
+	if (is_array($tasksarraywithoutfilter) && count($tasksarraywithoutfilter)) {
+		foreach ($tasksarraywithoutfilter as $tmptask) {
 			$listofdistinctprojectid[$tmptask->fk_project] = $tmptask->fk_project;
 		}
 	}
 	//var_dump($listofdistinctprojectid);
 	$totalforeachweek = array();
-	foreach ($listofdistinctprojectid as $tmpprojectid)
-	{
+	foreach ($listofdistinctprojectid as $tmpprojectid) {
 		$projectstatic->id = $tmpprojectid;
 		$projectstatic->loadTimeSpentMonth($firstdaytoshow, 0, $usertoprocess->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-		foreach ($TWeek as $weekNb)
-		{
+		foreach ($TWeek as $weekNb) {
 			$totalforeachweek[$weekNb] += $projectstatic->monthWorkLoad[$weekNb];
 		}
 	}
@@ -546,13 +544,10 @@ if (count($tasksarray) > 0)
 
 	// Is there a diff between selected/filtered tasks and all tasks ?
 	$isdiff = 0;
-	if (count($totalforeachweek))
-	{
-		foreach ($TWeek as $weekNb)
-		{
+	if (count($totalforeachweek)) {
+		foreach ($TWeek as $weekNb) {
 			$timeonothertasks = ($totalforeachweek[$weekNb] - $totalforvisibletasks[$weekNb]);
-			if ($timeonothertasks)
-			{
+			if ($timeonothertasks) {
 				$isdiff = 1;
 				break;
 			}
@@ -560,19 +555,16 @@ if (count($tasksarray) > 0)
 	}
 
 	// There is a diff between total shown on screen and total spent by user, so we add a line with all other cumulated time of user
-	if ($isdiff)
-	{
+	if ($isdiff) {
 		print '<tr class="oddeven othertaskwithtime">';
 		print '<td colspan="'.$colspan.'" class="opacitymedium">';
 		print $langs->trans("OtherFilteredTasks");
 		print '</td>';
-		foreach ($TWeek as $weekNb)
-		{
+		foreach ($TWeek as $weekNb) {
 			print '<td class="center hide">';
 
 			$timeonothertasks = ($totalforeachweek[$weekNb] - $totalforvisibletasks[$weekNb]);
-			if ($timeonothertasks)
-			{
+			if ($timeonothertasks) {
 				print '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled="" id="timespent[-1]['.$weekNb.']" name="task[-1]['.$weekNb.']" value="';
 				print convertSecondToTime($timeonothertasks, 'allhourmin');
 				print '"></span>';
@@ -583,16 +575,14 @@ if (count($tasksarray) > 0)
 		print '</tr>';
 	}
 
-	if ($conf->use_javascript_ajax)
-	{
+	if ($conf->use_javascript_ajax) {
 		print '<tr class="liste_total">
                 <td class="liste_total" colspan="'.$colspan.'">';
 		print $langs->trans("Total");
 		print '<span class="opacitymediumbycolor">  - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong></span>';
 		print '</td>';
 
-		foreach ($TWeek as $weekNb)
-		{
+		foreach ($TWeek as $weekNb) {
 			print '<td class="liste_total hide'.$weekNb.'" align="center"><div class="totalDay'.$weekNb.'">'.convertSecondToTime($totalforvisibletasks[$weekNb], 'allhourmin').'</div></td>';
 		}
 		print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>
@@ -615,8 +605,7 @@ print '</form>'."\n\n";
 
 $modeinput = 'hours';
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	print "\n<!-- JS CODE TO ENABLE Tooltips on all object with class classfortooltip -->\n";
 	print '<script type="text/javascript">'."\n";
 	print "jQuery(document).ready(function () {\n";
@@ -629,8 +618,7 @@ if ($conf->use_javascript_ajax)
 					}
 				});'."\n";
 
-	foreach ($TWeek as $week_number)
-	{
+	foreach ($TWeek as $week_number) {
 		print '    updateTotal('.$week_number.',\''.$modeinput.'\');';
 	}
 	print "\n});\n";
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index f001a73d0f4..69866e1da2f 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -46,7 +46,9 @@ $taskid = GETPOST('taskid', 'int');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'perweekcard';
 
 $mine = 0;
-if ($mode == 'mine') $mine = 1;
+if ($mode == 'mine') {
+	$mine = 1;
+}
 
 $projectid = isset($_GET["id"]) ? GETPOST("id", "int", 1) : GETPOST("projectid", "int");
 
@@ -99,12 +101,10 @@ $next_day   = $next['day'];
 $firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year);
 $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
 
-if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
-{
+if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id) {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
-} elseif ($search_usertoprocessid > 0)
-{
+} elseif ($search_usertoprocessid > 0) {
 	$usertoprocess = new User($db);
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
@@ -122,28 +122,27 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $arrayfields = array();
 /*$arrayfields=array(
-    // Project
-    'p.opp_amount'=>array('label'=>$langs->trans("OpportunityAmountShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>103),
-    'p.fk_opp_status'=>array('label'=>$langs->trans("OpportunityStatusShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>104),
-    'p.opp_percent'=>array('label'=>$langs->trans("OpportunityProbabilityShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>105),
-    'p.budget_amount'=>array('label'=>$langs->trans("Budget"), 'checked'=>0, 'position'=>110),
-    'p.usage_bill_time'=>array('label'=>$langs->trans("BillTimeShort"), 'checked'=>0, 'position'=>115),
+	// Project
+	'p.opp_amount'=>array('label'=>$langs->trans("OpportunityAmountShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>103),
+	'p.fk_opp_status'=>array('label'=>$langs->trans("OpportunityStatusShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>104),
+	'p.opp_percent'=>array('label'=>$langs->trans("OpportunityProbabilityShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES?1:0), 'position'=>105),
+	'p.budget_amount'=>array('label'=>$langs->trans("Budget"), 'checked'=>0, 'position'=>110),
+	'p.usage_bill_time'=>array('label'=>$langs->trans("BillTimeShort"), 'checked'=>0, 'position'=>115),
 );*/
 $arrayfields['t.planned_workload'] = array('label'=>'PlannedWorkload', 'checked'=>1, 'enabled'=>1, 'position'=>0);
 $arrayfields['t.progress'] = array('label'=>'ProgressDeclared', 'checked'=>1, 'enabled'=>1, 'position'=>0);
 /*foreach($object->fields as $key => $val)
 {
-    // If $val['visible']==0, then we never show the field
-    if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+	// If $val['visible']==0, then we never show the field
+	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }*/
 // Definition of fields for list
 // Extra fields
-if (is_array($extrafields->attributes['projet_task']['label']) && count($extrafields->attributes['projet_task']['label']) > 0)
-{
-	foreach ($extrafields->attributes['projet_task']['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes['projet_task']['list'][$key]))
+if (is_array($extrafields->attributes['projet_task']['label']) && count($extrafields->attributes['projet_task']['label']) > 0) {
+	foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
+		if (!empty($extrafields->attributes['projet_task']['list'][$key])) {
 			$arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes['projet_task']['label'][$key], 'checked'=>(($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes['projet_task']['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
+		}
 	}
 }
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -160,10 +159,11 @@ $search_array_options_task = $extrafields->getOptionalsFromPost('projet_task', '
 
 $parameters = array('id' => $id, 'taskid' => $taskid, 'projectid' => $projectid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 // Purge criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 	$action = '';
 	$search_categ = '';
 	$search_usertoprocessid = $user->id;
@@ -179,13 +179,11 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	// We redefine $usertoprocess
 	$usertoprocess = $user;
 }
-if (GETPOST("button_search_x", 'alpha') || GETPOST("button_search.x", 'alpha') || GETPOST("button_search", 'alpha'))
-{
+if (GETPOST("button_search_x", 'alpha') || GETPOST("button_search.x", 'alpha') || GETPOST("button_search", 'alpha')) {
 	$action = '';
 }
 
-if (GETPOST('submitdateselect'))
-{
+if (GETPOST('submitdateselect')) {
 	$daytoparse = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 
 	$action = '';
@@ -193,47 +191,41 @@ if (GETPOST('submitdateselect'))
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask') && GETPOST('formfilteraction') != 'listafterchangingselectedfields')
-{
+if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask') && GETPOST('formfilteraction') != 'listafterchangingselectedfields') {
 	$action = 'assigntask';
 
-	if ($taskid > 0)
-	{
+	if ($taskid > 0) {
 		$result = $object->fetch($taskid, $ref);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 	} else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
-	if (!GETPOST('type'))
-	{
+	if (!GETPOST('type')) {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), '', 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$idfortaskuser = $usertoprocess->id;
 		$result = $object->add_contact($idfortaskuser, GETPOST("type"), 'internal');
 
-		if ($result >= 0 || $result == -2)	// Contact add ok or already contact of task
-		{
+		if ($result >= 0 || $result == -2) {	// Contact add ok or already contact of task
 			// Test if we are already contact of the project (should be rare but sometimes we can add as task contact without being contact of project, like when admin user has been removed from contact of project)
 			$sql = 'SELECT ec.rowid FROM '.MAIN_DB_PREFIX.'element_contact as ec, '.MAIN_DB_PREFIX.'c_type_contact as tc WHERE tc.rowid = ec.fk_c_type_contact';
 			$sql .= ' AND ec.fk_socpeople = '.$idfortaskuser." AND ec.element_id = '.$object->fk_project.' AND tc.element = 'project' AND source = 'internal'";
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if (!$obj)	// User is not already linked to project, so we will create link to first type
-				{
+				if (!$obj) {	// User is not already linked to project, so we will create link to first type
 					$project = new Project($db);
 					$project->fetch($object->fk_project);
 					// Get type
 					$listofprojcontact = $project->liste_type_contact('internal');
 
-					if (count($listofprojcontact))
-					{
+					if (count($listofprojcontact)) {
 						$typeforprojectcontact = reset(array_keys($listofprojcontact));
 						$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
 					}
@@ -244,11 +236,9 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		}
 	}
 
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		$error++;
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
 		} else {
@@ -256,8 +246,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages("TaskAssignedToEnterTime", null);
 		$taskid = 0;
 	}
@@ -265,33 +254,36 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	$action = '';
 }
 
-if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilteraction') != 'listafterchangingselectedfields')
-{
+if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilteraction') != 'listafterchangingselectedfields') {
 	$timetoadd = $_POST['task'];
-	if (empty($timetoadd))
-	{
+	if (empty($timetoadd)) {
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	} else {
-		foreach ($timetoadd as $taskid => $value)     // Loop on each task
-		{
+		foreach ($timetoadd as $taskid => $value) {     // Loop on each task
 			$updateoftaskdone = 0;
-			foreach ($value as $key => $val)          // Loop on each day
-			{
+			foreach ($value as $key => $val) {          // Loop on each day
 				$amountoadd = $timetoadd[$taskid][$key];
-				if (!empty($amountoadd))
-				{
+				if (!empty($amountoadd)) {
 					$tmpduration = explode(':', $amountoadd);
 					$newduration = 0;
-					if (!empty($tmpduration[0])) $newduration += ($tmpduration[0] * 3600);
-					if (!empty($tmpduration[1])) $newduration += ($tmpduration[1] * 60);
-					if (!empty($tmpduration[2])) $newduration += ($tmpduration[2]);
+					if (!empty($tmpduration[0])) {
+						$newduration += ($tmpduration[0] * 3600);
+					}
+					if (!empty($tmpduration[1])) {
+						$newduration += ($tmpduration[1] * 60);
+					}
+					if (!empty($tmpduration[2])) {
+						$newduration += ($tmpduration[2]);
+					}
 
-					if ($newduration > 0)
-					{
-			   			$object->fetch($taskid);
+					if ($newduration > 0) {
+						$object->fetch($taskid);
 
-			   			if (GETPOSTISSET($taskid.'progress')) $object->progress = GETPOST($taskid.'progress', 'int');
-			   			else unset($object->progress);
+						if (GETPOSTISSET($taskid.'progress')) {
+							$object->progress = GETPOST($taskid.'progress', 'int');
+						} else {
+							unset($object->progress);
+						}
 
 						$object->timespent_duration = $newduration;
 						$object->timespent_fk_user = $usertoprocess->id;
@@ -300,8 +292,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 						$object->timespent_note = $object->description;
 
 						$result = $object->addTimeSpent($user);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							setEventMessages($object->error, $object->errors, 'errors');
 							$error++;
 							break;
@@ -312,16 +303,13 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 				}
 			}
 
-			if (!$updateoftaskdone)  // Check to update progress if no update were done on task.
-			{
+			if (!$updateoftaskdone) {  // Check to update progress if no update were done on task.
 				$object->fetch($taskid);
 				//var_dump($object->progress);var_dump(GETPOST($taskid . 'progress', 'int')); exit;
-				if ($object->progress != GETPOST($taskid.'progress', 'int'))
-				{
+				if ($object->progress != GETPOST($taskid.'progress', 'int')) {
 					$object->progress = GETPOST($taskid.'progress', 'int');
 					$result = $object->update($user);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 						break;
@@ -330,8 +318,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			}
 		}
 
-	   	if (!$error)
-	   	{
+		if (!$error) {
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 
 			$param = '';
@@ -347,18 +334,18 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			$param .= ($search_task_label ? '&search_task_label='.urlencode($search_task_label) : '');
 
 			/*$search_array_options=$search_array_options_project;
-            $search_options_pattern='search_options_';
-            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
-            */
+			$search_options_pattern='search_options_';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+			*/
 
 			$search_array_options = $search_array_options_task;
 			$search_options_pattern = 'search_task_options_';
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-	   		// Redirect to avoid submit twice on back
-		   	header('Location: '.$_SERVER["PHP_SELF"].'?'.$param);
-		   	exit;
-	   	}
+			// Redirect to avoid submit twice on back
+			header('Location: '.$_SERVER["PHP_SELF"].'?'.$param);
+			exit;
+		}
 	}
 }
 
@@ -381,8 +368,7 @@ $title = $langs->trans("TimeSpent");
 
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertoprocess, (empty($usertoprocess->id) ? 2 : 0), 1); // Return all project i have permission on (assigned to me+public). I want my tasks and some of my task may be on a public projet that is not my project
 //var_dump($projectsListId);
-if ($id)
-{
+if ($id) {
 	$project->fetch($id);
 	$project->fetch_thirdparty();
 }
@@ -390,11 +376,21 @@ if ($id)
 $onlyopenedproject = 1; // or -1
 $morewherefilter = '';
 
-if ($search_project_ref) $morewherefilter .= natural_search(array("p.ref", "p.title"), $search_project_ref);
-if ($search_task_ref)    $morewherefilter .= natural_search("t.ref", $search_task_ref);
-if ($search_task_label)  $morewherefilter .= natural_search(array("t.ref", "t.label"), $search_task_label);
-if ($search_thirdparty)  $morewherefilter .= natural_search("s.nom", $search_thirdparty);
-if ($search_declared_progress)  $morewherefilter .= natural_search("t.progress", $search_declared_progress, 1);
+if ($search_project_ref) {
+	$morewherefilter .= natural_search(array("p.ref", "p.title"), $search_project_ref);
+}
+if ($search_task_ref) {
+	$morewherefilter .= natural_search("t.ref", $search_task_ref);
+}
+if ($search_task_label) {
+	$morewherefilter .= natural_search(array("t.ref", "t.label"), $search_task_label);
+}
+if ($search_thirdparty) {
+	$morewherefilter .= natural_search("s.nom", $search_thirdparty);
+}
+if ($search_declared_progress) {
+	$morewherefilter .= natural_search("t.progress", $search_declared_progress, 1);
+}
 
 $sql = &$morewherefilter;
 
@@ -411,8 +407,7 @@ $extrafieldsobjectkey = 'projet_task';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
 $tasksarray = $taskstatic->getTasksArray(0, 0, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
-if ($morewherefilter)	// Get all task without any filter, so we can show total of time spent for not visible tasks
-{
+if ($morewherefilter) {	// Get all task without any filter, so we can show total of time spent for not visible tasks
 	$tasksarraywithoutfilter = $taskstatic->getTasksArray(0, 0, ($project->id ? $project->id : 0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
 }
 $projectsrole = $taskstatic->getUserRolesForProjectsOrTasks($usertoprocess, 0, ($project->id ? $project->id : 0), 0, $onlyopenedproject);
@@ -468,16 +463,18 @@ print dol_get_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1,
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
-if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-else {
-	if (empty($usertoprocess->id) || $usertoprocess->id < 0)
-	{
-		if ($user->rights->projet->all->lire && !$socid) print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-		else print $langs->trans("ProjectsPublicTaskDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
+if ($mine || ($usertoprocess->id == $user->id)) {
+	print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
+} else {
+	if (empty($usertoprocess->id) || $usertoprocess->id < 0) {
+		if ($user->rights->projet->all->lire && !$socid) {
+			print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
+		} else {
+			print $langs->trans("ProjectsPublicTaskDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
+		}
 	}
 }
-if ($mine || ($usertoprocess->id == $user->id))
-{
+if ($mine || ($usertoprocess->id == $user->id)) {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
 } else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
@@ -490,7 +487,9 @@ print '<div class="floatright right'.($conf->dol_optimize_smallscreen ? ' centpe
 
 print '<div class="colorbacktimesheet float valignmiddle">';
 $titleassigntask = $langs->transnoentities("AssignTaskToMe");
-if ($usertoprocess->id != $user->id) $titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
+if ($usertoprocess->id != $user->id) {
+	$titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
+}
 print '<div class="taskiddiv inline-block">';
 print img_picto('', 'projecttask');
 $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
@@ -507,18 +506,15 @@ $startday = dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['
 
 // Get if user is available or not for each day
 $isavailable = array();
-if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS))
-{
+if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)) {
 	$tmparray = explode('-', $conf->global->MAIN_DEFAULT_WORKING_DAYS);
-	if (count($tmparray) >= 2)
-	{
+	if (count($tmparray) >= 2) {
 		$numstartworkingday = $tmparray[0];
 		$numendworkingday = $tmparray[1];
 	}
 }
 
-for ($idw = 0; $idw < 7; $idw++)
-{
+for ($idw = 0; $idw < 7; $idw++) {
 	$dayinloopfromfirstdaytoshow = dol_time_plus_duree($firstdaytoshow, $idw, 'd'); // $firstdaytoshow is a date with hours = 0
 	$dayinloop = dol_time_plus_duree($startday, $idw, 'd');
 
@@ -535,7 +531,9 @@ for ($idw = 0; $idw < 7; $idw++)
 	$isavailable[$dayinloopfromfirstdaytoshow] = $isavailablefordayanduser; // in projectLinesPerWeek later, we are using $firstdaytoshow and dol_time_plus_duree to loop on each day
 
 	$test = num_public_holiday($dayinloopfromfirstdaytoshow, $dayinloopfromfirstdaytoshow + 86400, $mysoc->country_code);
-	if ($test) $isavailable[$dayinloopfromfirstdaytoshow] = array('morning'=>false, 'afternoon'=>false, 'morning_reason'=>'public_holiday', 'afternoon_reason'=>'public_holiday');
+	if ($test) {
+		$isavailable[$dayinloopfromfirstdaytoshow] = array('morning'=>false, 'afternoon'=>false, 'morning_reason'=>'public_holiday', 'afternoon_reason'=>'public_holiday');
+	}
 }
 //var_dump($isavailable);
 
@@ -558,12 +556,13 @@ if (! empty($conf->categorie->enabled))
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= '<div class="inline-block hideonsmartphone"></div>';
 $includeonly = 'hierarchyme';
-if (empty($user->rights->user->user->lire)) $includeonly = array($user->id);
+if (empty($user->rights->user->user->lire)) {
+	$includeonly = array($user->id);
+}
 $moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
-if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
-{
+if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block"></div>';
 	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project').'<input type="text" size="4" name="search_project_ref" class="marginleftonly" value="'.dol_escape_htmltag($search_project_ref).'">';
@@ -575,8 +574,7 @@ if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 	$moreforfilter .= '</div>';
 }
 
-if (!empty($moreforfilter))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	$parameters = array();
@@ -592,19 +590,28 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 
 // This must be after the $selectedfields
 $addcolspan = 0;
-if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
-if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
-foreach ($arrayfields as $key => $val)
-{
-	if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
+if (!empty($arrayfields['t.planned_workload']['checked'])) {
+	$addcolspan++;
+}
+if (!empty($arrayfields['t.progress']['checked'])) {
+	$addcolspan++;
+}
+foreach ($arrayfields as $key => $val) {
+	if ($val['checked'] && substr($key, 0, 5) == 'efpt.') {
+		$addcolspan++;
+	}
 }
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
+if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+	print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
+}
+if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+	print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
+}
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 // TASK fields
 $search_options_pattern = 'search_task_options_';
@@ -612,17 +619,14 @@ $extrafieldsobjectkey = 'projet_task';
 $extrafieldsobjectprefix = 'efpt.';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['t.planned_workload']['checked']))
-{
+if (!empty($arrayfields['t.planned_workload']['checked'])) {
 	print '<td class="liste_titre right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
 }
-if (!empty($arrayfields['t.progress']['checked']))
-{
+if (!empty($arrayfields['t.progress']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
 print '<td class="liste_titre"></td>';
-for ($idw = 0; $idw < 7; $idw++)
-{
+for ($idw = 0; $idw < 7; $idw++) {
 	print '<td class="liste_titre"></td>';
 }
 // Action column
@@ -633,19 +637,21 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<th>'.$langs->trans("Project").'</th>';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) print '<th>'.$langs->trans("ThirdParty").'</th>';
+if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+	print '<th>'.$langs->trans("Project").'</th>';
+}
+if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+	print '<th>'.$langs->trans("ThirdParty").'</th>';
+}
 print '<th>'.$langs->trans("Task").'</th>';
 // TASK fields
 $extrafieldsobjectkey = 'projet_task';
 $extrafieldsobjectprefix = 'efpt.';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-if (!empty($arrayfields['t.planned_workload']['checked']))
-{
+if (!empty($arrayfields['t.planned_workload']['checked'])) {
 	print '<th class="leftborder plannedworkload maxwidth75 right">'.$langs->trans("PlannedWorkload").'</th>';
 }
-if (!empty($arrayfields['t.progress']['checked']))
-{
+if (!empty($arrayfields['t.progress']['checked'])) {
 	print '<th class="maxwidth75 right">'.$langs->trans("ProgressDeclared").'</th>';
 }
 /*print '<td class="maxwidth75 right">'.$langs->trans("TimeSpent").'</td>';
@@ -654,23 +660,25 @@ if (!empty($arrayfields['t.progress']['checked']))
 print '<th class="maxwidth75 right">'.$langs->trans("TimeSpent").'<br><span class="opacitymedium">'.$langs->trans("Everybody").'</span></th>';
 print '<th class="maxwidth75 right">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br>'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</th>';
 
-for ($idw = 0; $idw < 7; $idw++)
-{
+for ($idw = 0; $idw < 7; $idw++) {
 	$dayinloopfromfirstdaytoshow = dol_time_plus_duree($firstdaytoshow, $idw, 'd'); // $firstdaytoshow is a date with hours = 0
 	$dayinloop = dol_time_plus_duree($startday, $idw, 'd');
 
 	$cssweekend = '';
-	if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
-	{
+	if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) {	// This is a day is not inside the setup of working days, so we use a week-end css.
 		$cssweekend = 'weekend';
 	}
 
 	$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 
 	$cssonholiday = '';
-	if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
-	elseif (!$isavailable[$tmpday]['morning'])   $cssonholiday .= 'onholidaymorning ';
-	elseif (!$isavailable[$tmpday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
+	if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon']) {
+		$cssonholiday .= 'onholidayallday ';
+	} elseif (!$isavailable[$tmpday]['morning']) {
+		$cssonholiday .= 'onholidaymorning ';
+	} elseif (!$isavailable[$tmpday]['afternoon']) {
+		$cssonholiday .= 'onholidayafternoon ';
+	}
 
 	print '<th width="6%" align="center" class="bold hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">'.dol_print_date($dayinloopfromfirstdaytoshow, '%a').'<br>'.dol_print_date($dayinloopfromfirstdaytoshow, 'dayreduceformat').'</th>';
 }
@@ -682,28 +690,29 @@ print "</tr>\n";
 
 $colspan = 3 + (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : 2);
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	print '<tr class="liste_total">';
 	print '<td class="liste_total" colspan="'.($colspan + $addcolspan).'">';
 	print $langs->trans("Total");
 	print '<span class="opacitymediumbycolor">  - '.$langs->trans("ExpectedWorkedHours").': <strong>'.price($usertoprocess->weeklyhours, 1, $langs, 0, 0).'</strong></span>';
 	print '</td>';
 
-	for ($idw = 0; $idw < 7; $idw++)
-	{
+	for ($idw = 0; $idw < 7; $idw++) {
 		$cssweekend = '';
-		if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
-		{
+		if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) {	// This is a day is not inside the setup of working days, so we use a week-end css.
 			$cssweekend = 'weekend';
 		}
 
 		$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 
 		$cssonholiday = '';
-		if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
-		elseif (!$isavailable[$tmpday]['morning'])   $cssonholiday .= 'onholidaymorning ';
-		elseif (!$isavailable[$tmpday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
+		if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon']) {
+			$cssonholiday .= 'onholidayallday ';
+		} elseif (!$isavailable[$tmpday]['morning']) {
+			$cssonholiday .= 'onholidaymorning ';
+		} elseif (!$isavailable[$tmpday]['afternoon']) {
+			$cssonholiday .= 'onholidayafternoon ';
+		}
 		print '<td class="liste_total hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'" align="center"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
 	}
 	print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>';
@@ -714,8 +723,7 @@ if ($conf->use_javascript_ajax)
 
 // By default, we can edit only tasks we are assigned to
 $restrictviewformytask = ((!isset($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)) ? 2 : $conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED);
-if (count($tasksarray) > 0)
-{
+if (count($tasksarray) > 0) {
 	//var_dump($tasksarray);				// contains only selected tasks
 	//var_dump($tasksarraywithoutfilter);	// contains all tasks (if there is a filter, not defined if no filter)
 	//var_dump($tasksrole);
@@ -729,21 +737,17 @@ if (count($tasksarray) > 0)
 
 	// Calculate total for all tasks
 	$listofdistinctprojectid = array(); // List of all distinct projects
-	if (is_array($tasksarraywithoutfilter) && count($tasksarraywithoutfilter))
-	{
-		foreach ($tasksarraywithoutfilter as $tmptask)
-		{
+	if (is_array($tasksarraywithoutfilter) && count($tasksarraywithoutfilter)) {
+		foreach ($tasksarraywithoutfilter as $tmptask) {
 			$listofdistinctprojectid[$tmptask->fk_project] = $tmptask->fk_project;
 		}
 	}
 	//var_dump($listofdistinctprojectid);
 	$totalforeachday = array();
-	foreach ($listofdistinctprojectid as $tmpprojectid)
-	{
+	foreach ($listofdistinctprojectid as $tmpprojectid) {
 		$projectstatic->id = $tmpprojectid;
 		$projectstatic->loadTimeSpent($firstdaytoshow, 0, $usertoprocess->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-		for ($idw = 0; $idw < 7; $idw++)
-		{
+		for ($idw = 0; $idw < 7; $idw++) {
 			$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 			$totalforeachday[$tmpday] += $projectstatic->weekWorkLoad[$tmpday];
 		}
@@ -754,14 +758,11 @@ if (count($tasksarray) > 0)
 
 	// Is there a diff between selected/filtered tasks and all tasks ?
 	$isdiff = 0;
-	if (count($totalforeachday))
-	{
-		for ($idw = 0; $idw < 7; $idw++)
-		{
+	if (count($totalforeachday)) {
+		for ($idw = 0; $idw < 7; $idw++) {
 			$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 			$timeonothertasks = ($totalforeachday[$tmpday] - $totalforvisibletasks[$tmpday]);
-			if ($timeonothertasks)
-			{
+			if ($timeonothertasks) {
 				$isdiff = 1;
 				break;
 			}
@@ -769,25 +770,21 @@ if (count($tasksarray) > 0)
 	}
 
 	// There is a diff between total shown on screen and total spent by user, so we add a line with all other cumulated time of user
-	if ($isdiff)
-	{
+	if ($isdiff) {
 		print '<tr class="oddeven othertaskwithtime">';
 		print '<td colspan="'.($colspan + $addcolspan).'" class="opacitymedium">';
 		print $langs->trans("OtherFilteredTasks");
 		print '</td>';
-		for ($idw = 0; $idw < 7; $idw++)
-		{
+		for ($idw = 0; $idw < 7; $idw++) {
 			$cssweekend = '';
-			if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
-			{
+			if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) {	// This is a day is not inside the setup of working days, so we use a week-end css.
 				$cssweekend = 'weekend';
 			}
 
 			print '<td class="center hide'.$idw.' '.($cssweekend ? ' '.$cssweekend : '').'">';
 			$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 			$timeonothertasks = ($totalforeachday[$tmpday] - $totalforvisibletasks[$tmpday]);
-			if ($timeonothertasks)
-			{
+			if ($timeonothertasks) {
 				print '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled="" id="timespent[-1]['.$idw.']" name="task[-1]['.$idw.']" value="';
 				print convertSecondToTime($timeonothertasks, 'allhourmin');
 				print '"></span>';
@@ -798,8 +795,7 @@ if (count($tasksarray) > 0)
 		print '</tr>';
 	}
 
-	if ($conf->use_javascript_ajax)
-	{
+	if ($conf->use_javascript_ajax) {
 		print '<tr class="liste_total">
                 <td class="liste_total" colspan="'.($colspan + $addcolspan).'">';
 				print $langs->trans("Total");
@@ -808,17 +804,20 @@ if (count($tasksarray) > 0)
 
 		for ($idw = 0; $idw < 7; $idw++) {
 			$cssweekend = '';
-			if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
-			{
+			if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) {	// This is a day is not inside the setup of working days, so we use a week-end css.
 				$cssweekend = 'weekend';
 			}
 
 			$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 
 			$cssonholiday = '';
-			if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
-			elseif (!$isavailable[$tmpday]['morning'])   $cssonholiday .= 'onholidaymorning ';
-			elseif (!$isavailable[$tmpday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
+			if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon']) {
+				$cssonholiday .= 'onholidayallday ';
+			} elseif (!$isavailable[$tmpday]['morning']) {
+				$cssonholiday .= 'onholidaymorning ';
+			} elseif (!$isavailable[$tmpday]['afternoon']) {
+				$cssonholiday .= 'onholidayafternoon ';
+			}
 
 			print '<td class="liste_total hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'" align="center"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
 		}
@@ -841,8 +840,7 @@ print '</form>'."\n\n";
 
 $modeinput = 'hours';
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	print "\n<!-- JS CODE TO ENABLE Tooltips on all object with class classfortooltip -->\n";
 	print '<script type="text/javascript">'."\n";
 	print "jQuery(document).ready(function () {\n";
@@ -856,8 +854,7 @@ if ($conf->use_javascript_ajax)
 				});'."\n";
 
 	$idw = 0;
-	while ($idw < 7)
-	{
+	while ($idw < 7) {
 		print '    updateTotal('.$idw.',\''.$modeinput.'\');';
 		$idw++;
 	}
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 45e62eafbe9..e0018aa0e4b 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -36,7 +36,9 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'errors', 'other', 'projects'));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $value = GETPOST('value', 'alpha');
 $action = GETPOST('action', 'aZ09');
@@ -51,40 +53,43 @@ $type = 'project';
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-if ($action == 'updateMask')
-{
+if ($action == 'updateMask') {
 	$maskconstproject = GETPOST('maskconstproject', 'alpha');
 	$maskproject = GETPOST('maskproject', 'alpha');
 
-	if ($maskconstproject)  $res = dolibarr_set_const($db, $maskconstproject, $maskproject, 'chaine', 0, '', $conf->entity);
+	if ($maskconstproject) {
+		$res = dolibarr_set_const($db, $maskconstproject, $maskproject, 'chaine', 0, '', $conf->entity);
+	}
 
-	if (!($res > 0)) $error++;
+	if (!($res > 0)) {
+		$error++;
+	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
-if ($action == 'updateMaskTask')
-{
+if ($action == 'updateMaskTask') {
 	$maskconstmasktask = GETPOST('maskconsttask', 'alpha');
 	$masktaskt = GETPOST('masktask', 'alpha');
 
-	if ($maskconstmasktask)  $res = dolibarr_set_const($db, $maskconstmasktask, $masktaskt, 'chaine', 0, '', $conf->entity);
+	if ($maskconstmasktask) {
+		$res = dolibarr_set_const($db, $maskconstmasktask, $masktaskt, 'chaine', 0, '', $conf->entity);
+	}
 
-	if (!($res > 0)) $error++;
+	if (!($res > 0)) {
+		$error++;
+	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen')
-{
+} elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
 
 	$project = new Project($db);
@@ -93,25 +98,21 @@ if ($action == 'updateMaskTask')
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
+	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/project/doc/pdf_".$modele.".modules.php", 0);
-		if (file_exists($file))
-		{
+		if (file_exists($file)) {
 			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$module = new $classname($db);
 
-		if ($module->write_file($project, $langs) > 0)
-		{
+		if ($module->write_file($project, $langs) > 0) {
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project&file=SPECIMEN.pdf");
 			return;
 		} else {
@@ -122,8 +123,7 @@ if ($action == 'updateMaskTask')
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-} elseif ($action == 'specimentask')
-{
+} elseif ($action == 'specimentask') {
 	$modele = GETPOST('module', 'alpha');
 
 	$project = new Project($db);
@@ -132,25 +132,21 @@ if ($action == 'updateMaskTask')
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
+	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/project/task/doc/pdf_".$modele.".modules.php", 0);
-		if (file_exists($file))
-		{
+		if (file_exists($file)) {
 			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$module = new $classname($db);
 
-		if ($module->write_file($project, $langs) > 0)
-		{
+		if ($module->write_file($project, $langs) > 0) {
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project_task&file=SPECIMEN.pdf");
 			return;
 		} else {
@@ -161,49 +157,37 @@ if ($action == 'updateMaskTask')
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-
-// Activate a model
-elseif ($action == 'set')
-{
+} elseif ($action == 'set') {
+	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-// Activate a model for task
-elseif ($action == 'settask')
-{
+} elseif ($action == 'settask') {
+	// Activate a model for task
 	$ret = addDocumentModel($value, 'project_task', $label, $scandir);
-} elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		if ($conf->global->PROJECT_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROJECT_ADDON_PDF', $conf->entity);
+	if ($ret > 0) {
+		if ($conf->global->PROJECT_ADDON_PDF == "$value") {
+			dolibarr_del_const($db, 'PROJECT_ADDON_PDF', $conf->entity);
+		}
 	}
-}
-if ($action == 'deltask')
-{
+} elseif ($action == 'deltask') {
 	$ret = delDocumentModel($value, 'project_task');
-	if ($ret > 0)
-	{
-		if ($conf->global->PROJECT_TASK_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROJECT_TASK_ADDON_PDF', $conf->entity);
+	if ($ret > 0) {
+		if ($conf->global->PROJECT_TASK_ADDON_PDF == "$value") {
+			dolibarr_del_const($db, 'PROJECT_TASK_ADDON_PDF', $conf->entity);
+		}
 	}
-}
-
-// Set default model
-elseif ($action == 'setdoc')
-{
+} elseif ($action == 'setdoc') {
+	// Set default model
 	dolibarr_set_const($db, "PROJECT_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity);
 
 	// On active le modele
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-} elseif ($action == 'setdoctask')
-{
-	if (dolibarr_set_const($db, "PROJECT_TASK_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
-	{
+} elseif ($action == 'setdoctask') {
+	if (dolibarr_set_const($db, "PROJECT_TASK_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
 		// La constante qui a ete lue en avant du nouveau set
 		// on passe donc par une variable pour avoir un affichage coherent
 		$conf->global->PROJECT_TASK_ADDON_PDF = $value;
@@ -211,41 +195,32 @@ elseif ($action == 'setdoc')
 
 	// On active le modele
 	$ret = delDocumentModel($value, 'project_task');
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$ret = addDocumentModel($value, 'project_task', $label, $scandir);
 	}
-} elseif ($action == 'setmod')
-{
+} elseif ($action == 'setmod') {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "PROJECT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-} elseif ($action == 'setmodtask')
-{
+} elseif ($action == 'setmodtask') {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "PROJECT_TASK_ADDON", $value, 'chaine', 0, '', $conf->entity);
-} elseif ($action == 'updateoptions')
-{
-	if (GETPOST('PROJECT_USE_SEARCH_TO_SELECT'))
-	{
+} elseif ($action == 'updateoptions') {
+	if (GETPOST('PROJECT_USE_SEARCH_TO_SELECT')) {
 		$companysearch = GETPOST('activate_PROJECT_USE_SEARCH_TO_SELECT', 'alpha');
-		if (dolibarr_set_const($db, "PROJECT_USE_SEARCH_TO_SELECT", $companysearch, 'chaine', 0, '', $conf->entity))
-		{
+		if (dolibarr_set_const($db, "PROJECT_USE_SEARCH_TO_SELECT", $companysearch, 'chaine', 0, '', $conf->entity)) {
 			$conf->global->PROJECT_USE_SEARCH_TO_SELECT = $companysearch;
 		}
 	}
-	if (GETPOST('PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY'))
-	{
+	if (GETPOST('PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY')) {
 		$projectToSelect = GETPOST('projectToSelect', 'alpha');
 		dolibarr_set_const($db, 'PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY', $projectToSelect, 'chaine', 0, '', $conf->entity); //Allow to disable this configuration if empty value
 	}
-}
-
-// Set boolean (on/off) constants
-elseif (preg_match('/^(set|del)_?([A-Z_]+)$/', $action, $reg)) {
+} elseif (preg_match('/^(set|del)_?([A-Z_]+)$/', $action, $reg)) {
+	// Set boolean (on/off) constants
 	if (!dolibarr_set_const($db, $reg[2], ($reg[1] === 'set' ? '1' : '0'), 'chaine', 0, '', $conf->entity) > 0) {
 		dol_print_error($db);
 	}
@@ -323,19 +298,14 @@ print "</tr>\n";
 
 clearstatcache();
 
-foreach ($dirmodels as $reldir)
-{
+foreach ($dirmodels as $reldir) {
 	$dir = dol_buildpath($reldir."core/modules/project/");
 
-	if (is_dir($dir))
-	{
+	if (is_dir($dir)) {
 		$handle = opendir($dir);
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (preg_match('/^(mod_.*)\.php$/i', $file, $reg))
-				{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (preg_match('/^(mod_.*)\.php$/i', $file, $reg)) {
 					$file = $reg[1];
 					$classname = substr($file, 4);
 
@@ -344,11 +314,14 @@ foreach ($dirmodels as $reldir)
 					$module = new $file;
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						continue;
+					}
+					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						continue;
+					}
 
-					if ($module->isEnabled())
-					{
+					if ($module->isEnabled()) {
 						print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -359,13 +332,15 @@ foreach ($dirmodels as $reldir)
 						if (preg_match('/^Error/', $tmp)) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
-						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-						else print $tmp;
+						} elseif ($tmp == 'NotConfigured') {
+							print $langs->trans($tmp);
+						} else {
+							print $tmp;
+						}
 						print '</td>'."\n";
 
 						print '<td class="center">';
-						if ($conf->global->PROJECT_ADDON == 'mod_'.$classname)
-						{
+						if ($conf->global->PROJECT_ADDON == 'mod_'.$classname) {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
@@ -379,11 +354,9 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval = $module->getNextValue($mysoc, $project);
-						if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-						{
+						if ("$nextval" != $langs->trans("NotAvailable")) {	// Keep " on nextval
 							$htmltooltip .= ''.$langs->trans("NextValue").': ';
-							if ($nextval)
-							{
+							if ($nextval) {
 								$htmltooltip .= $nextval.'<br>';
 							} else {
 								$htmltooltip .= $langs->trans($module->error).'<br>';
@@ -406,8 +379,7 @@ foreach ($dirmodels as $reldir)
 print '</table><br>';
 
 
-if (empty($conf->global->PROJECT_HIDE_TASKS))
-{
+if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 	// Task numbering module
 	print load_fiche_titre($langs->trans("TasksNumberingModules"), '', '');
 
@@ -422,19 +394,14 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 
 	clearstatcache();
 
-	foreach ($dirmodels as $reldir)
-	{
+	foreach ($dirmodels as $reldir) {
 		$dir = dol_buildpath($reldir."core/modules/project/task/");
 
-		if (is_dir($dir))
-		{
+		if (is_dir($dir)) {
 			$handle = opendir($dir);
-			if (is_resource($handle))
-			{
-				while (($file = readdir($handle)) !== false)
-				{
-					if (preg_match('/^(mod_.*)\.php$/i', $file, $reg))
-					{
+			if (is_resource($handle)) {
+				while (($file = readdir($handle)) !== false) {
+					if (preg_match('/^(mod_.*)\.php$/i', $file, $reg)) {
 						$file = $reg[1];
 						$classname = substr($file, 4);
 
@@ -443,11 +410,14 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 						$module = new $file;
 
 						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							continue;
+						}
+						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							continue;
+						}
 
-						if ($module->isEnabled())
-						{
+						if ($module->isEnabled()) {
 							print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
 							print $module->info();
 							print '</td>';
@@ -458,13 +428,15 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 							if (preg_match('/^Error/', $tmp)) {
 								$langs->load("errors");
 								print '<div class="error">'.$langs->trans($tmp).'</div>';
-							} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-							else print $tmp;
+							} elseif ($tmp == 'NotConfigured') {
+								print $langs->trans($tmp);
+							} else {
+								print $tmp;
+							}
 							print '</td>'."\n";
 
 							print '<td class="center">';
-							if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname)
-							{
+							if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname) {
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
 								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;token='.newToken().'&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
@@ -478,11 +450,9 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 							$htmltooltip = '';
 							$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 							$nextval = $module->getNextValue($mysoc, $project);
-							if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
-							{
+							if ("$nextval" != $langs->trans("NotAvailable")) {	// Keep " on nextval
 								$htmltooltip .= ''.$langs->trans("NextValue").': ';
-								if ($nextval)
-								{
+								if ($nextval) {
 									$htmltooltip .= $nextval.'<br>';
 								} else {
 									$htmltooltip .= $langs->trans($module->error).'<br>';
@@ -522,12 +492,10 @@ $sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$i = 0;
 	$num_rows = $db->num_rows($resql);
-	while ($i < $num_rows)
-	{
+	while ($i < $num_rows) {
 		$array = $db->fetch_array($resql);
 		array_push($def, $array[0]);
 		$i++;
@@ -548,30 +516,22 @@ print "</tr>\n";
 
 clearstatcache();
 
-foreach ($dirmodels as $reldir)
-{
-	foreach (array('', '/doc') as $valdir)
-	{
+foreach ($dirmodels as $reldir) {
+	foreach (array('', '/doc') as $valdir) {
 		$dir = dol_buildpath($reldir."core/modules/project/".$valdir);
 
-		if (is_dir($dir))
-		{
+		if (is_dir($dir)) {
 			$handle = opendir($dir);
-			if (is_resource($handle))
-			{
-				while (($file = readdir($handle)) !== false)
-				{
+			if (is_resource($handle)) {
+				while (($file = readdir($handle)) !== false) {
 					$filelist[] = $file;
 				}
 				closedir($handle);
 				arsort($filelist);
 
-				foreach ($filelist as $file)
-				{
-					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-					{
-						if (file_exists($dir.'/'.$file))
-						{
+				foreach ($filelist as $file) {
+					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+						if (file_exists($dir.'/'.$file)) {
 							$name = substr($file, 4, dol_strlen($file) - 16);
 							$classname = substr($file, 0, dol_strlen($file) - 12);
 
@@ -579,21 +539,26 @@ foreach ($dirmodels as $reldir)
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+								$modulequalified = 0;
+							}
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								$modulequalified = 0;
+							}
 
-							if ($modulequalified)
-							{
+							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
 								print (empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
-								if (method_exists($module, 'info')) print $module->info($langs);
-								else print $module->description;
+								if (method_exists($module, 'info')) {
+									print $module->info($langs);
+								} else {
+									print $module->description;
+								}
 								print "</td>\n";
 
 								// Active
-								if (in_array($name, $def))
-								{
+								if (in_array($name, $def)) {
 									print "<td class=\"center\">\n";
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 									print img_picto($langs->trans("Enabled"), 'switch_on');
@@ -607,8 +572,7 @@ foreach ($dirmodels as $reldir)
 
 								// Default
 								print "<td class=\"center\">";
-								if ($conf->global->PROJECT_ADDON_PDF == "$name")
-								{
+								if ($conf->global->PROJECT_ADDON_PDF == "$name") {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
@@ -618,8 +582,7 @@ foreach ($dirmodels as $reldir)
 								// Info
 								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
 								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-								if ($module->type == 'pdf')
-								{
+								if ($module->type == 'pdf') {
 									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
 								}
 								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
@@ -631,8 +594,7 @@ foreach ($dirmodels as $reldir)
 
 								// Preview
 								print '<td class="center">';
-								if ($module->type == 'pdf')
-								{
+								if ($module->type == 'pdf') {
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
@@ -653,8 +615,7 @@ print '</table><br/>';
 
 
 
-if (empty($conf->global->PROJECT_HIDE_TASKS))
-{
+if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 	/*
 	 * Modeles documents for Task
 	 */
@@ -671,12 +632,10 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 	$sql .= " AND entity = ".$conf->entity;
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$i = 0;
 		$num_rows = $db->num_rows($resql);
-		while ($i < $num_rows)
-		{
+		while ($i < $num_rows) {
 			$array = $db->fetch_array($resql);
 			array_push($def, $array[0]);
 			$i++;
@@ -697,30 +656,22 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 
 	clearstatcache();
 
-	foreach ($dirmodels as $reldir)
-	{
-		foreach (array('', '/doc') as $valdir)
-		{
+	foreach ($dirmodels as $reldir) {
+		foreach (array('', '/doc') as $valdir) {
 			$dir = dol_buildpath($reldir."core/modules/project/task/".$valdir);
 
-			if (is_dir($dir))
-			{
+			if (is_dir($dir)) {
 				$handle = opendir($dir);
-				if (is_resource($handle))
-				{
-					while (($file = readdir($handle)) !== false)
-					{
+				if (is_resource($handle)) {
+					while (($file = readdir($handle)) !== false) {
 						$filelist[] = $file;
 					}
 					closedir($handle);
 					arsort($filelist);
 
-					foreach ($filelist as $file)
-					{
-						if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-						{
-							if (file_exists($dir.'/'.$file))
-							{
+					foreach ($filelist as $file) {
+						if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+							if (file_exists($dir.'/'.$file)) {
 								$name = substr($file, 4, dol_strlen($file) - 16);
 								$classname = substr($file, 0, dol_strlen($file) - 12);
 
@@ -728,21 +679,26 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 								$module = new $classname($db);
 
 								$modulequalified = 1;
-								if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-								if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+								if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+									$modulequalified = 0;
+								}
+								if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+									$modulequalified = 0;
+								}
 
-								if ($modulequalified)
-								{
+								if ($modulequalified) {
 									print '<tr class="oddeven"><td width="100">';
 									print (empty($module->name) ? $name : $module->name);
 									print "</td><td>\n";
-									if (method_exists($module, 'info')) print $module->info($langs);
-									else print $module->description;
+									if (method_exists($module, 'info')) {
+										print $module->info($langs);
+									} else {
+										print $module->description;
+									}
 									print "</td>\n";
 
 									// Active
-									if (in_array($name, $def))
-									{
+									if (in_array($name, $def)) {
 										print "<td class=\"center\">\n";
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=deltask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 										print img_picto($langs->trans("Enabled"), 'switch_on');
@@ -756,8 +712,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 
 									// Defaut
 									print "<td class=\"center\">";
-									if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name")
-									{
+									if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name") {
 										print img_picto($langs->trans("Default"), 'on');
 									} else {
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
@@ -767,8 +722,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 									// Info
 									$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
 									$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-									if ($module->type == 'pdf')
-									{
+									if ($module->type == 'pdf') {
 										$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
 									}
 									$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
@@ -780,8 +734,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 
 									// Preview
 									print '<td class="center">';
-									if ($module->type == 'pdf')
-									{
+									if ($module->type == 'pdf') {
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimentask&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 									} else {
 										print img_object($langs->trans("PreviewNotAvailable"), 'generic');
@@ -818,8 +771,7 @@ print '<td width="80">&nbsp;</td></tr>'."\n";
 
 print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("UseSearchToSelectProject").'</td>';
-if (!$conf->use_javascript_ajax)
-{
+if (!$conf->use_javascript_ajax) {
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
index 6c92e6d66c9..e011b1a02c3 100644
--- a/htdocs/projet/admin/project_extrafields.php
+++ b/htdocs/projet/admin/project_extrafields.php
@@ -38,13 +38,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'projet'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -77,8 +81,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -91,8 +94,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -104,8 +106,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
index 9f7efbb7096..5222706d7d0 100644
--- a/htdocs/projet/admin/project_task_extrafields.php
+++ b/htdocs/projet/admin/project_task_extrafields.php
@@ -39,13 +39,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'projet_task';
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -77,8 +81,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -91,8 +94,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -104,8 +106,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/projet/admin/website.php b/htdocs/projet/admin/website.php
index e84cceb68a8..04acbaa44aa 100644
--- a/htdocs/projet/admin/website.php
+++ b/htdocs/projet/admin/website.php
@@ -35,7 +35,9 @@ $langs->loadLangs(array("admin", "members"));
 
 $action = GETPOST('action', 'aZ09');
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -43,8 +45,11 @@ if (!$user->admin) accessforbidden();
  */
 
 if ($action == 'setPROJECT_ENABLE_PUBLIC') {
-	if (GETPOST('value')) dolibarr_set_const($db, 'PROJECT_ENABLE_PUBLIC', 1, 'chaine', 0, '', $conf->entity);
-	else dolibarr_set_const($db, 'PROJECT_ENABLE_PUBLIC', 0, 'chaine', 0, '', $conf->entity);
+	if (GETPOST('value')) {
+		dolibarr_set_const($db, 'PROJECT_ENABLE_PUBLIC', 1, 'chaine', 0, '', $conf->entity);
+	} else {
+		dolibarr_set_const($db, 'PROJECT_ENABLE_PUBLIC', 0, 'chaine', 0, '', $conf->entity);
+	}
 }
 
 if ($action == 'update') {
@@ -52,9 +57,11 @@ if ($action == 'update') {
 
 	$res = dolibarr_set_const($db, "PROJECT_ENABLE_PUBLIC", $public, 'chaine', 0, '', $conf->entity);
 
-	if (!($res > 0)) $error++;
+	if (!($res > 0)) {
+		$error++;
+	}
 
- 	if (!$error) {
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index 0036ae64353..74d9236d26d 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -23,13 +23,27 @@
  *       \brief      File to return Ajax response on product list request
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
 
 require '../../main.inc.php';
 
@@ -49,7 +63,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
 top_httphead();
 
-if (empty($htmlname) && !GETPOST('mode', 'aZ09')) return;
+if (empty($htmlname) && !GETPOST('mode', 'aZ09')) {
+	return;
+}
 
 // Mode to get list of projects
 if (!GETPOST('mode', 'aZ09') || GETPOST('mode', 'aZ09') != 'gettasks') {
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 5370dcfa8f9..e83a4c86a10 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -52,7 +52,9 @@ $status = GETPOST('status', 'int');
 $opp_status = GETPOST('opp_status', 'int');
 $opp_percent = price2num(GETPOST('opp_percent', 'alpha'));
 
-if ($id == '' && $ref == '' && ($action != "create" && $action != "add" && $action != "update" && !$_POST["cancel"])) accessforbidden();
+if ($id == '' && $ref == '' && ($action != "create" && $action != "add" && $action != "update" && !$_POST["cancel"])) {
+	accessforbidden();
+}
 
 $mine = GETPOST('mode') == 'mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
@@ -65,12 +67,13 @@ $extrafields = new ExtraFields($db);
 
 // Load object
 //include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Can't use generic include because when creating a project, ref is defined and we dont want error if fetch fails from ref.
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref); // If we create project, ref may be defined into POST but record does not yet exists into database
 	if ($ret > 0) {
 		$object->fetch_thirdparty();
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+			$object->fetchComments();
+		}
 		$id = $object->id;
 	}
 }
@@ -93,18 +96,16 @@ $date_end = dol_mktime(0, 0, 0, GETPOST('projectendmonth', 'int'), GETPOST('proj
 
 $parameters = array('id'=>$socid, 'objcanvas'=>$objcanvas);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Cancel
-	if ($cancel)
-	{
-		if (GETPOST("comefromclone") == 1)
-		{
+	if ($cancel) {
+		if (GETPOST("comefromclone") == 1) {
 			$result = $object->delete($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				header("Location: index.php");
 				exit;
 			} else {
@@ -112,8 +113,7 @@ if (empty($reshook))
 				setEventMessages($langs->trans("CantRemoveProject", $langs->transnoentitiesnoconv("ProjectOverview")), null, 'errors');
 			}
 		}
-		if ($backtopage)
-		{
+		if ($backtopage) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -121,34 +121,28 @@ if (empty($reshook))
 		$action = '';
 	}
 
-	if ($action == 'add' && $user->rights->projet->creer)
-	{
+	if ($action == 'add' && $user->rights->projet->creer) {
 		$error = 0;
-		if (!GETPOST('ref'))
-		{
+		if (!GETPOST('ref')) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 			$error++;
 		}
-		if (!GETPOST('title'))
-		{
+		if (!GETPOST('title')) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ProjectLabel")), null, 'errors');
 			$error++;
 		}
 
-		if (GETPOST('opp_amount') != '' && !(GETPOST('opp_status') > 0))
-		{
+		if (GETPOST('opp_amount') != '' && !(GETPOST('opp_status') > 0)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
 		}
 
 		// Create with status validated immediatly
-		if (!empty($conf->global->PROJECT_CREATE_NO_DRAFT))
-		{
+		if (!empty($conf->global->PROJECT_CREATE_NO_DRAFT)) {
 			$status = Project::STATUS_VALIDATED;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$error = 0;
 
 			$db->begin();
@@ -173,16 +167,16 @@ if (empty($reshook))
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) $error++;
+			if ($ret < 0) {
+				$error++;
+			}
 
 			$result = $object->create($user);
-			if (!$error && $result > 0)
-			{
+			if (!$error && $result > 0) {
 				// Add myself as project leader
 				$typeofcontact = 'PROJECTLEADER';	// TODO If use rename this code in dictionary, the add_contact will generate an error.
 				$result = $object->add_contact($user->id, $typeofcontact, 'internal');
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$langs->load("errors");
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
@@ -192,8 +186,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
-			if (!$error && !empty($object->id) > 0)
-			{
+			if (!$error && !empty($object->id) > 0) {
 				// Category association
 				$categories = GETPOST('categories', 'array');
 				$result = $object->setCategories($categories);
@@ -204,12 +197,10 @@ if (empty($reshook))
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 
-				if (!empty($backtopage))
-				{
+				if (!empty($backtopage)) {
 					$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
 					$backtopage = $backtopage.'&projectid='.$object->id; // Old method
 					header("Location: ".$backtopage);
@@ -228,18 +219,15 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'update' && empty(GETPOST('cancel')) && $user->rights->projet->creer)
-	{
+	if ($action == 'update' && empty(GETPOST('cancel')) && $user->rights->projet->creer) {
 		$error = 0;
 
-		if (empty($ref))
-		{
+		if (empty($ref)) {
 			$error++;
 			//$_GET["id"]=$_POST["id"]; // We return on the project card
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 		}
-		if (empty($_POST["title"]))
-		{
+		if (empty($_POST["title"])) {
 			$error++;
 			//$_GET["id"]=$_POST["id"]; // We return on the project card
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ProjectLabel")), null, 'errors');
@@ -247,8 +235,7 @@ if (empty($reshook))
 
 		$db->begin();
 
-		if (!$error)
-		{
+		if (!$error) {
 			$object->oldcopy = clone $object;
 
 			$old_start_date = $object->date_start;
@@ -261,10 +248,18 @@ if (empty($reshook))
 			$object->public       = GETPOST('public', 'alpha');
 			$object->date_start   = (!GETPOST('projectstart')) ? '' : $date_start;
 			$object->date_end     = (!GETPOST('projectend')) ? '' : $date_end;
-			if (GETPOSTISSET('opp_amount'))    $object->opp_amount   = price2num(GETPOST('opp_amount', 'alpha'));
-			if (GETPOSTISSET('budget_amount')) $object->budget_amount = price2num(GETPOST('budget_amount', 'alpha'));
-			if (GETPOSTISSET('opp_status'))    $object->opp_status   = $opp_status;
-			if (GETPOSTISSET('opp_percent'))   $object->opp_percent  = $opp_percent;
+			if (GETPOSTISSET('opp_amount')) {
+				$object->opp_amount   = price2num(GETPOST('opp_amount', 'alpha'));
+			}
+			if (GETPOSTISSET('budget_amount')) {
+				$object->budget_amount = price2num(GETPOST('budget_amount', 'alpha'));
+			}
+			if (GETPOSTISSET('opp_status')) {
+				$object->opp_status   = $opp_status;
+			}
+			if (GETPOSTISSET('opp_percent')) {
+				$object->opp_percent  = $opp_percent;
+			}
 			$object->usage_opportunity    = (GETPOST('usage_opportunity', 'alpha') == 'on' ? 1 : 0);
 			$object->usage_task           = (GETPOST('usage_task', 'alpha') == 'on' ? 1 : 0);
 			$object->usage_bill_time      = (GETPOST('usage_bill_time', 'alpha') == 'on' ? 1 : 0);
@@ -272,42 +267,40 @@ if (empty($reshook))
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) $error++;
+			if ($ret < 0) {
+				$error++;
+			}
 		}
 
-		if ($object->opp_amount && ($object->opp_status <= 0))
-		{
-		   	$error++;
+		if ($object->opp_amount && ($object->opp_status <= 0)) {
+			$error++;
 			setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $object->update($user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
-				if ($result == -4) setEventMessages($langs->trans("ErrorRefAlreadyExists"), null, 'errors');
-				else setEventMessages($object->error, $object->errors, 'errors');
+				if ($result == -4) {
+					setEventMessages($langs->trans("ErrorRefAlreadyExists"), null, 'errors');
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 			} else {
 				// Category association
 				$categories = GETPOST('categories', 'array');
 				$result = $object->setCategories($categories);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
 
-		if (!$error)
-		{
-			if (GETPOST("reportdate") && ($object->date_start != $old_start_date))
-			{
+		if (!$error) {
+			if (GETPOST("reportdate") && ($object->date_start != $old_start_date)) {
 				$result = $object->shiftTaskDate($old_start_date);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					setEventMessages($langs->trans("ErrorShiftTaskDate").':'.$object->error, $object->errors, 'errors');
 				}
@@ -315,101 +308,92 @@ if (empty($reshook))
 		}
 
 		// Check if we must change status
-		if (GETPOST('closeproject'))
-		{
+		if (GETPOST('closeproject')) {
 			$resclose = $object->setClose($user);
-			if ($resclose < 0)
-			{
+			if ($resclose < 0) {
 				$error++;
 				setEventMessages($langs->trans("FailedToCloseProject").':'.$object->error, $object->errors, 'errors');
 			}
 		}
 
 
-		if ($error)
-		{
+		if ($error) {
 			$db->rollback();
 			$action = 'edit';
 		} else {
 			$db->commit();
 
-			if (GETPOST('socid', 'int') > 0) $object->fetch_thirdparty(GETPOST('socid', 'int'));
-			else unset($object->thirdparty);
+			if (GETPOST('socid', 'int') > 0) {
+				$object->fetch_thirdparty(GETPOST('socid', 'int'));
+			} else {
+				unset($object->thirdparty);
+			}
 		}
 	}
 
 	// Build doc
-	if ($action == 'builddoc' && $user->rights->projet->creer)
-	{
+	if ($action == 'builddoc' && $user->rights->projet->creer) {
 		// Save last template used to generate document
-		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model', 'alpha'));
+		if (GETPOST('model')) {
+			$object->setDocModel($user, GETPOST('model', 'alpha'));
+		}
 
 		$outputlangs = $langs;
-		if (GETPOST('lang_id', 'aZ09'))
-		{
+		if (GETPOST('lang_id', 'aZ09')) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
 		}
 		$result = $object->generateDocument($object->model_pdf, $outputlangs);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
 	}
 
 	// Delete file in doc form
-	if ($action == 'remove_file' && $user->rights->projet->creer)
-	{
-		if ($object->id > 0)
-		{
+	if ($action == 'remove_file' && $user->rights->projet->creer) {
+		if ($object->id > 0) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 			$langs->load("other");
 			$upload_dir = $conf->projet->dir_output;
 			$file = $upload_dir.'/'.GETPOST('file');
 			$ret = dol_delete_file($file, 0, 0, 0, $object);
-			if ($ret)
+			if ($ret) {
 				setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-			else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+			} else {
+				setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+			}
 			$action = '';
 		}
 	}
 
 
-	if ($action == 'confirm_validate' && $confirm == 'yes')
-	{
+	if ($action == 'confirm_validate' && $confirm == 'yes') {
 		$result = $object->setValid($user);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
-	if ($action == 'confirm_close' && $confirm == 'yes')
-	{
+	if ($action == 'confirm_close' && $confirm == 'yes') {
 		$result = $object->setClose($user);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
-	if ($action == 'confirm_reopen' && $confirm == 'yes')
-	{
+	if ($action == 'confirm_reopen' && $confirm == 'yes') {
 		$result = $object->setValid($user);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
-	if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->projet->supprimer)
-	{
+	if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->projet->supprimer) {
 		$object->fetch($id);
 		$result = $object->delete($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 			header("Location: list.php?restore_lastsearch_values=1");
 			exit;
@@ -419,8 +403,7 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'confirm_clone' && $user->rights->projet->creer && $confirm == 'yes')
-	{
+	if ($action == 'confirm_clone' && $user->rights->projet->creer && $confirm == 'yes') {
 		$clone_contacts = GETPOST('clone_contacts') ? 1 : 0;
 		$clone_tasks = GETPOST('clone_tasks') ? 1 : 0;
 		$clone_project_files = GETPOST('clone_project_files') ? 1 : 0;
@@ -430,8 +413,7 @@ if (empty($reshook))
 		$clone_thirdparty = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : 0;
 
 		$result = $object->createFromClone($user, $object->id, $clone_contacts, $clone_tasks, $clone_project_files, $clone_task_files, $clone_notes, $move_date, 0, $clone_thirdparty);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
 			// Load new object
@@ -464,7 +446,9 @@ $formproject = new FormProjets($db);
 $userstatic = new User($db);
 
 $title = $langs->trans("Project").' - '.$object->ref.($object->thirdparty->name ? ' - '.$object->thirdparty->name : '').($object->title ? ' - '.$object->title : '');
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE)) $title = $object->ref.($object->thirdparty->name ? ' - '.$object->thirdparty->name : '').($object->title ? ' - '.$object->title : '');
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE)) {
+	$title = $object->ref.($object->thirdparty->name ? ' - '.$object->thirdparty->name : '').($object->title ? ' - '.$object->title : '');
+}
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 
 llxHeader("", $title, $help_url);
@@ -480,14 +464,15 @@ if ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
 	$titlenew = $langs->trans("NewLead");
 }
 
-if ($action == 'create' && $user->rights->projet->creer)
-{
+if ($action == 'create' && $user->rights->projet->creer) {
 	/*
-     * Create
-     */
+	 * Create
+	 */
 
 	$thirdparty = new Societe($db);
-	if ($socid > 0) $thirdparty->fetch($socid);
+	if ($socid > 0) {
+		$thirdparty->fetch($socid);
+	}
 
 	print load_fiche_titre($titlenew, '', 'project');
 
@@ -506,26 +491,25 @@ if ($action == 'create' && $user->rights->projet->creer)
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
+	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/project/".$modele.'.php', 0);
-		if (file_exists($file))
-		{
+		if (file_exists($file)) {
 			$filefound = 1;
 			$classname = $modele;
 			break;
 		}
 	}
 
-	if ($filefound)
-	{
+	if ($filefound) {
 		$result = dol_include_once($reldir."core/modules/project/".$modele.'.php');
 		$modProject = new $classname;
 
 		$defaultref = $modProject->getNextValue($thirdparty, $object);
 	}
 
-	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+	if (is_numeric($defaultref) && $defaultref <= 0) {
+		$defaultref = '';
+	}
 
 	// Ref
 	$suggestedref = ($_POST["ref"] ? $_POST["ref"] : $defaultref);
@@ -560,23 +544,20 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '</script>';
 		print '<br>';
 	}
-	if (empty($conf->global->PROJECT_HIDE_TASKS))
-	{
+	if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 		print '<input type="checkbox" id="usage_task" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
 		$htmltext = $langs->trans("ProjectFollowTasks");
 		print '<label for="usage_task">'.$form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext).'</label>';
 		print '<br>';
 	}
-	if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
-	{
+	if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 		print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"'.(GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '').'"> ';
 		$htmltext = $langs->trans("ProjectBillTimeDescription");
 		print '<label for="usage_bill_time">'.$form->textwithpicto($langs->trans("BillTime"), $htmltext).'</label>';
 		print '<br>';
 	}
 
-	if (!empty($conf->eventorganization->enabled))
-	{
+	if (!empty($conf->eventorganization->enabled)) {
 		print '<input type="checkbox" name="usage_organize_event"'.(GETPOST('usage_organize_event', 'alpha')!=''?' checked="checked"':'').'"> ';
 		$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 		print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
@@ -586,28 +567,31 @@ if ($action == 'create' && $user->rights->projet->creer)
 	print '</tr>';
 
 	// Thirdparty
-	if ($conf->societe->enabled)
-	{
+	if ($conf->societe->enabled) {
 		print '<tr><td>';
 		print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '<span class="fieldrequired">');
 		print $langs->trans("ThirdParty");
 		print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '</span>');
 		print '</td><td class="maxwidthonsmartphone">';
 		$filteronlist = '';
-		if (!empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
-	   	$text = img_picto('', 'company').$form->select_company(GETPOST('socid', 'int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusxx');
-		if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile))
-		{
+		if (!empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) {
+			$filteronlist = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
+		}
+		$text = img_picto('', 'company').$form->select_company(GETPOST('socid', 'int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusxx');
+		if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile)) {
 			$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 			print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1);
-		} else print $text;
-		if (!GETPOSTISSET('backtopage')) print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
+		} else {
+			print $text;
+		}
+		if (!GETPOSTISSET('backtopage')) {
+			print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
+		}
 		print '</td></tr>';
 	}
 
 	// Status
-	if ($status != '')
-	{
+	if ($status != '') {
 		print '<tr><td>'.$langs->trans("Status").'</td><td>';
 		print '<input type="hidden" name="status" value="'.$status.'">';
 		print $object->LibStatut($status, 4);
@@ -617,8 +601,12 @@ if ($action == 'create' && $user->rights->projet->creer)
 	// Visibility
 	print '<tr><td>'.$langs->trans("Visibility").'</td><td class="maxwidthonsmartphone">';
 	$array = array();
-	if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) $array[0] = $langs->trans("PrivateProject");
-	if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) $array[1] = $langs->trans("SharedProject");
+	if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) {
+		$array[0] = $langs->trans("PrivateProject");
+	}
+	if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) {
+		$array[1] = $langs->trans("SharedProject");
+	}
 	print $form->selectarray('public', $array, GETPOST('public') ?GETPOST('public') : $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 	print '</td></tr>';
 
@@ -632,8 +620,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	print $form->selectDate(($date_end ? $date_end : -1), 'projectend', 0, 0, 0, '', 1, 0);
 	print '</td></tr>';
 
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-	{
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 		// Opportunity status
 		print '<tr class="classuseopportunity"><td>'.$langs->trans("OpportunityStatus").'</td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -678,8 +665,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'create');
 	}
 
@@ -689,8 +675,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
-	if (!empty($backtopage))
-	{
+	if (!empty($backtopage)) {
 		print ' &nbsp; &nbsp; ';
 		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	} else {
@@ -731,11 +716,10 @@ if ($action == 'create' && $user->rights->projet->creer)
         	});
         });
         </script>';
-} elseif ($object->id > 0)
-{
+} elseif ($object->id > 0) {
 	/*
-     * Show or edit
-     */
+	 * Show or edit
+	 */
 
 	$res = $object->fetch_optionals();
 
@@ -747,34 +731,31 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 
 	// Confirmation validation
-	if ($action == 'validate')
-	{
+	if ($action == 'validate') {
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProject'), $langs->trans('ConfirmValidateProject'), 'confirm_validate', '', 0, 1);
 	}
 	// Confirmation close
-	if ($action == 'close')
-	{
+	if ($action == 'close') {
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("CloseAProject"), $langs->trans("ConfirmCloseAProject"), "confirm_close", '', '', 1);
 	}
 	// Confirmation reopen
-	if ($action == 'reopen')
-	{
+	if ($action == 'reopen') {
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ReOpenAProject"), $langs->trans("ConfirmReOpenAProject"), "confirm_reopen", '', '', 1);
 	}
 	// Confirmation delete
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		$text = $langs->trans("ConfirmDeleteAProject");
 		$task = new Task($db);
 		$taskarray = $task->getTasksArray(0, 0, $object->id, 0, 0);
 		$nboftask = count($taskarray);
-		if ($nboftask) $text .= '<br>'.img_warning().' '.$langs->trans("ThisWillAlsoRemoveTasks", $nboftask);
+		if ($nboftask) {
+			$text .= '<br>'.img_warning().' '.$langs->trans("ThisWillAlsoRemoveTasks", $nboftask);
+		}
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("DeleteAProject"), $text, "confirm_delete", '', '', 1);
 	}
 
 	// Clone confirmation
-	if ($action == 'clone')
-	{
+	if ($action == 'clone') {
 		$formquestion = array(
 			'text' => $langs->trans("ConfirmClone"),
 			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int') > 0 ?GETPOST('socid', 'int') : $object->socid, 'socid', '', "None", 0, 0, null, 0, 'minwidth200')),
@@ -798,8 +779,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 	$head = project_prepare_head($object);
 
-	if ($action == 'edit' && $userWrite > 0)
-	{
+	if ($action == 'edit' && $userWrite > 0) {
 		print dol_get_fiche_head($head, 'project', $langs->trans("Project"), 0, ($object->public ? 'projectpub' : 'project'));
 
 		print '<table class="border centpercent">';
@@ -818,8 +798,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		// Status
 		print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td><td>';
 		print '<select class="flat" name="status">';
-		foreach ($object->statuts_short as $key => $val)
-		{
+		foreach ($object->statuts_short as $key => $val) {
 			print '<option value="'.$key.'"'.((GETPOSTISSET('status') ?GETPOST('status') : $object->statut) == $key ? ' selected="selected"' : '').'>'.$langs->trans($val).'</option>';
 		}
 		print '</select>';
@@ -830,8 +809,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 			print '<input type="checkbox" id="usage_opportunity" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
@@ -850,22 +828,19 @@ if ($action == 'create' && $user->rights->projet->creer)
 			print '</script>';
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS))
-		{
+		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 			print '<input type="checkbox" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowTasks");
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
-		{
+		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 			print '<input type="checkbox" name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->eventorganization->enabled))
-		{
+		if (!empty($conf->eventorganization->enabled)) {
 			print '<input type="checkbox" name="usage_organize_event"'.(GETPOST('usage_organize_event', 'alpha')!=''?' checked="checked"':'').'"> ';
 			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 			print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
@@ -873,34 +848,39 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '</td></tr>';
 
 		// Thirdparty
-		if ($conf->societe->enabled)
-		{
+		if ($conf->societe->enabled) {
 			print '<tr><td>';
 			print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '<span class="fieldrequired">');
 			print $langs->trans("ThirdParty");
 			print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '</span>');
 			print '</td><td>';
 			$filteronlist = '';
-			if (!empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
+			if (!empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) {
+				$filteronlist = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
+			}
 			$text = $form->select_company($object->thirdparty->id, 'socid', $filteronlist, 'None', 1, 0, array(), 0, 'minwidth300');
-			if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile))
-			{
+			if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile)) {
 				$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 				print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1, 0, '', '', 2);
-			} else print $text;
+			} else {
+				print $text;
+			}
 			print '</td></tr>';
 		}
 
 		// Visibility
 		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
 		$array = array();
-		if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) $array[0] = $langs->trans("PrivateProject");
-		if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) $array[1] = $langs->trans("SharedProject");
+		if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) {
+			$array[0] = $langs->trans("PrivateProject");
+		}
+		if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) {
+			$array[1] = $langs->trans("SharedProject");
+		}
 		print $form->selectarray('public', $array, $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '</td></tr>';
 
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 			$classfortr = ($object->usage_opportunity ? '' : ' hideobject');
 			// Opportunity status
 			print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityStatus").'</td>';
@@ -930,7 +910,9 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
 		print $form->selectDate($object->date_start ? $object->date_start : -1, 'projectstart', 0, 0, 0, '', 1, 0);
 		print ' &nbsp; &nbsp; <input type="checkbox" class="valignmiddle" name="reportdate" value="yes" ';
-		if ($comefromclone) {print ' checked '; }
+		if ($comefromclone) {
+			print ' checked ';
+		}
 		print '/> '.$langs->trans("ProjectReportDate");
 		print '</td></tr>';
 
@@ -952,8 +934,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print '</td></tr>';
 
 		// Tags-Categories
-		if ($conf->categorie->enabled)
-		{
+		if ($conf->categorie->enabled) {
 			print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
 			$c = new Categorie($db);
@@ -969,8 +950,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			print $object->showOptionals($extrafields, 'edit');
 		}
 
@@ -987,15 +967,13 @@ if ($action == 'create' && $user->rights->projet->creer)
 		$morehtmlref .= dol_escape_htmltag($object->title);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : ';
-		if ($object->thirdparty->id > 0)
-		{
+		if ($object->thirdparty->id > 0) {
 			$morehtmlref .= $object->thirdparty->getNomUrl(1, 'project');
 		}
 		$morehtmlref .= '</div>';
 
 		// Define a complementary filter for search of next/prev ref.
-		if (!$user->rights->projet->all->lire)
-		{
+		if (!$user->rights->projet->all->lire) {
 			$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 			$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 		}
@@ -1014,30 +992,26 @@ if ($action == 'create' && $user->rights->projet->creer)
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS))
-		{
+		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowTasks");
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-		{
+		if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 			print '<br>';
 		}
 
-		if (!empty($conf->eventorganization->enabled))
-		{
+		if (!empty($conf->eventorganization->enabled)) {
 			print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 			print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
@@ -1046,35 +1020,45 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 		// Visibility
 		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-		if ($object->public) print $langs->trans('SharedProject');
-		else print $langs->trans('PrivateProject');
+		if ($object->public) {
+			print $langs->trans('SharedProject');
+		} else {
+			print $langs->trans('PrivateProject');
+		}
 		print '</td></tr>';
 
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity))
-		{
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity)) {
 			// Opportunity status
 			print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
 			$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
-			if ($code) print $langs->trans("OppStatus".$code);
+			if ($code) {
+				print $langs->trans("OppStatus".$code);
+			}
 			print '</td></tr>';
 
 			// Opportunity percent
 			print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-			if (strcmp($object->opp_percent, '')) print price($object->opp_percent, 0, $langs, 1, 0).' %';
+			if (strcmp($object->opp_percent, '')) {
+				print price($object->opp_percent, 0, $langs, 1, 0).' %';
+			}
 			print '</td></tr>';
 
 			// Opportunity Amount
 			print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
 			/*if ($object->opp_status)
-	        {
-	           print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
-	        }*/
-			if (strcmp($object->opp_amount, '')) print price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+			{
+			   print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
+			}*/
+			if (strcmp($object->opp_amount, '')) {
+				print price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+			}
 			print '</td></tr>';
 
 			// Opportunity Weighted Amount
 			print '<tr><td>'.$langs->trans('OpportunityWeightedAmount').'</td><td>';
-			if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) print price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency);
+			if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) {
+				print price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency);
+			}
 			print '</td></tr>';
 		}
 
@@ -1085,12 +1069,16 @@ if ($action == 'create' && $user->rights->projet->creer)
 		$end = dol_print_date($object->date_end, 'day');
 		print ' - ';
 		print ($end ? $end : '?');
-		if ($object->hasDelay()) print img_warning("Late");
+		if ($object->hasDelay()) {
+			print img_warning("Late");
+		}
 		print '</td></tr>';
 
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-		if (strcmp($object->budget_amount, '')) print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+		if (strcmp($object->budget_amount, '')) {
+			print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+		}
 		print '</td></tr>';
 
 		// Other attributes
@@ -1129,8 +1117,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 	print dol_get_fiche_end();
 
-	if ($action == 'edit' && $userWrite > 0)
-	{
+	if ($action == 'edit' && $userWrite > 0) {
 		print '<div class="center">';
 		print '<input name="update" class="button" type="submit" value="'.$langs->trans("Save").'">&nbsp; &nbsp; &nbsp;';
 		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -1140,11 +1127,12 @@ if ($action == 'create' && $user->rights->projet->creer)
 	print '</form>';
 
 	// Change probability from status
-	if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-	{
+	if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 		// Default value to close or not when we set opp to 'WON'.
 		$defaultcheckedwhenoppclose = 1;
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) $defaultcheckedwhenoppclose = 0;
+		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+			$defaultcheckedwhenoppclose = 0;
+		}
 
 		print '<!-- Javascript to manage opportunity status change -->';
 		print '<script type="text/javascript" language="javascript">
@@ -1203,16 +1191,14 @@ if ($action == 'create' && $user->rights->projet->creer)
 	}
 
 	/*
-     * Actions Buttons
-     */
+	 * Actions Buttons
+	 */
 	print '<div class="tabsAction">';
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 																							  // modified by hook
-	if (empty($reshook))
-	{
-		if ($action != "edit" && $action != 'presend')
-		{
+	if (empty($reshook)) {
+		if ($action != "edit" && $action != 'presend') {
 			// Create event
 			/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 				// Add hidden condition because this is not a
 				// "workflow" action so should appears somewhere else on
@@ -1223,17 +1209,14 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 			// Send
 			if (empty($user->socid)) {
-				if ($object->statut != Project::STATUS_CLOSED)
-				{
+				if ($object->statut != Project::STATUS_CLOSED) {
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 				}
 			}
 
 			// Modify
-			if ($object->statut != Project::STATUS_CLOSED && $user->rights->projet->creer)
-			{
-				if ($userWrite > 0)
-				{
+			if ($object->statut != Project::STATUS_CLOSED && $user->rights->projet->creer) {
+				if ($userWrite > 0) {
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
@@ -1241,10 +1224,8 @@ if ($action == 'create' && $user->rights->projet->creer)
 			}
 
 			// Validate
-			if ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer)
-			{
-				if ($userWrite > 0)
-				{
+			if ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer) {
+				if ($userWrite > 0) {
 					print '<a class="butAction" href="card.php?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Validate').'</a>';
@@ -1252,10 +1233,8 @@ if ($action == 'create' && $user->rights->projet->creer)
 			}
 
 			// Close
-			if ($object->statut == Project::STATUS_VALIDATED && $user->rights->projet->creer)
-			{
-				if ($userWrite > 0)
-				{
+			if ($object->statut == Project::STATUS_VALIDATED && $user->rights->projet->creer) {
+				if ($userWrite > 0) {
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=close">'.$langs->trans("Close").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Close').'</a>';
@@ -1263,10 +1242,8 @@ if ($action == 'create' && $user->rights->projet->creer)
 			}
 
 			// Reopen
-			if ($object->statut == Project::STATUS_CLOSED && $user->rights->projet->creer)
-			{
-				if ($userWrite > 0)
-				{
+			if ($object->statut == Project::STATUS_CLOSED && $user->rights->projet->creer) {
+				if ($userWrite > 0) {
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ReOpen').'</a>';
@@ -1274,65 +1251,52 @@ if ($action == 'create' && $user->rights->projet->creer)
 			}
 
 			// Add button to create objects from project
-			if (!empty($conf->global->PROJECT_SHOW_CREATE_OBJECT_BUTTON))
-			{
-				if (!empty($conf->propal->enabled) && $user->rights->propal->creer)
-				{
+			if (!empty($conf->global->PROJECT_SHOW_CREATE_OBJECT_BUTTON)) {
+				if (!empty($conf->propal->enabled) && $user->rights->propal->creer) {
 					$langs->load("propal");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddProp").'</a>';
 				}
-				if (!empty($conf->commande->enabled) && $user->rights->commande->creer)
-				{
+				if (!empty($conf->commande->enabled) && $user->rights->commande->creer) {
 					$langs->load("orders");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("CreateOrder").'</a>';
 				}
-				if (!empty($conf->facture->enabled) && $user->rights->facture->creer)
-				{
+				if (!empty($conf->facture->enabled) && $user->rights->facture->creer) {
 					$langs->load("bills");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
 				}
-				if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer)
-				{
+				if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer) {
 					$langs->load("supplier_proposal");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddSupplierProposal").'</a>';
 				}
-				if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->creer)
-				{
+				if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->creer) {
 					$langs->load("suppliers");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddSupplierOrder").'</a>';
 				}
-				if (!empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->creer)
-				{
+				if (!empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->creer) {
 					$langs->load("suppliers");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddSupplierInvoice").'</a>';
 				}
-				if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer)
-				{
+				if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) {
 					$langs->load("interventions");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddIntervention").'</a>';
 				}
-				if (!empty($conf->contrat->enabled) && $user->rights->contrat->creer)
-				{
+				if (!empty($conf->contrat->enabled) && $user->rights->contrat->creer) {
 					$langs->load("contracts");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddContract").'</a>';
 				}
-				if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->creer)
-				{
+				if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->creer) {
 					$langs->load("trips");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddTrip").'</a>';
 				}
-				if (!empty($conf->don->enabled) && $user->rights->don->creer)
-				{
+				if (!empty($conf->don->enabled) && $user->rights->don->creer) {
 					$langs->load("donations");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddDonation").'</a>';
 				}
 			}
 
 			// Clone
-			if ($user->rights->projet->creer)
-			{
-				if ($userWrite > 0)
-				{
+			if ($user->rights->projet->creer) {
+				if ($userWrite > 0) {
 					print '<a class="butAction" href="card.php?id='.$object->id.'&action=clone">'.$langs->trans('ToClone').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ToClone').'</a>';
@@ -1340,10 +1304,8 @@ if ($action == 'create' && $user->rights->projet->creer)
 			}
 
 			// Delete
-			if ($user->rights->projet->supprimer || ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer))
-			{
-				if ($userDelete > 0 || ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer))
-				{
+			if ($user->rights->projet->supprimer || ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer)) {
+				if ($userDelete > 0 || ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer)) {
 					print '<a class="butActionDelete" href="card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Delete').'</a>';
@@ -1358,14 +1320,13 @@ if ($action == 'create' && $user->rights->projet->creer)
 		$action = 'presend';
 	}
 
-	if ($action != 'presend')
-	{
+	if ($action != 'presend') {
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
 
 		/*
-         * Documents generes
-         */
+		 * Documents generes
+		 */
 		$filename = dol_sanitizeFileName($object->ref);
 		$filedir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->ref);
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index c8ca952f9ed..c650512c5dd 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -33,7 +33,7 @@ class Projects extends DolibarrApi
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'ref',
 		'title'
 	);
@@ -110,23 +110,34 @@ class Projects extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as t";
 		if ($category > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_project as c";
 		}
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('project').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socids) {
+			$sql .= " AND t.fk_soc IN (".$socids.")";
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 		// Insert sale filter
-		if ($search_sale > 0)
-		{
+		if ($search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 		// Select projects of given category
@@ -134,10 +145,8 @@ class Projects extends DolibarrApi
 			$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_project = t.rowid ";
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -157,8 +166,7 @@ class Projects extends DolibarrApi
 		dol_syslog("API Rest request");
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			$i = 0;
@@ -197,12 +205,12 @@ class Projects extends DolibarrApi
 			$this->project->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
-          $lines = array();
-          foreach ($request_data["lines"] as $line) {
-            array_push($lines, (object) $line);
-          }
-          $this->project->lines = $lines;
-        }*/
+		  $lines = array();
+		  foreach ($request_data["lines"] as $line) {
+			array_push($lines, (object) $line);
+		  }
+		  $this->project->lines = $lines;
+		}*/
 		if ($this->project->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating project", array_merge(array($this->project->error), $this->project->errors));
 		}
@@ -236,14 +244,11 @@ class Projects extends DolibarrApi
 		}
 		$this->project->getLinesArray(DolibarrApiAccess::$user);
 		$result = array();
-		foreach ($this->project->lines as $line)      // $line is a task
-		{
-			if ($includetimespent == 1)
-			{
+		foreach ($this->project->lines as $line) {      // $line is a task
+			if ($includetimespent == 1) {
 				$timespent = $line->getSummaryOfTimeSpent(0);
 			}
-			if ($includetimespent == 1)
-			{
+			if ($includetimespent == 1) {
 				// TODO
 				// Add class for timespent records and loop and fill $line->lines with records of timespent
 			}
@@ -283,8 +288,7 @@ class Projects extends DolibarrApi
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 		$taskstatic = new Task($this->db);
 		$userp = DolibarrApiAccess::$user;
-		if ($userid > 0)
-		{
+		if ($userid > 0) {
 			$userp = new User($this->db);
 			$userp->fetch($userid);
 		}
@@ -308,56 +312,56 @@ class Projects extends DolibarrApi
 	 * @return int
 	 */
 	/*
-    public function postLine($id, $request_data = null)
-    {
-        if(! DolibarrApiAccess::$user->rights->projet->creer) {
-            throw new RestException(401);
-        }
+	public function postLine($id, $request_data = null)
+	{
+		if(! DolibarrApiAccess::$user->rights->projet->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $request_data = (object) $request_data;
-        $updateRes = $this->project->addline(
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        $request_data->fk_product,
-                        $request_data->remise_percent,
-                        $request_data->info_bits,
-                        $request_data->fk_remise_except,
-                        'HT',
-                        0,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->product_type,
-                        $request_data->rang,
-                        $request_data->special_code,
-                        $fk_parent_line,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->array_options,
-                        $request_data->fk_unit,
-                        $this->element,
-                        $request_data->id
-        );
+		if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$request_data = (object) $request_data;
+		$updateRes = $this->project->addline(
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						$request_data->fk_product,
+						$request_data->remise_percent,
+						$request_data->info_bits,
+						$request_data->fk_remise_except,
+						'HT',
+						0,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->rang,
+						$request_data->special_code,
+						$fk_parent_line,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->array_options,
+						$request_data->fk_unit,
+						$this->element,
+						$request_data->id
+		);
 
-        if ($updateRes > 0) {
-            return $updateRes;
+		if ($updateRes > 0) {
+			return $updateRes;
 
-        }
-        return false;
-    }
-    */
+		}
+		return false;
+	}
+	*/
 
 	/**
 	 * Update a task to given project
@@ -371,52 +375,52 @@ class Projects extends DolibarrApi
 	 * @return object
 	 */
 	/*
-    public function putLine($id, $lineid, $request_data = null)
-    {
-        if(! DolibarrApiAccess::$user->rights->projet->creer) {
-            throw new RestException(401);
-        }
+	public function putLine($id, $lineid, $request_data = null)
+	{
+		if(! DolibarrApiAccess::$user->rights->projet->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $request_data = (object) $request_data;
-        $updateRes = $this->project->updateline(
-                        $lineid,
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->remise_percent,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        'HT',
-                        $request_data->info_bits,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->product_type,
-                        $request_data->fk_parent_line,
-                        0,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->special_code,
-                        $request_data->array_options,
-                        $request_data->fk_unit
-        );
+		if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$request_data = (object) $request_data;
+		$updateRes = $this->project->updateline(
+						$lineid,
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->remise_percent,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						'HT',
+						$request_data->info_bits,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->fk_parent_line,
+						0,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->special_code,
+						$request_data->array_options,
+						$request_data->fk_unit
+		);
 
-        if ($updateRes > 0) {
-            $result = $this->get($id);
-            unset($result->line);
-            return $this->_cleanObjectDatas($result);
-        }
-        return false;
-    }*/
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
+		return false;
+	}*/
 
 
 
@@ -443,12 +447,13 @@ class Projects extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->project->$field = $value;
 		}
 
-		if ($this->project->update(DolibarrApiAccess::$user) >= 0)
-		{
+		if ($this->project->update(DolibarrApiAccess::$user) >= 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->project->error);
@@ -600,8 +605,9 @@ class Projects extends DolibarrApi
 	{
 		$object = array();
 		foreach (self::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$object[$field] = $data[$field];
 		}
 		return $object;
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index e7bf2c67ce8..518b3576e34 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -33,7 +33,7 @@ class Tasks extends DolibarrApi
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'ref',
 		'label',
 		'fk_project'
@@ -80,12 +80,10 @@ class Tasks extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if ($includetimespent == 1)
-		{
+		if ($includetimespent == 1) {
 			$timespent = $this->task->getSummaryOfTimeSpent(0);
 		}
-		if ($includetimespent == 1)
-		{
+		if ($includetimespent == 1) {
 			// TODO
 			// Add class for timespent records and loop and fill $line->lines with records of timespent
 		}
@@ -118,28 +116,37 @@ class Tasks extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t";
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('project').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socids) {
+			$sql .= " AND t.fk_soc IN (".$socids.")";
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 		// Insert sale filter
-		if ($search_sale > 0)
-		{
+		if ($search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -148,8 +155,7 @@ class Tasks extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -160,13 +166,11 @@ class Tasks extends DolibarrApi
 		dol_syslog("API Rest request");
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			$i = 0;
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$task_static = new Task($this->db);
 				if ($task_static->fetch($obj->rowid)) {
@@ -201,12 +205,12 @@ class Tasks extends DolibarrApi
 			$this->task->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
-          $lines = array();
-          foreach ($request_data["lines"] as $line) {
-            array_push($lines, (object) $line);
-          }
-          $this->project->lines = $lines;
-        }*/
+		  $lines = array();
+		  foreach ($request_data["lines"] as $line) {
+			array_push($lines, (object) $line);
+		  }
+		  $this->project->lines = $lines;
+		}*/
 		if ($this->task->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating task", array_merge(array($this->task->error), $this->task->errors));
 		}
@@ -223,38 +227,38 @@ class Tasks extends DolibarrApi
 	//  * @url	GET {id}/tasks
 	//  */
 	/*
-    public function getLines($id, $includetimespent=0)
-    {
-        if(! DolibarrApiAccess::$user->rights->projet->lire) {
-            throw new RestException(401);
-        }
+	public function getLines($id, $includetimespent=0)
+	{
+		if(! DolibarrApiAccess::$user->rights->projet->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $this->project->getLinesArray(DolibarrApiAccess::$user);
-        $result = array();
-        foreach ($this->project->lines as $line)      // $line is a task
-        {
-            if ($includetimespent == 1)
-            {
-                $timespent = $line->getSummaryOfTimeSpent(0);
-            }
-            if ($includetimespent == 1)
-            {
-                // TODO
-                // Add class for timespent records and loop and fill $line->lines with records of timespent
-            }
-            array_push($result,$this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
-    */
+		if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->project->getLinesArray(DolibarrApiAccess::$user);
+		$result = array();
+		foreach ($this->project->lines as $line)      // $line is a task
+		{
+			if ($includetimespent == 1)
+			{
+				$timespent = $line->getSummaryOfTimeSpent(0);
+			}
+			if ($includetimespent == 1)
+			{
+				// TODO
+				// Add class for timespent records and loop and fill $line->lines with records of timespent
+			}
+			array_push($result,$this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
+	*/
 
 	/**
 	 * Get roles a user is assigned to a task with
@@ -284,8 +288,7 @@ class Tasks extends DolibarrApi
 		}
 
 		$usert = DolibarrApiAccess::$user;
-		if ($userid > 0)
-		{
+		if ($userid > 0) {
 			$usert = new User($this->db);
 			$usert->fetch($userid);
 		}
@@ -309,56 +312,56 @@ class Tasks extends DolibarrApi
 	//  * @return int
 	//  */
 	/*
-    public function postLine($id, $request_data = null)
-    {
-        if(! DolibarrApiAccess::$user->rights->projet->creer) {
-            throw new RestException(401);
-        }
+	public function postLine($id, $request_data = null)
+	{
+		if(! DolibarrApiAccess::$user->rights->projet->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $request_data = (object) $request_data;
-        $updateRes = $this->project->addline(
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        $request_data->fk_product,
-                        $request_data->remise_percent,
-                        $request_data->info_bits,
-                        $request_data->fk_remise_except,
-                        'HT',
-                        0,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->product_type,
-                        $request_data->rang,
-                        $request_data->special_code,
-                        $fk_parent_line,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->array_options,
-                        $request_data->fk_unit,
-                        $this->element,
-                        $request_data->id
-        );
+		if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$request_data = (object) $request_data;
+		$updateRes = $this->project->addline(
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						$request_data->fk_product,
+						$request_data->remise_percent,
+						$request_data->info_bits,
+						$request_data->fk_remise_except,
+						'HT',
+						0,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->rang,
+						$request_data->special_code,
+						$fk_parent_line,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->array_options,
+						$request_data->fk_unit,
+						$this->element,
+						$request_data->id
+		);
 
-        if ($updateRes > 0) {
-            return $updateRes;
+		if ($updateRes > 0) {
+			return $updateRes;
 
-        }
-        return false;
-    }
-    */
+		}
+		return false;
+	}
+	*/
 
 	// /**
 	//  * Update a task to given project
@@ -372,52 +375,52 @@ class Tasks extends DolibarrApi
 	//  * @return object
 	//  */
 	/*
-    public function putLine($id, $lineid, $request_data = null)
-    {
-        if(! DolibarrApiAccess::$user->rights->projet->creer) {
-            throw new RestException(401);
-        }
+	public function putLine($id, $lineid, $request_data = null)
+	{
+		if(! DolibarrApiAccess::$user->rights->projet->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->project->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Project not found');
-        }
+		$result = $this->project->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Project not found');
+		}
 
-        if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $request_data = (object) $request_data;
-        $updateRes = $this->project->updateline(
-                        $lineid,
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->remise_percent,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        'HT',
-                        $request_data->info_bits,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->product_type,
-                        $request_data->fk_parent_line,
-                        0,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->special_code,
-                        $request_data->array_options,
-                        $request_data->fk_unit
-        );
+		if( ! DolibarrApi::_checkAccessToResource('project',$this->project->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$request_data = (object) $request_data;
+		$updateRes = $this->project->updateline(
+						$lineid,
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->remise_percent,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						'HT',
+						$request_data->info_bits,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->fk_parent_line,
+						0,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->special_code,
+						$request_data->array_options,
+						$request_data->fk_unit
+		);
 
-        if ($updateRes > 0) {
-            $result = $this->get($id);
-            unset($result->line);
-            return $this->_cleanObjectDatas($result);
-        }
-        return false;
-    }*/
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
+		return false;
+	}*/
 
 
 	/**
@@ -443,12 +446,13 @@ class Tasks extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->task->$field = $value;
 		}
 
-		if ($this->task->update(DolibarrApiAccess::$user) > 0)
-		{
+		if ($this->task->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->task->error);
@@ -519,7 +523,9 @@ class Tasks extends DolibarrApi
 		}
 
 		$uid = $user_id;
-		if (empty($uid)) $uid = DolibarrApiAccess::$user->id;
+		if (empty($uid)) {
+			$uid = DolibarrApiAccess::$user->id;
+		}
 
 		$newdate = dol_stringtotime($date, 1);
 		$this->task->timespent_date = $newdate;
@@ -607,8 +613,9 @@ class Tasks extends DolibarrApi
 	{
 		$object = array();
 		foreach (self::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$object[$field] = $data[$field];
 		}
 		return $object;
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index d693bb94468..f28eccf3982 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -245,7 +245,9 @@ class Project extends CommonObject
 
 		global $conf;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+			$this->fields['rowid']['visible'] = 0;
+		}
 
 		if (empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 			$this->fields['fk_opp_status']['enabled'] = 0;
@@ -289,14 +291,12 @@ class Project extends CommonObject
 		$this->note_public = dol_substr($this->note_public, 0, 65535);
 
 		// Check parameters
-		if (!trim($this->ref))
-		{
+		if (!trim($this->ref)) {
 			$this->error = 'ErrorFieldsRequired';
 			dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
 			return -1;
 		}
-		if (!empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) && !($this->socid > 0))
-		{
+		if (!empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) && !($this->socid > 0)) {
 			$this->error = 'ErrorFieldsRequired';
 			dol_syslog(get_class($this)."::create error -1 thirdparty not defined and option PROJECT_THIRDPARTY_REQUIRED is set", LOG_ERR);
 			return -1;
@@ -363,16 +363,16 @@ class Project extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet");
 			$ret = $this->id;
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('PROJECT_CREATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		} else {
@@ -384,20 +384,19 @@ class Project extends CommonObject
 		// Update extrafield
 		if (!$error) {
 			$result = $this->insertExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 			}
 		}
 
-		if (!$error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
-		{
+		if (!$error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS)) {
 			$res = $this->setValid($user);
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $ret;
 		} else {
@@ -422,10 +421,13 @@ class Project extends CommonObject
 		// Clean parameters
 		$this->title = trim($this->title);
 		$this->description = trim($this->description);
-		if ($this->opp_amount < 0) $this->opp_amount = '';
-		if ($this->opp_percent < 0) $this->opp_percent = '';
-		if ($this->date_end && $this->date_end < $this->date_start)
-		{
+		if ($this->opp_amount < 0) {
+			$this->opp_amount = '';
+		}
+		if ($this->opp_percent < 0) {
+			$this->opp_percent = '';
+		}
+		if ($this->date_end && $this->date_end < $this->date_start) {
 			$this->error = $langs->trans("ErrorDateEndLowerThanDateStart");
 			$this->errors[] = $this->error;
 			$this->db->rollback();
@@ -433,8 +435,7 @@ class Project extends CommonObject
 			return -3;
 		}
 
-		if (dol_strlen(trim($this->ref)) > 0)
-		{
+		if (dol_strlen(trim($this->ref)) > 0) {
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."projet SET";
@@ -466,39 +467,33 @@ class Project extends CommonObject
 
 			dol_syslog(get_class($this)."::update", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				// Update extrafield
-				if (!$error)
-				{
+				if (!$error) {
 					$result = $this->insertExtraFields();
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 					}
 				}
 
-				if (!$error && !$notrigger)
-				{
+				if (!$error && !$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('PROJECT_MODIFY', $user);
-					if ($result < 0) { $error++; }
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 
-				if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
-				{
+				if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref)) {
 					// We remove directory
-					if ($conf->projet->dir_output)
-					{
+					if ($conf->projet->dir_output) {
 						$olddir = $conf->projet->dir_output."/".dol_sanitizeFileName($this->oldcopy->ref);
 						$newdir = $conf->projet->dir_output."/".dol_sanitizeFileName($this->ref);
-						if (file_exists($olddir))
-						{
+						if (file_exists($olddir)) {
 							include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 							$res = @rename($olddir, $newdir);
-							if (!$res)
-							{
+							if (!$res) {
 								$langs->load("errors");
 								$this->error = $langs->trans('ErrorFailToRenameDir', $olddir, $newdir);
 								$error++;
@@ -506,8 +501,7 @@ class Project extends CommonObject
 						}
 					}
 				}
-				if (!$error)
-				{
+				if (!$error) {
 					$this->db->commit();
 					$result = 1;
 				} else {
@@ -518,8 +512,7 @@ class Project extends CommonObject
 				$this->error = $this->db->lasterror();
 				$this->errors[] = $this->error;
 				$this->db->rollback();
-				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
+				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					$result = -4;
 				} else {
 					$result = -2;
@@ -547,15 +540,16 @@ class Project extends CommonObject
 	{
 		global $conf;
 
-		if (empty($id) && empty($ref)) return -1;
+		if (empty($id) && empty($ref)) {
+			return -1;
+		}
 
 		$sql = "SELECT rowid, entity, ref, title, description, public, datec, opp_amount, budget_amount,";
 		$sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut as status, fk_opp_status, opp_percent,";
 		$sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, email_msgid,";
 		$sql .= " accept_conference_suggestions, accept_booth_suggestions, price_registration, price_booth";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet";
-		if (!empty($id))
-		{
+		if (!empty($id)) {
 			$sql .= " WHERE rowid = ".$id;
 		} else {
 			$sql .= " WHERE entity IN (".getEntity('project').")";
@@ -570,12 +564,10 @@ class Project extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_rows = $this->db->num_rows($resql);
 
-			if ($num_rows)
-			{
+			if ($num_rows) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -653,27 +645,23 @@ class Project extends CommonObject
 
 		$elements = array();
 
-		if ($this->id <= 0) return $elements;
+		if ($this->id <= 0) {
+			return $elements;
+		}
 
 		$ids = $this->id;
 
-		if ($type == 'agenda')
-		{
+		if ($type == 'agenda') {
 			$sql = "SELECT id as rowid FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project IN (".$ids.") AND entity IN (".getEntity('agenda').")";
-		} elseif ($type == 'expensereport')
-		{
+		} elseif ($type == 'expensereport') {
 			$sql = "SELECT ed.rowid FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND e.entity IN (".getEntity('expensereport').") AND ed.fk_projet IN (".$ids.")";
-		} elseif ($type == 'project_task')
-		{
+		} elseif ($type == 'project_task') {
 			$sql = "SELECT DISTINCT pt.rowid FROM ".MAIN_DB_PREFIX."projet_task as pt WHERE pt.fk_projet IN (".$ids.")";
-		} elseif ($type == 'project_task_time')	// Case we want to duplicate line foreach user
-		{
+		} elseif ($type == 'project_task_time') {	// Case we want to duplicate line foreach user
 			$sql = "SELECT DISTINCT pt.rowid, ptt.fk_user FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet IN (".$ids.")";
-		} elseif ($type == 'stock_mouvement')
-		{
+		} elseif ($type == 'stock_mouvement') {
 			$sql = 'SELECT ms.rowid, ms.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."stock_mouvement as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin IN (".$ids.") AND ms.type_mouvement = 1";
-		} elseif ($type == 'loan')
-		{
+		} elseif ($type == 'loan') {
 			$sql = 'SELECT l.rowid, l.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet IN (".$ids.")";
 		} else {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." IN (".$ids.") AND entity IN (".getEntity($type).")";
@@ -681,19 +669,25 @@ class Project extends CommonObject
 
 		if ($dates > 0 && $type == 'loan') {
 			$sql .= " AND (dateend > '".$this->db->idate($dates)."' OR dateend IS NULL)";
-		} elseif ($dates > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
-		{
-			if (empty($datefieldname) && !empty($this->table_element_date)) $datefieldname = $this->table_element_date;
-			if (empty($datefieldname)) return 'Error this object has no date field defined';
+		} elseif ($dates > 0 && ($type != 'project_task')) {	// For table project_taks, we want the filter on date apply on project_time_spent table
+			if (empty($datefieldname) && !empty($this->table_element_date)) {
+				$datefieldname = $this->table_element_date;
+			}
+			if (empty($datefieldname)) {
+				return 'Error this object has no date field defined';
+			}
 			$sql .= " AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
 		}
 
 		if ($datee > 0 && $type == 'loan') {
 			$sql .= " AND (datestart < '".$this->db->idate($datee)."' OR datestart IS NULL)";
-		} elseif ($datee > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
-		{
-			if (empty($datefieldname) && !empty($this->table_element_date)) $datefieldname = $this->table_element_date;
-			if (empty($datefieldname)) return 'Error this object has no date field defined';
+		} elseif ($datee > 0 && ($type != 'project_task')) {	// For table project_taks, we want the filter on date apply on project_time_spent table
+			if (empty($datefieldname) && !empty($this->table_element_date)) {
+				$datefieldname = $this->table_element_date;
+			}
+			if (empty($datefieldname)) {
+				return 'Error this object has no date field defined';
+			}
 			$sql .= " AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
 		}
 
@@ -707,22 +701,24 @@ class Project extends CommonObject
 			'fk_projet' => $projectkey
 		);
 		$reshook = $hookmanager->executeHooks('getElementList', $parameters, $object, $action);
-		if ($reshook > 0) $sql = $hookmanager->resPrint;
-		else $sql .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$sql = $hookmanager->resPrint;
+		} else {
+			$sql .= $hookmanager->resPrint;
+		}
 
-		if (!$sql) return -1;
+		if (!$sql) {
+			return -1;
+		}
 
 		//print $sql;
 		dol_syslog(get_class($this)."::get_element_list", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$nump = $this->db->num_rows($result);
-			if ($nump)
-			{
+			if ($nump) {
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($result);
 
 					$elements[$i] = $obj->rowid.(empty($obj->fk_user) ? '' : '_'.$obj->fk_user);
@@ -755,12 +751,10 @@ class Project extends CommonObject
 
 		$this->db->begin();
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Delete linked contacts
 			$res = $this->delete_linked_contact();
-			if ($res < 0)
-			{
+			if ($res < 0) {
 				$this->error = 'ErrorFailToDeleteLinkedContact';
 				//$error++;
 				$this->db->rollback();
@@ -775,12 +769,10 @@ class Project extends CommonObject
 			'expensereport_det'=>'fk_projet', 'contrat'=>'fk_projet', 'fichinter'=>'fk_projet', 'don'=>'fk_projet',
 			'actioncomm'=>'fk_project', 'mrp_mo'=>'fk_project'
 		);
-		foreach ($listoftables as $key => $value)
-		{
+		foreach ($listoftables as $key => $value) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$key." SET ".$value." = NULL where ".$value." = ".$this->id;
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 				break;
@@ -804,14 +796,15 @@ class Project extends CommonObject
 
 		// Delete tasks
 		$ret = $this->deleteTasks($user);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
 
 		// Delete all child tables
 		if (!$error) {
 			$elements = array('categorie_project'); // elements to delete. TODO Make goodway to delete
-			foreach ($elements as $table)
-			{
+			foreach ($elements as $table) {
 				if (!$error) {
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
 					$sql .= " WHERE fk_project = ".$this->id;
@@ -825,28 +818,24 @@ class Project extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_extrafields";
 			$sql .= " WHERE fk_object=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
 		}
 
 		// Delete project
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet";
 			$sql .= " WHERE rowid=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $langs->trans("CantRemoveProject", $langs->transnoentitiesnoconv("ProjectOverview"));
 				$error++;
 			}
@@ -868,8 +857,7 @@ class Project extends CommonObject
 				}
 			}
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('PROJECT_DELETE', $user);
 
@@ -880,13 +868,11 @@ class Project extends CommonObject
 			}
 		}
 
-		if (empty($error))
-		{
+		if (empty($error)) {
 			$this->db->commit();
 			return 1;
 		} else {
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -906,7 +892,9 @@ class Project extends CommonObject
 	 */
 	public function getElementCount($type, $tablename, $projectkey = 'fk_projet')
 	{
-		if ($this->id <= 0) return 0;
+		if ($this->id <= 0) {
+			return 0;
+		}
 
 		if ($type == 'agenda') {
 			$sql = "SELECT COUNT(id) as nb FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project = ".$this->id." AND entity IN (".getEntity('agenda').")";
@@ -926,7 +914,9 @@ class Project extends CommonObject
 
 		$result = $this->db->query($sql);
 
-		if (!$result) return 0;
+		if (!$result) {
+			return 0;
+		}
 
 		$obj = $this->db->fetch_object($result);
 
@@ -945,15 +935,12 @@ class Project extends CommonObject
 	{
 		$countTasks = count($this->lines);
 		$deleted = false;
-		if ($countTasks)
-		{
-			foreach ($this->lines as $task)
-			{
+		if ($countTasks) {
+			foreach ($this->lines as $task) {
 				if ($task->hasChildren() <= 0) {		// If there is no children (or error to detect them)
 					$deleted = true;
 					$ret = $task->delete($user);
-					if ($ret <= 0)
-					{
+					if ($ret <= 0) {
 						$this->errors[] = $this->db->lasterror();
 						return -1;
 					}
@@ -961,9 +948,10 @@ class Project extends CommonObject
 			}
 		}
 		$this->getLinesArray($user);
-		if ($deleted && count($this->lines) < $countTasks)
-		{
-			if (count($this->lines)) $this->deleteTasks($this->lines);
+		if ($deleted && count($this->lines) < $countTasks) {
+			if (count($this->lines)) {
+				$this->deleteTasks($this->lines);
+			}
 		}
 
 		return 1;
@@ -982,11 +970,9 @@ class Project extends CommonObject
 
 		$error = 0;
 
-		if ($this->statut != 1)
-		{
+		if ($this->statut != 1) {
 			// Check parameters
-			if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->title))
-			{
+			if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->title)) {
 				$this->error = $langs->trans("ErrorFieldFormat", $langs->transnoentities("Label")).'. '.$langs->trans('RemoveString', $langs->transnoentitiesnoconv("CopyOf"));
 				return -1;
 			}
@@ -1000,18 +986,17 @@ class Project extends CommonObject
 
 			dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				// Call trigger
-				if (empty($notrigger))
-				{
+				if (empty($notrigger)) {
 					$result = $this->call_trigger('PROJECT_VALIDATE', $user);
-					if ($result < 0) { $error++; }
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$this->statut = 1;
 					$this->db->commit();
 					return 1;
@@ -1043,8 +1028,7 @@ class Project extends CommonObject
 
 		$error = 0;
 
-		if ($this->statut != self::STATUS_CLOSED)
-		{
+		if ($this->statut != self::STATUS_CLOSED) {
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."projet";
@@ -1052,22 +1036,21 @@ class Project extends CommonObject
 			$sql .= " WHERE rowid = ".$this->id;
 			$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
 
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-			{
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 				// TODO What to do if fk_opp_status is not code 'WON' or 'LOST'
 			}
 
 			dol_syslog(get_class($this)."::setClose", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				// Call trigger
 				$result = $this->call_trigger('PROJECT_CLOSE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 
-				if (!$error)
-				{
+				if (!$error) {
 					$this->statut = 2;
 					$this->db->commit();
 					return 1;
@@ -1142,7 +1125,9 @@ class Project extends CommonObject
 	{
 		global $conf, $langs, $user, $hookmanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 		if (!empty($conf->global->PROJECT_OPEN_ALWAYS_ON_TAB)) {
@@ -1150,7 +1135,9 @@ class Project extends CommonObject
 		}
 
 		$label = '';
-		if ($option != 'nolink') $label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Project").'</u>';
+		if ($option != 'nolink') {
+			$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Project").'</u>';
+		}
 		if (isset($this->status)) {
 			$label .= ' '.$this->getLibStatut(5);
 		}
@@ -1168,60 +1155,73 @@ class Project extends CommonObject
 		if (!empty($this->datee)) {
 			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateEnd').': </b>'.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
 		}
-		if ($moreinpopup) $label .= '<br>'.$moreinpopup;
+		if ($moreinpopup) {
+			$label .= '<br>'.$moreinpopup;
+		}
 
 		$url = '';
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			if (preg_match('/\.php$/', $option)) {
 				$url = dol_buildpath($option, 1).'?id='.$this->id;
-			} elseif ($option == 'task')
-			{
+			} elseif ($option == 'task') {
 				$url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id;
-			} elseif ($option == 'preview')
-			{
+			} elseif ($option == 'preview') {
 				$url = DOL_URL_ROOT.'/projet/element.php?id='.$this->id;
 			} else {
 				$url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id;
 			}
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip) && $user->rights->projet->lire)
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip) && $user->rights->projet->lire) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowProject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$picto = 'projectpub';
-		if (!$this->public) $picto = 'project';
+		if (!$this->public) {
+			$picto = 'project';
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
-		if ($withpicto != 2) $result .= (($addlabel && $this->title) ? $sep.dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
+		if ($withpicto != 2) {
+			$result .= (($addlabel && $this->title) ? $sep.dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
+		}
 
 		global $action;
 		$hookmanager->initHooks(array('projectdao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -1285,32 +1285,38 @@ class Project extends CommonObject
 	{
 		// To verify role of users
 		$userAccess = 0;
-		if (($mode == 'read' && !empty($user->rights->projet->all->lire)) || ($mode == 'write' && !empty($user->rights->projet->all->creer)) || ($mode == 'delete' && !empty($user->rights->projet->all->supprimer)))
-		{
+		if (($mode == 'read' && !empty($user->rights->projet->all->lire)) || ($mode == 'write' && !empty($user->rights->projet->all->creer)) || ($mode == 'delete' && !empty($user->rights->projet->all->supprimer))) {
 			$userAccess = 1;
-		} elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer))))
-		{
+		} elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer)))) {
 			$userAccess = 1;
 		} else {	// No access due to permission to read all projects, so we check if we are a contact of project
-			foreach (array('internal', 'external') as $source)
-			{
+			foreach (array('internal', 'external') as $source) {
 				$userRole = $this->liste_contact(4, $source);
 				$num = count($userRole);
 
 				$nblinks = 0;
-				while ($nblinks < $num)
-				{
-					if ($source == 'internal' && $user->id == $userRole[$nblinks]['id'])	// $userRole[$nblinks]['id'] is id of user (llx_user) for internal contacts
-					{
-						if ($mode == 'read' && $user->rights->projet->lire)      $userAccess++;
-						if ($mode == 'write' && $user->rights->projet->creer)     $userAccess++;
-						if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++;
+				while ($nblinks < $num) {
+					if ($source == 'internal' && $user->id == $userRole[$nblinks]['id']) {	// $userRole[$nblinks]['id'] is id of user (llx_user) for internal contacts
+						if ($mode == 'read' && $user->rights->projet->lire) {
+							$userAccess++;
+						}
+						if ($mode == 'write' && $user->rights->projet->creer) {
+							$userAccess++;
+						}
+						if ($mode == 'delete' && $user->rights->projet->supprimer) {
+							$userAccess++;
+						}
 					}
-					if ($source == 'external' && $user->socid > 0 && $user->socid == $userRole[$nblinks]['socid'])	// $userRole[$nblinks]['id'] is id of contact (llx_socpeople) or external contacts
-					{
-						if ($mode == 'read' && $user->rights->projet->lire)      $userAccess++;
-						if ($mode == 'write' && $user->rights->projet->creer)     $userAccess++;
-						if ($mode == 'delete' && $user->rights->projet->supprimer) $userAccess++;
+					if ($source == 'external' && $user->socid > 0 && $user->socid == $userRole[$nblinks]['socid']) {	// $userRole[$nblinks]['id'] is id of contact (llx_socpeople) or external contacts
+						if ($mode == 'read' && $user->rights->projet->lire) {
+							$userAccess++;
+						}
+						if ($mode == 'write' && $user->rights->projet->creer) {
+							$userAccess++;
+						}
+						if ($mode == 'delete' && $user->rights->projet->supprimer) {
+							$userAccess++;
+						}
 					}
 					$nblinks++;
 				}
@@ -1344,20 +1350,19 @@ class Project extends CommonObject
 
 		$sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = p.rowid";
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
-		} elseif ($mode == 2)
-		{
+		} elseif ($mode == 2) {
 			// No filter. Use this if user has permission to see all project
 		}
 		$sql .= " WHERE p.entity IN (".getEntity('project').")";
 		// Internal users must see project he is contact to even if project linked to a third party he can't see.
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if ($socid > 0) $sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		if ($socid > 0) {
+			$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		}
 
 		// Get id of types of contacts for projects (This list never contains a lot of elements)
 		$listofprojectcontacttype = array();
@@ -1365,30 +1370,29 @@ class Project extends CommonObject
 		$sql2 .= " WHERE ctc.element = '".$this->db->escape($this->element)."'";
 		$sql2 .= " AND ctc.source = 'internal'";
 		$resql = $this->db->query($sql2);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$listofprojectcontacttype[$obj->rowid] = $obj->code;
 			}
-		} else dol_print_error($this->db);
-		if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid syntax error if not found
+		} else {
+			dol_print_error($this->db);
+		}
+		if (count($listofprojectcontacttype) == 0) {
+			$listofprojectcontacttype[0] = '0'; // To avoid syntax error if not found
+		}
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			$sql .= " AND ( p.public = 1";
 			$sql .= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
 			$sql .= " AND ec.fk_socpeople = ".$user->id.")";
 			$sql .= " )";
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			$sql .= " AND ec.element_id = p.rowid";
 			$sql .= " AND (";
 			$sql .= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
 			$sql .= " AND ec.fk_socpeople = ".$user->id.")";
 			$sql .= " )";
-		} elseif ($mode == 2)
-		{
+		} elseif ($mode == 2) {
 			// No filter. Use this if user has permission to see all project
 		}
 
@@ -1396,12 +1400,10 @@ class Project extends CommonObject
 		//print $sql;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $this->db->fetch_row($resql);
 				$projects[$row[0]] = $row[1];
 				$temp[] = $row[0];
@@ -1410,9 +1412,10 @@ class Project extends CommonObject
 
 			$this->db->free($resql);
 
-			if ($list)
-			{
-				if (empty($temp)) return '0';
+			if ($list) {
+				if (empty($temp)) {
+					return '0';
+				}
 				$result = implode(',', $temp);
 				return $result;
 			}
@@ -1457,7 +1460,9 @@ class Project extends CommonObject
 		// Load source object
 		$clone_project->fetch($fromid);
 		$clone_project->fetch_optionals();
-		if ($newthirdpartyid > 0) $clone_project->socid = $newthirdpartyid;
+		if ($newthirdpartyid > 0) {
+			$clone_project->socid = $newthirdpartyid;
+		}
 		$clone_project->fetch_thirdparty();
 
 		$orign_dt_start = $clone_project->date_start;
@@ -1466,16 +1471,14 @@ class Project extends CommonObject
 		$clone_project->id = 0;
 		if ($move_date) {
 			$clone_project->date_start = $now;
-			if (!(empty($clone_project->date_end)))
-			{
+			if (!(empty($clone_project->date_end))) {
 				$clone_project->date_end = $clone_project->date_end + ($now - $orign_dt_start);
 			}
 		}
 
 		$clone_project->datec = $now;
 
-		if (!$clone_note)
-		{
+		if (!$clone_note) {
 			$clone_project->note_private = '';
 			$clone_project->note_public = '';
 		}
@@ -1486,11 +1489,9 @@ class Project extends CommonObject
 		// Search template files
 		$file = ''; $classname = ''; $filefound = 0;
 		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-		foreach ($dirmodels as $reldir)
-		{
+		foreach ($dirmodels as $reldir) {
 			$file = dol_buildpath($reldir."core/modules/project/".$obj.'.php', 0);
-			if (file_exists($file))
-			{
+			if (file_exists($file)) {
 				$filefound = 1;
 				dol_include_once($reldir."core/modules/project/".$obj.'.php');
 				$modProject = new $obj;
@@ -1498,7 +1499,9 @@ class Project extends CommonObject
 				break;
 			}
 		}
-		if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+		if (is_numeric($defaultref) && $defaultref <= 0) {
+			$defaultref = '';
+		}
 
 		$clone_project->ref = $defaultref;
 		$clone_project->title = $langs->trans("CopyOf").' '.$clone_project->title;
@@ -1507,27 +1510,23 @@ class Project extends CommonObject
 		$result = $clone_project->create($user, $notrigger);
 
 		// Other options
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error .= $clone_project->error;
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			//Get the new project id
 			$clone_project_id = $clone_project->id;
 
 			//Note Update
-			if (!$clone_note)
-			{
+			if (!$clone_note) {
 				$clone_project->note_private = '';
 				$clone_project->note_public = '';
 			} else {
 				$this->db->begin();
 				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES | ENT_HTML5), '_public');
-				if ($res < 0)
-				{
+				if ($res < 0) {
 					$this->error .= $clone_project->error;
 					$error++;
 					$this->db->rollback();
@@ -1537,8 +1536,7 @@ class Project extends CommonObject
 
 				$this->db->begin();
 				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES | ENT_HTML5), '_private');
-				if ($res < 0)
-				{
+				if ($res < 0) {
 					$this->error .= $clone_project->error;
 					$error++;
 					$this->db->rollback();
@@ -1548,26 +1546,21 @@ class Project extends CommonObject
 			}
 
 			//Duplicate contact
-			if ($clone_contact)
-			{
+			if ($clone_contact) {
 				$origin_project = new Project($this->db);
 				$origin_project->fetch($fromid);
 
-				foreach (array('internal', 'external') as $source)
-				{
+				foreach (array('internal', 'external') as $source) {
 					$tab = $origin_project->liste_contact(-1, $source);
 
-					foreach ($tab as $contacttoadd)
-					{
+					foreach ($tab as $contacttoadd) {
 						$clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'], $notrigger);
-						if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-						{
+						if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 							$langs->load("errors");
 							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
 						} else {
-							if ($clone_project->error != '')
-							{
+							if ($clone_project->error != '') {
 								$this->error .= $clone_project->error;
 								$error++;
 							}
@@ -1577,21 +1570,17 @@ class Project extends CommonObject
 			}
 
 			//Duplicate file
-			if ($clone_project_file)
-			{
+			if ($clone_project_file) {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 				$clone_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($defaultref);
 				$ori_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($orign_project_ref);
 
-				if (dol_mkdir($clone_project_dir) >= 0)
-				{
+				if (dol_mkdir($clone_project_dir) >= 0) {
 					$filearray = dol_dir_list($ori_project_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
-					foreach ($filearray as $key => $file)
-					{
+					foreach ($filearray as $key => $file) {
 						$rescopy = dol_copy($ori_project_dir.'/'.$file['name'], $clone_project_dir.'/'.$file['name'], 0, 1);
-						if (is_numeric($rescopy) && $rescopy < 0)
-						{
+						if (is_numeric($rescopy) && $rescopy < 0) {
 							$this->error .= $langs->trans("ErrorFailToCopyFile", $ori_project_dir.'/'.$file['name'], $clone_project_dir.'/'.$file['name']);
 							$error++;
 						}
@@ -1603,26 +1592,25 @@ class Project extends CommonObject
 			}
 
 			//Duplicate task
-			if ($clone_task)
-			{
+			if ($clone_task) {
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
 				$taskstatic = new Task($this->db);
 
 				// Security check
 				$socid = 0;
-				if ($user->socid > 0) $socid = $user->socid;
+				if ($user->socid > 0) {
+					$socid = $user->socid;
+				}
 
 				$tasksarray = $taskstatic->getTasksArray(0, 0, $fromid, $socid, 0);
 
 				$tab_conv_child_parent = array();
 
 				// Loop on each task, to clone it
-				foreach ($tasksarray as $tasktoclone)
-				{
+				foreach ($tasksarray as $tasktoclone) {
 					$result_clone = $taskstatic->createFromClone($user, $tasktoclone->id, $clone_project_id, $tasktoclone->fk_parent, $move_date, true, false, $clone_task_file, true, false);
-					if ($result_clone <= 0)
-					{
+					if ($result_clone <= 0) {
 						$this->error .= $result_clone->error;
 						$error++;
 					} else {
@@ -1631,8 +1619,7 @@ class Project extends CommonObject
 
 						//manage new parent clone task id
 						// if the current task has child we store the original task id and the equivalent clone task id
-						if (($taskstatic->hasChildren()) && !array_key_exists($tasktoclone->id, $tab_conv_child_parent))
-						{
+						if (($taskstatic->hasChildren()) && !array_key_exists($tasktoclone->id, $tab_conv_child_parent)) {
 							$tab_conv_child_parent[$tasktoclone->id] = $new_task_id;
 						}
 					}
@@ -1640,16 +1627,13 @@ class Project extends CommonObject
 
 				//Parse all clone node to be sure to update new parent
 				$tasksarray = $taskstatic->getTasksArray(0, 0, $clone_project_id, $socid, 0);
-				foreach ($tasksarray as $task_cloned)
-				{
+				foreach ($tasksarray as $task_cloned) {
 					$taskstatic->fetch($task_cloned->id);
-					if ($taskstatic->fk_task_parent != 0)
-					{
+					if ($taskstatic->fk_task_parent != 0) {
 						$taskstatic->fk_task_parent = $tab_conv_child_parent[$taskstatic->fk_task_parent];
 					}
 					$res = $taskstatic->update($user, $notrigger);
-					if ($result_clone <= 0)
-					{
+					if ($result_clone <= 0) {
 						$this->error .= $taskstatic->error;
 						$error++;
 					}
@@ -1659,8 +1643,7 @@ class Project extends CommonObject
 
 		unset($clone_project->context['createfromclone']);
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $clone_project_id;
 		} else {
@@ -1687,22 +1670,21 @@ class Project extends CommonObject
 
 		// Security check
 		$socid = 0;
-		if ($user->socid > 0) $socid = $user->socid;
+		if ($user->socid > 0) {
+			$socid = $user->socid;
+		}
 
 		$tasksarray = $taskstatic->getTasksArray(0, 0, $this->id, $socid, 0);
 
-		foreach ($tasksarray as $tasktoshiftdate)
-		{
+		foreach ($tasksarray as $tasktoshiftdate) {
 			$to_update = false;
 			// Fetch only if update of date will be made
-			if ((!empty($tasktoshiftdate->date_start)) || (!empty($tasktoshiftdate->date_end)))
-			{
+			if ((!empty($tasktoshiftdate->date_start)) || (!empty($tasktoshiftdate->date_end))) {
 				//dol_syslog(get_class($this)."::shiftTaskDate to_update", LOG_DEBUG);
 				$to_update = true;
 				$task = new Task($this->db);
 				$result = $task->fetch($tasktoshiftdate->id);
-				if (!$result)
-				{
+				if (!$result) {
 					$error++;
 					$this->error .= $task->error;
 				}
@@ -1710,29 +1692,24 @@ class Project extends CommonObject
 			//print "$this->date_start + $tasktoshiftdate->date_start - $old_project_dt_start";exit;
 
 			//Calcultate new task start date with difference between old proj start date and origin task start date
-			if (!empty($tasktoshiftdate->date_start))
-			{
+			if (!empty($tasktoshiftdate->date_start)) {
 				$task->date_start = $this->date_start + ($tasktoshiftdate->date_start - $old_project_dt_start);
 			}
 
 			//Calcultate new task end date with difference between origin proj end date and origin task end date
-			if (!empty($tasktoshiftdate->date_end))
-			{
+			if (!empty($tasktoshiftdate->date_end)) {
 				$task->date_end = $this->date_start + ($tasktoshiftdate->date_end - $old_project_dt_start);
 			}
 
-			if ($to_update)
-			{
+			if ($to_update) {
 				$result = $task->update($user);
-				if (!$result)
-				{
+				if (!$result) {
 					$error++;
 					$this->error .= $task->error;
 				}
 			}
 		}
-		if ($error != 0)
-		{
+		if ($error != 0) {
 			return -1;
 		}
 		return $result;
@@ -1752,8 +1729,7 @@ class Project extends CommonObject
 		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tableName;
 
-		if ($tableName == "actioncomm")
-		{
+		if ($tableName == "actioncomm") {
 			$sql .= " SET fk_project=".$this->id;
 			$sql .= " WHERE id=".$elementSelectId;
 		} else {
@@ -1786,8 +1762,7 @@ class Project extends CommonObject
 		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tableName;
 
-		if ($tableName == "actioncomm")
-		{
+		if ($tableName == "actioncomm") {
 			$sql .= " SET fk_project=NULL";
 			$sql .= " WHERE id=".$elementSelectId;
 		} else {
@@ -1853,7 +1828,9 @@ class Project extends CommonObject
 		$this->weekWorkLoad = array();
 		$this->weekWorkLoadPerTask = array();
 
-		if (empty($datestart)) dol_print_error('', 'Error datestart parameter is empty');
+		if (empty($datestart)) {
+			dol_print_error('', 'Error datestart parameter is empty');
+		}
 
 		$sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.task_datehour, ptt.fk_task";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
@@ -1861,24 +1838,25 @@ class Project extends CommonObject
 		$sql .= " AND pt.fk_projet = ".$this->id;
 		$sql .= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
 		$sql .= " AND ptt.task_date <= '".$this->db->idate(dol_time_plus_duree($datestart, 1, 'w') - 1)."')";
-		if ($taskid) $sql .= " AND ptt.fk_task=".$taskid;
-		if (is_numeric($userid)) $sql .= " AND ptt.fk_user=".$userid;
+		if ($taskid) {
+			$sql .= " AND ptt.fk_task=".$taskid;
+		}
+		if (is_numeric($userid)) {
+			$sql .= " AND ptt.fk_user=".$userid;
+		}
 
 		//print $sql;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$daylareadyfound = array();
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			// Loop on each record found, so each couple (project id, task id)
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$day = $this->db->jdate($obj->task_date); // task_date is date without hours
-				if (empty($daylareadyfound[$day]))
-				{
+				if (empty($daylareadyfound[$day])) {
 					$this->weekWorkLoad[$day] = $obj->task_duration;
 					$this->weekWorkLoadPerTask[$day][$obj->fk_task] = $obj->task_duration;
 				} else {
@@ -1913,7 +1891,9 @@ class Project extends CommonObject
 		$this->monthWorkLoad = array();
 		$this->monthWorkLoadPerTask = array();
 
-		if (empty($datestart)) dol_print_error('', 'Error datestart parameter is empty');
+		if (empty($datestart)) {
+			dol_print_error('', 'Error datestart parameter is empty');
+		}
 
 		$sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.task_datehour, ptt.fk_task";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
@@ -1921,27 +1901,28 @@ class Project extends CommonObject
 		$sql .= " AND pt.fk_projet = ".$this->id;
 		$sql .= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
 		$sql .= " AND ptt.task_date <= '".$this->db->idate(dol_time_plus_duree($datestart, 1, 'm') - 1)."')";
-		if ($task_id) $sql .= " AND ptt.fk_task=".$taskid;
-		if (is_numeric($userid)) $sql .= " AND ptt.fk_user=".$userid;
+		if ($task_id) {
+			$sql .= " AND ptt.fk_task=".$taskid;
+		}
+		if (is_numeric($userid)) {
+			$sql .= " AND ptt.fk_user=".$userid;
+		}
 
 		//print $sql;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$weekalreadyfound = array();
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			// Loop on each record found, so each couple (project id, task id)
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				if (!empty($obj->task_date)) {
 					$date = explode('-', $obj->task_date);
 					$week_number = getWeekNumber($date[2], $date[1], $date[0]);
 				}
-				if (empty($weekalreadyfound[$week_number]))
-				{
+				if (empty($weekalreadyfound[$week_number])) {
 					$this->monthWorkLoad[$week_number] = $obj->task_duration;
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_task] = $obj->task_duration;
 				} else {
@@ -1977,7 +1958,9 @@ class Project extends CommonObject
 		//$socid=$user->socid;
 
 		$projectsListId = null;
-		if (!$user->rights->projet->all->lire) $projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
+		if (!$user->rights->projet->all->lire) {
+			$projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
+		}
 
 		$sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee";
 		$sql .= " FROM (".MAIN_DB_PREFIX."projet as p";
@@ -1987,7 +1970,9 @@ class Project extends CommonObject
 		//if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
 		$sql .= " WHERE p.fk_statut = 1";
 		$sql .= " AND p.entity IN (".getEntity('project').')';
-		if (!empty($projectsListId)) $sql .= " AND p.rowid IN (".$projectsListId.")";
+		if (!empty($projectsListId)) {
+			$sql .= " AND p.rowid IN (".$projectsListId.")";
+		}
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 		// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
@@ -1995,21 +1980,22 @@ class Project extends CommonObject
 
 		//print $sql;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$project_static = new Project($this->db);
 
 			$response = new WorkboardResponse();
 			$response->warning_delay = $conf->projet->warning_delay / 60 / 60 / 24;
 			$response->label = $langs->trans("OpenedProjects");
 			$response->labelShort = $langs->trans("Opened");
-			if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
-			else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
+			if ($user->rights->projet->all->lire) {
+				$response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
+			} else {
+				$response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
+			}
 			$response->img = img_object('', "projectpub");
 
 			// This assignment in condition is not a bug. It allows walking the results.
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$response->nbtodo++;
 
 				$project_static->statut = $obj->status;
@@ -2064,17 +2050,14 @@ class Project extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 		$sql .= " WHERE";
 		$sql .= " p.entity IN (".getEntity('project').")";
-		if (!$user->rights->projet->all->lire)
-		{
+		if (!$user->rights->projet->all->lire) {
 			$projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
 			$sql .= "AND p.rowid IN (".$projectsListId.")";
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["projects"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -2096,8 +2079,12 @@ class Project extends CommonObject
 	{
 		global $conf;
 
-		if (!($this->statut == self::STATUS_VALIDATED)) return false;
-		if (!$this->datee && !$this->date_end) return false;
+		if (!($this->statut == self::STATUS_VALIDATED)) {
+			return false;
+		}
+		if (!$this->datee && !$this->date_end) {
+			return false;
+		}
 
 		$now = dol_now();
 
@@ -2119,21 +2106,17 @@ class Project extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as c';
 		$sql .= ' WHERE c.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index e1a19e293f0..3ec82edf366 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -85,21 +85,23 @@ class ProjectStats extends Stats
 			$other = 0;
 			while ($i < $num) {
 				$row = $this->db->fetch_row($resql);
-				if ($i < $limit || $num == $limit)
-				{
+				if ($i < $limit || $num == $limit) {
 					$label = (($langs->trans("OppStatus".$row[2]) != "OppStatus".$row[2]) ? $langs->trans("OppStatus".$row[2]) : $row[2]);
 					$result[$i] = array(
 					$label.' ('.price(price2num($row[0], 'MT'), 1, $langs, 1, -1, -1, $conf->currency).')',
 					$row[0]
 					);
-				} else $other += $row[1];
+				} else {
+					$other += $row[1];
+				}
 					$i++;
 			}
-			if ($num > $limit)
+			if ($num > $limit) {
 				$result[$i] = array(
 				$langs->transnoentitiesnoconv("Other"),
 				$other
 				);
+			}
 				$this->db->free($resql);
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
@@ -156,25 +158,34 @@ class ProjectStats extends Stats
 		// Get list of project id allowed to user (in a string list separated by coma)
 		$object = new Project($this->db);
 		$projectsListId = '';
-		if (!$user->rights->projet->all->lire) $projectsListId = $object->getProjectsAuthorizedForUser($user, 0, 1, $user->socid);
+		if (!$user->rights->projet->all->lire) {
+			$projectsListId = $object->getProjectsAuthorizedForUser($user, 0, 1, $user->socid);
+		}
 
 		$sqlwhere[] = ' t.entity IN ('.getEntity('project').')';
 
-		if (!empty($this->userid))
+		if (!empty($this->userid)) {
 			$sqlwhere[] = ' t.fk_user_resp='.$this->userid;
+		}
 
 		// Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project
-		if (!empty($this->socid))
+		if (!empty($this->socid)) {
 			$sqlwhere[] = ' t.fk_soc='.$this->socid;
-		if (!empty($this->year) && empty($this->yearmonth))
+		}
+		if (!empty($this->year) && empty($this->yearmonth)) {
 			$sqlwhere[] = " date_format(t.datec,'%Y')='".$this->db->escape($this->year)."'";
-		if (!empty($this->yearmonth))
+		}
+		if (!empty($this->yearmonth)) {
 			$sqlwhere[] = " t.datec BETWEEN '".$this->db->idate(dol_get_first_day($this->yearmonth))."' AND '".$this->db->idate(dol_get_last_day($this->yearmonth))."'";
+		}
 
-		if (!empty($this->status))
+		if (!empty($this->status)) {
 			$sqlwhere[] = " t.fk_opp_status IN (".$this->status.")";
+		}
 
-		if (!$user->rights->projet->all->lire) $sqlwhere[] = " t.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+		if (!$user->rights->projet->all->lire) {
+			$sqlwhere[] = " t.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+		}
 
 		if (count($sqlwhere) > 0) {
 			$sqlwhere_str = ' WHERE '.implode(' AND ', $sqlwhere);
@@ -254,13 +265,14 @@ class ProjectStats extends Stats
 	{
 		global $conf, $user, $langs;
 
-		if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) {
+			return -1;
+		}
 
 		$datay = array();
 
 		// Search into cache
-		if (!empty($cachedelay))
-		{
+		if (!empty($cachedelay)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 		}
@@ -271,11 +283,9 @@ class ProjectStats extends Stats
 		$nowgmt = dol_now();
 
 		$foundintocache = 0;
-		if ($cachedelay > 0)
-		{
+		if ($cachedelay > 0) {
 			$filedate = dol_filemtime($newpathofdestfile);
-			if ($filedate >= ($nowgmt - $cachedelay))
-			{
+			if ($filedate >= ($nowgmt - $cachedelay)) {
 				$foundintocache = 1;
 
 				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
@@ -285,26 +295,22 @@ class ProjectStats extends Stats
 		}
 
 		// Load file into $data
-		if ($foundintocache)    // Cache file found and is not too old
-		{
+		if ($foundintocache) {    // Cache file found and is not too old
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		} else {
 			$year = $startyear;
-			while ($year <= $endyear)
-			{
+			while ($year <= $endyear) {
 				$datay[$year] = $this->getWeightedAmountByMonth($year, $wonlostfilter);
 				$year++;
 			}
 
 			$data = array();
 			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
-			for ($i = 0; $i < 12; $i++)
-			{
+			for ($i = 0; $i < 12; $i++) {
 				$data[$i][] = $datay[$endyear][$i][0]; // set label
 				$year = $startyear;
-				while ($year <= $endyear)
-				{
+				while ($year <= $endyear) {
 					$data[$i][] = $datay[$year][$i][1]; // set yval for x=i
 					$year++;
 				}
@@ -312,18 +318,22 @@ class ProjectStats extends Stats
 		}
 
 		// Save cache file
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
-		{
+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1)) {
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) {
+				dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
-			if ($fp)
-			{
+			if ($fp) {
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
+				if (!empty($conf->global->MAIN_UMASK)) {
+					$newmask = $conf->global->MAIN_UMASK;
+				}
 				@chmod($newpathofdestfile, octdec($newmask));
-			} else dol_syslog("Failed to write cache file", LOG_ERR);
+			} else {
+				dol_syslog("Failed to write cache file", LOG_ERR);
+			}
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
@@ -371,13 +381,14 @@ class ProjectStats extends Stats
 	{
 		global $conf, $user, $langs;
 
-		if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) {
+			return -1;
+		}
 
 		$datay = array();
 
 		// Search into cache
-		if (!empty($cachedelay))
-		{
+		if (!empty($cachedelay)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 		}
@@ -400,8 +411,7 @@ class ProjectStats extends Stats
 		}
 
 		// Load file into $data
-		if ($foundintocache) // Cache file found and is not too old
-		{
+		if ($foundintocache) { // Cache file found and is not too old
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		} else {
@@ -426,13 +436,15 @@ class ProjectStats extends Stats
 		// Save cache file
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == - 1)) {
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (!dol_is_dir($conf->user->dir_temp))
+			if (!dol_is_dir($conf->user->dir_temp)) {
 				dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			fwrite($fp, json_encode($data));
 			fclose($fp);
-			if (!empty($conf->global->MAIN_UMASK))
+			if (!empty($conf->global->MAIN_UMASK)) {
 				$newmask = $conf->global->MAIN_UMASK;
+			}
 			@chmod($newpathofdestfile, octdec($newmask));
 
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
@@ -483,7 +495,7 @@ class ProjectStats extends Stats
 
 		$res = array();
 
-		foreach ($res_total as $key=>$total_row) {
+		foreach ($res_total as $key => $total_row) {
 			//var_dump($total_row);
 			if (!empty($total_row[1])) {
 				$res[$key] = array($total_row[0], (100 * $res_only_wined[$key][1]) / $total_row[1]);
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 39a572e6510..586839f3c69 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -190,39 +190,36 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task");
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_CREATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
 		// Update extrafield
-		if (!$error)
-		{
-			if (!$error)
-			{
+		if (!$error) {
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -267,13 +264,14 @@ class Task extends CommonObject
 		$sql .= " t.note_private,";
 		$sql .= " t.note_public,";
 		$sql .= " t.rang";
-		if (!empty($loadparentdata))
-		{
+		if (!empty($loadparentdata)) {
 			$sql .= ", t2.ref as task_parent_ref";
 			$sql .= ", t2.rang as task_parent_position";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t";
-		if (!empty($loadparentdata)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t2 ON t.fk_task_parent = t2.rowid";
+		if (!empty($loadparentdata)) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t2 ON t.fk_task_parent = t2.rowid";
+		}
 		$sql .= " WHERE ";
 		if (!empty($ref)) {
 			$sql .= "t.ref = '".$this->db->escape($ref)."'";
@@ -283,12 +281,10 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_rows = $this->db->num_rows($resql);
 
-			if ($num_rows)
-			{
+			if ($num_rows) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -311,8 +307,7 @@ class Task extends CommonObject
 				$this->note_public = $obj->note_public;
 				$this->rang = $obj->rang;
 
-				if (!empty($loadparentdata))
-				{
+				if (!empty($loadparentdata)) {
 					$this->task_parent_ref      = $obj->task_parent_ref;
 					$this->task_parent_position = $obj->task_parent_position;
 				}
@@ -323,8 +318,7 @@ class Task extends CommonObject
 
 			$this->db->free($resql);
 
-			if ($num_rows)
-			{
+			if ($num_rows) {
 				return 1;
 			} else {
 				return 0;
@@ -349,13 +343,27 @@ class Task extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_project)) $this->fk_project = trim($this->fk_project);
-		if (isset($this->ref)) $this->ref = trim($this->ref);
-		if (isset($this->fk_task_parent)) $this->fk_task_parent = (int) $this->fk_task_parent;
-		if (isset($this->label)) $this->label = trim($this->label);
-		if (isset($this->description)) $this->description = trim($this->description);
-		if (isset($this->duration_effective)) $this->duration_effective = trim($this->duration_effective);
-		if (isset($this->planned_workload)) $this->planned_workload = trim($this->planned_workload);
+		if (isset($this->fk_project)) {
+			$this->fk_project = trim($this->fk_project);
+		}
+		if (isset($this->ref)) {
+			$this->ref = trim($this->ref);
+		}
+		if (isset($this->fk_task_parent)) {
+			$this->fk_task_parent = (int) $this->fk_task_parent;
+		}
+		if (isset($this->label)) {
+			$this->label = trim($this->label);
+		}
+		if (isset($this->description)) {
+			$this->description = trim($this->description);
+		}
+		if (isset($this->duration_effective)) {
+			$this->duration_effective = trim($this->duration_effective);
+		}
+		if (isset($this->planned_workload)) {
+			$this->planned_workload = trim($this->planned_workload);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -379,13 +387,14 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Update extrafield
 		if (!$error) {
 			$result = $this->insertExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 			}
 		}
@@ -415,33 +424,29 @@ class Task extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_MODIFY', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
-		if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref))
-		{
+		if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref)) {
 			// We remove directory
-			if ($conf->projet->dir_output)
-			{
+			if ($conf->projet->dir_output) {
 				$project = new Project($this->db);
 				$project->fetch($this->fk_project);
 
 				$olddir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->oldcopy->ref);
 				$newdir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->ref);
-				if (file_exists($olddir))
-				{
+				if (file_exists($olddir)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 					$res = dol_move($olddir, $newdir);
-					if (!$res)
-					{
+					if (!$res) {
 						$langs->load("errors");
 						$this->error = $langs->trans('ErrorFailToRenameDir', $olddir, $newdir);
 						$error++;
@@ -451,10 +456,8 @@ class Task extends CommonObject
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -484,8 +487,7 @@ class Task extends CommonObject
 
 		$this->db->begin();
 
-		if ($this->hasChildren() > 0)
-		{
+		if ($this->hasChildren() > 0) {
 			dol_syslog(get_class($this)."::delete Can't delete record as it has some sub tasks", LOG_WARNING);
 			$this->error = 'ErrorRecordHasSubTasks';
 			$this->db->rollback();
@@ -493,20 +495,17 @@ class Task extends CommonObject
 		}
 
 		$objectisused = $this->isObjectUsed($this->id);
-		if (!empty($objectisused))
-		{
+		if (!empty($objectisused)) {
 			dol_syslog(get_class($this)."::delete Can't delete record as it has some child", LOG_WARNING);
 			$this->error = 'ErrorRecordHasChildren';
 			$this->db->rollback();
 			return 0;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Delete linked contacts
 			$res = $this->delete_linked_contact();
-			if ($res < 0)
-			{
+			if ($res < 0) {
 				$this->error = 'ErrorFailToDeleteLinkedContact';
 				//$error++;
 				$this->db->rollback();
@@ -514,49 +513,50 @@ class Task extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
 			$sql .= " WHERE fk_task=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+			if (!$resql) {
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_extrafields";
 			$sql .= " WHERE fk_object=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+			if (!$resql) {
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
 			$sql .= " WHERE rowid=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+			if (!$resql) {
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_DELETE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -564,19 +564,16 @@ class Task extends CommonObject
 			return -1 * $error;
 		} else {
 			//Delete associated link file
-			if ($conf->projet->dir_output)
-			{
+			if ($conf->projet->dir_output) {
 				$projectstatic = new Project($this->db);
 				$projectstatic->fetch($this->fk_project);
 
 				$dir = $conf->projet->dir_output."/".dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($this->id);
 				dol_syslog(get_class($this)."::delete dir=".$dir, LOG_DEBUG);
-				if (file_exists($dir))
-				{
+				if (file_exists($dir)) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 					$res = @dol_delete_dir_recursive($dir);
-					if (!$res)
-					{
+					if (!$res) {
 						$this->error = 'ErrorFailToDeleteDir';
 						$this->db->rollback();
 						return 0;
@@ -606,14 +603,17 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } else {
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		} else {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $ret = $obj->nb;
+			if ($obj) {
+				$ret = $obj->nb;
+			}
 			$this->db->free($resql);
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			return $ret;
 		} else {
 			return -1;
@@ -636,14 +636,17 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } else {
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		} else {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $ret = $obj->nb;
+			if ($obj) {
+				$ret = $obj->nb;
+			}
 			$this->db->free($resql);
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			return $ret;
 		} else {
 			return -1;
@@ -667,30 +670,35 @@ class Task extends CommonObject
 	{
 		global $conf, $langs, $user;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Task").'</u>';
-		if (!empty($this->ref))
+		if (!empty($this->ref)) {
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($this->label))
+		}
+		if (!empty($this->label)) {
 			$label .= '<br><b>'.$langs->trans('LabelTask').':</b> '.$this->label;
-		if ($this->date_start || $this->date_end)
-		{
+		}
+		if ($this->date_start || $this->date_end) {
 			$label .= "<br>".get_date_range($this->date_start, $this->date_end, '', $langs, 0);
 		}
 
 		$url = DOL_URL_ROOT.'/projet/tasks/'.$mode.'.php?id='.$this->id.($option == 'withproject' ? '&withproject=1' : '');
 		// Add param to save lastsearch_values or not
 		$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-		if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+			$add_save_lastsearch_values = 1;
+		}
+		if ($add_save_lastsearch_values) {
+			$url .= '&save_lastsearch_values=1';
+		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowTask");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -707,10 +715,16 @@ class Task extends CommonObject
 		$picto = 'projecttask';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
-		if ($withpicto != 2) $result .= (($addlabel && $this->label) ? $sep.dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+		if ($withpicto != 2) {
+			$result .= (($addlabel && $this->label) ? $sep.dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+		}
 
 		return $result;
 	}
@@ -766,23 +780,26 @@ class Task extends CommonObject
 
 		// List of tasks (does not care about permissions. Filtering will be done later)
 		$sql = "SELECT ";
-		if ($filteronprojuser > 0 || $filterontaskuser > 0) $sql .= " DISTINCT"; // We may get several time the same record if user has several roles on same project/task
+		if ($filteronprojuser > 0 || $filterontaskuser > 0) {
+			$sql .= " DISTINCT"; // We may get several time the same record if user has several roles on same project/task
+		}
 		$sql .= " p.rowid as projectid, p.ref, p.title as plabel, p.public, p.fk_statut as projectstatus, p.usage_bill_time,";
 		$sql .= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut as status,";
 		$sql .= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
 		$sql .= " t.description, ";
 		$sql .= " s.rowid as thirdparty_id, s.nom as thirdparty_name, s.email as thirdparty_email,";
 		$sql .= " p.fk_opp_status, p.opp_amount, p.opp_percent, p.budget_amount";
-		if (!empty($extrafields->attributes['projet']['label']))
-		{
-			foreach ($extrafields->attributes['projet']['label'] as $key => $val) $sql .= ($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key.' as options_'.$key : '');
+		if (!empty($extrafields->attributes['projet']['label'])) {
+			foreach ($extrafields->attributes['projet']['label'] as $key => $val) {
+				$sql .= ($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key.' as options_'.$key : '');
+			}
 		}
-		if (!empty($extrafields->attributes['projet_task']['label']))
-		{
-			foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) $sql .= ($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key.' as options_'.$key : '');
+		if (!empty($extrafields->attributes['projet_task']['label'])) {
+			foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
+				$sql .= ($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key.' as options_'.$key : '');
+			}
 		}
-		if ($includebilltime)
-		{
+		if ($includebilltime) {
 			$sql .= ", SUM(tt.task_duration * ".$this->db->ifsql("invoice_id IS NULL", "1", "0").") as tobill, SUM(tt.task_duration * ".$this->db->ifsql("invoice_id IS NULL", "0", "1").") as billed";
 		}
 
@@ -790,55 +807,47 @@ class Task extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_extrafields as efp ON (p.rowid = efp.fk_object)";
 
-		if ($mode == 0)
-		{
-			if ($filteronprojuser > 0)
-			{
+		if ($mode == 0) {
+			if ($filteronprojuser > 0) {
 				$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 				$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
 			}
 			$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
-			if ($includebilltime)
-			{
+			if ($includebilltime) {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tt ON tt.fk_task = t.rowid";
 			}
-			if ($filterontaskuser > 0)
-			{
+			if ($filterontaskuser > 0) {
 				$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2";
 				$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
 			}
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)";
 			$sql .= " WHERE p.entity IN (".getEntity('project').")";
 			$sql .= " AND t.fk_projet = p.rowid";
-		} elseif ($mode == 1)
-		{
-			if ($filteronprojuser > 0)
-			{
+		} elseif ($mode == 1) {
+			if ($filteronprojuser > 0) {
 				$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 				$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
 			}
-			if ($filterontaskuser > 0)
-			{
+			if ($filterontaskuser > 0) {
 				$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
-				if ($includebilltime)
-				{
+				if ($includebilltime) {
 					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tt ON tt.fk_task = t.rowid";
 				}
 				$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2";
 				$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
 			} else {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
-				if ($includebilltime)
-				{
+				if ($includebilltime) {
 					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tt ON tt.fk_task = t.rowid";
 				}
 			}
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)";
 			$sql .= " WHERE p.entity IN (".getEntity('project').")";
-		} else return 'BadValueForParameterMode';
+		} else {
+			return 'BadValueForParameterMode';
+		}
 
-		if ($filteronprojuser > 0)
-		{
+		if ($filteronprojuser > 0) {
 			$sql .= " AND p.rowid = ec.element_id";
 			$sql .= " AND ctc.rowid = ec.fk_c_type_contact";
 			$sql .= " AND ctc.element = 'project'";
@@ -846,8 +855,7 @@ class Task extends CommonObject
 			$sql .= " AND ec.statut = 4";
 			$sql .= " AND ctc.source = 'internal'";
 		}
-		if ($filterontaskuser > 0)
-		{
+		if ($filterontaskuser > 0) {
 			$sql .= " AND t.fk_projet = p.rowid";
 			$sql .= " AND p.rowid = ec2.element_id";
 			$sql .= " AND ctc2.rowid = ec2.fk_c_type_contact";
@@ -856,11 +864,21 @@ class Task extends CommonObject
 			$sql .= " AND ec2.statut = 4";
 			$sql .= " AND ctc2.source = 'internal'";
 		}
-		if ($socid)	$sql .= " AND p.fk_soc = ".$socid;
-		if ($projectid) $sql .= " AND p.rowid in (".$projectid.")";
-		if ($filteronproj) $sql .= natural_search(array("p.ref", "p.title"), $filteronproj);
-		if ($filteronprojstatus && $filteronprojstatus != '-1') $sql .= " AND p.fk_statut IN (".$filteronprojstatus.")";
-		if ($morewherefilter) $sql .= $morewherefilter;
+		if ($socid) {
+			$sql .= " AND p.fk_soc = ".$socid;
+		}
+		if ($projectid) {
+			$sql .= " AND p.rowid in (".$projectid.")";
+		}
+		if ($filteronproj) {
+			$sql .= natural_search(array("p.ref", "p.title"), $filteronproj);
+		}
+		if ($filteronprojstatus && $filteronprojstatus != '-1') {
+			$sql .= " AND p.fk_statut IN (".$filteronprojstatus.")";
+		}
+		if ($morewherefilter) {
+			$sql .= $morewherefilter;
+		}
 		// Add where from extra fields
 		$extrafieldsobjectkey = 'projet_task';
 		$extrafieldsobjectprefix = 'efpt.';
@@ -869,8 +887,7 @@ class Task extends CommonObject
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 		$sql .= $hookmanager->resPrint;
-		if ($includebilltime)
-		{
+		if ($includebilltime) {
 			$sql .= " GROUP BY p.rowid, p.ref, p.title, p.public, p.fk_statut, p.usage_bill_time,";
 			$sql .= " t.datec, t.dateo, t.datee, t.tms,";
 			$sql .= " t.rowid, t.ref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut,";
@@ -878,13 +895,15 @@ class Task extends CommonObject
 			$sql .= " t.description, ";
 			$sql .= " s.rowid, s.nom, s.email,";
 			$sql .= " p.fk_opp_status, p.opp_amount, p.opp_percent, p.budget_amount";
-			if (!empty($extrafields->attributes['projet']['label']))
-			{
-				foreach ($extrafields->attributes['projet']['label'] as $key => $val) $sql .= ($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key : '');
+			if (!empty($extrafields->attributes['projet']['label'])) {
+				foreach ($extrafields->attributes['projet']['label'] as $key => $val) {
+					$sql .= ($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key : '');
+				}
 			}
-			if (!empty($extrafields->attributes['projet_task']['label']))
-			{
-				foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) $sql .= ($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key : '');
+			if (!empty($extrafields->attributes['projet_task']['label'])) {
+				foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
+					$sql .= ($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key : '');
+				}
 			}
 		}
 
@@ -894,34 +913,27 @@ class Task extends CommonObject
 		//print $sql;exit;
 		dol_syslog(get_class($this)."::getTasksArray", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			// Loop on each record found, so each couple (project id, task id)
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$error = 0;
 
 				$obj = $this->db->fetch_object($resql);
 
-				if ((!$obj->public) && (is_object($userp)))	// If not public project and we ask a filter on project owned by a user
-				{
-					if (!$this->getUserRolesForProjectsOrTasks($userp, 0, $obj->projectid, 0))
-					{
+				if ((!$obj->public) && (is_object($userp))) {	// If not public project and we ask a filter on project owned by a user
+					if (!$this->getUserRolesForProjectsOrTasks($userp, 0, $obj->projectid, 0)) {
 						$error++;
 					}
 				}
-				if (is_object($usert))							// If we ask a filter on a user affected to a task
-				{
-					if (!$this->getUserRolesForProjectsOrTasks(0, $usert, $obj->projectid, $obj->taskid))
-					{
+				if (is_object($usert)) {							// If we ask a filter on a user affected to a task
+					if (!$this->getUserRolesForProjectsOrTasks(0, $usert, $obj->projectid, $obj->taskid)) {
 						$error++;
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$tasks[$i] = new Task($this->db);
 					$tasks[$i]->id = $obj->taskid;
 					$tasks[$i]->ref = $obj->taskref;
@@ -960,21 +972,19 @@ class Task extends CommonObject
 					$tasks[$i]->thirdparty_name	= $obj->thirdparty_name;
 					$tasks[$i]->thirdparty_email = $obj->thirdparty_email;
 
-					if (!empty($extrafields->attributes['projet']['label']))
-					{
-						foreach ($extrafields->attributes['projet']['label'] as $key => $val)
-						{
-							if ($extrafields->attributes['projet']['type'][$key] != 'separate')
+					if (!empty($extrafields->attributes['projet']['label'])) {
+						foreach ($extrafields->attributes['projet']['label'] as $key => $val) {
+							if ($extrafields->attributes['projet']['type'][$key] != 'separate') {
 								$tasks[$i]->{'options_'.$key} = $obj->{'options_'.$key};
+							}
 						}
 					}
 
-					if (!empty($extrafields->attributes['projet_task']['label']))
-					{
-						foreach ($extrafields->attributes['projet_task']['label'] as $key => $val)
-						{
-							if ($extrafields->attributes['projet_task']['type'][$key] != 'separate')
+					if (!empty($extrafields->attributes['projet_task']['label'])) {
+						foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
+							if ($extrafields->attributes['projet_task']['type'][$key] != 'separate') {
 								$tasks[$i]->{'options_'.$key} = $obj->{'options_'.$key};
+							}
 						}
 					}
 				}
@@ -1006,57 +1016,80 @@ class Task extends CommonObject
 		dol_syslog(get_class($this)."::getUserRolesForProjectsOrTasks userp=".is_object($userp)." usert=".is_object($usert)." projectid=".$projectid." taskid=".$taskid);
 
 		// We want role of user for a projet or role of user for a task. Both are not possible.
-		if (empty($userp) && empty($usert))
-		{
+		if (empty($userp) && empty($usert)) {
 			$this->error = "CallWithWrongParameters";
 			return -1;
 		}
-		if (!empty($userp) && !empty($usert))
-		{
+		if (!empty($userp) && !empty($usert)) {
 			$this->error = "CallWithWrongParameters";
 			return -1;
 		}
 
 		/* Liste des taches et role sur les projets ou taches */
 		$sql = "SELECT pt.rowid as pid, ec.element_id, ctc.code, ctc.source";
-		if ($userp) $sql .= " FROM ".MAIN_DB_PREFIX."projet as pt";
-		if ($usert && $filteronprojstatus > -1) $sql .= " FROM ".MAIN_DB_PREFIX."projet as p, ".MAIN_DB_PREFIX."projet_task as pt";
-		if ($usert && $filteronprojstatus <= -1) $sql .= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
+		if ($userp) {
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet as pt";
+		}
+		if ($usert && $filteronprojstatus > -1) {
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet as p, ".MAIN_DB_PREFIX."projet_task as pt";
+		}
+		if ($usert && $filteronprojstatus <= -1) {
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
+		}
 		$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 		$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
 		$sql .= " WHERE pt.rowid = ec.element_id";
-		if ($userp && $filteronprojstatus > -1) $sql .= " AND pt.fk_statut = ".$filteronprojstatus;
-		if ($usert && $filteronprojstatus > -1) $sql .= " AND pt.fk_projet = p.rowid AND p.fk_statut = ".$filteronprojstatus;
-		if ($userp) $sql .= " AND ctc.element = 'project'";
-		if ($usert) $sql .= " AND ctc.element = 'project_task'";
+		if ($userp && $filteronprojstatus > -1) {
+			$sql .= " AND pt.fk_statut = ".$filteronprojstatus;
+		}
+		if ($usert && $filteronprojstatus > -1) {
+			$sql .= " AND pt.fk_projet = p.rowid AND p.fk_statut = ".$filteronprojstatus;
+		}
+		if ($userp) {
+			$sql .= " AND ctc.element = 'project'";
+		}
+		if ($usert) {
+			$sql .= " AND ctc.element = 'project_task'";
+		}
 		$sql .= " AND ctc.rowid = ec.fk_c_type_contact";
-		if ($userp) $sql .= " AND ec.fk_socpeople = ".$userp->id;
-		if ($usert) $sql .= " AND ec.fk_socpeople = ".$usert->id;
+		if ($userp) {
+			$sql .= " AND ec.fk_socpeople = ".$userp->id;
+		}
+		if ($usert) {
+			$sql .= " AND ec.fk_socpeople = ".$usert->id;
+		}
 		$sql .= " AND ec.statut = 4";
 		$sql .= " AND ctc.source = 'internal'";
-		if ($projectid)
-		{
-			if ($userp) $sql .= " AND pt.rowid in (".$projectid.")";
-			if ($usert) $sql .= " AND pt.fk_projet in (".$projectid.")";
+		if ($projectid) {
+			if ($userp) {
+				$sql .= " AND pt.rowid in (".$projectid.")";
+			}
+			if ($usert) {
+				$sql .= " AND pt.fk_projet in (".$projectid.")";
+			}
 		}
-		if ($taskid)
-		{
-			if ($userp) $sql .= " ERROR SHOULD NOT HAPPENS";
-			if ($usert) $sql .= " AND pt.rowid = ".$taskid;
+		if ($taskid) {
+			if ($userp) {
+				$sql .= " ERROR SHOULD NOT HAPPENS";
+			}
+			if ($usert) {
+				$sql .= " AND pt.rowid = ".$taskid;
+			}
 		}
 		//print $sql;
 
 		dol_syslog(get_class($this)."::getUserRolesForProjectsOrTasks execute request", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
-				if (empty($arrayroles[$obj->pid])) $arrayroles[$obj->pid] = $obj->code;
-				else $arrayroles[$obj->pid] .= ','.$obj->code;
+				if (empty($arrayroles[$obj->pid])) {
+					$arrayroles[$obj->pid] = $obj->code;
+				} else {
+					$arrayroles[$obj->pid] .= ','.$obj->code;
+				}
 				$i++;
 			}
 			$this->db->free($resql);
@@ -1081,10 +1114,12 @@ class Task extends CommonObject
 		//var_dump($tab);
 		$num = count($tab);
 		$i = 0;
-		while ($i < $num)
-		{
-			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else $contactAlreadySelected[$i] = $tab[$i]['id'];
+		while ($i < $num) {
+			if ($source == 'thirdparty') {
+				$contactAlreadySelected[$i] = $tab[$i]['socid'];
+			} else {
+				$contactAlreadySelected[$i] = $tab[$i]['id'];
+			}
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -1107,15 +1142,18 @@ class Task extends CommonObject
 		$ret = 0;
 
 		// Check parameters
-		if (!is_object($user))
-		{
+		if (!is_object($user)) {
 			dol_print_error('', "Method addTimeSpent was called with wrong parameter user");
 			return -1;
 		}
 
 		// Clean parameters
-		if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note);
-		if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date;
+		if (isset($this->timespent_note)) {
+			$this->timespent_note = trim($this->timespent_note);
+		}
+		if (empty($this->timespent_datehour)) {
+			$this->timespent_datehour = $this->timespent_date;
+		}
 
 		$this->db->begin();
 
@@ -1138,17 +1176,17 @@ class Task extends CommonObject
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$tasktime_id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_time");
 			$ret = $tasktime_id;
 			$this->timespent_id = $ret;
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_TIMESPENT_CREATE', $user);
-				if ($result < 0) { $ret = -1; }
+				if ($result < 0) {
+					$ret = -1;
+				}
 				// End call triggers
 			}
 		} else {
@@ -1156,17 +1194,17 @@ class Task extends CommonObject
 			$ret = -1;
 		}
 
-		if ($ret > 0)
-		{
+		if ($ret > 0) {
 			// Recalculate amount of time spent for task and update denormalized field
 			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
 			$sql .= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".$this->id.")";
-			if (isset($this->progress)) $sql .= ", progress = ".$this->progress; // Do not overwrite value if not provided
+			if (isset($this->progress)) {
+				$sql .= ", progress = ".$this->progress; // Do not overwrite value if not provided
+			}
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				$this->error = $this->db->lasterror();
 				$ret = -2;
 			}
@@ -1176,15 +1214,13 @@ class Task extends CommonObject
 			$sql .= " WHERE rowid = ".$tasktime_id;
 
 			dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				$this->error = $this->db->lasterror();
 				$ret = -2;
 			}
 		}
 
-		if ($ret > 0)
-		{
+		if ($ret > 0) {
 			$this->db->commit();
 		} else {
 			$this->db->rollback();
@@ -1203,12 +1239,14 @@ class Task extends CommonObject
 	{
 		global $langs;
 
-		if (is_object($userobj)) $userid = $userobj->id;
-		else $userid = $userobj; // old method
+		if (is_object($userobj)) {
+			$userid = $userobj->id;
+		} else {
+			$userid = $userobj; // old method
+		}
 
 		$id = $this->id;
-		if (empty($id) && empty($userid))
-		{
+		if (empty($id) && empty($userid)) {
 			dol_syslog("getSummaryOfTimeSpent called on a not loaded task without user param defined", LOG_ERR);
 			return -1;
 		}
@@ -1224,14 +1262,19 @@ class Task extends CommonObject
 		$sql .= " SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 		$sql .= " WHERE 1 = 1";
-		if ($morewherefilter) $sql .= $morewherefilter;
-		if ($id > 0) $sql .= " AND t.fk_task = ".$id;
-		if ($userid > 0) $sql .= " AND t.fk_user = ".$userid;
+		if ($morewherefilter) {
+			$sql .= $morewherefilter;
+		}
+		if ($id > 0) {
+			$sql .= " AND t.fk_task = ".$id;
+		}
+		if ($userid > 0) {
+			$sql .= " AND t.fk_user = ".$userid;
+		}
 
 		dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 
 			$result['min_date'] = $obj->min_date; // deprecated. use the ->timespent_xxx instead
@@ -1264,7 +1307,9 @@ class Task extends CommonObject
 	{
 		global $langs;
 
-		if (empty($id)) $id = $this->id;
+		if (empty($id)) {
+			$id = $this->id;
+		}
 
 		$result = array();
 
@@ -1273,17 +1318,14 @@ class Task extends CommonObject
 		$sql .= " SUM(t.task_duration / 3600 * ".$this->db->ifsql("t.thm IS NULL", 0, "t.thm").") as amount, SUM(".$this->db->ifsql("t.thm IS NULL", 1, 0).") as nblinesnull";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 		$sql .= " WHERE t.fk_task = ".$id;
-		if (is_object($fuser) && $fuser->id > 0)
-		{
+		if (is_object($fuser) && $fuser->id > 0) {
 			$sql .= " AND fk_user = ".$fuser->id;
 		}
-		if ($dates > 0)
-		{
+		if ($dates > 0) {
 			$datefieldname = "task_datehour";
 			$sql .= " AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
 		}
-		if ($datee > 0)
-		{
+		if ($datee > 0) {
 			$datefieldname = "task_datehour";
 			$sql .= " AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
 		}
@@ -1291,8 +1333,7 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::getSumOfAmount", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 
 			$result['amount'] = $obj->amount;
@@ -1332,10 +1373,8 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::fetchTimeSpent", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->timespent_id = $obj->rowid;
@@ -1395,17 +1434,17 @@ class Task extends CommonObject
 		$sql .= " WHERE ptt.fk_task = pt.rowid AND pt.fk_projet = p.rowid";
 		$sql .= " AND ptt.fk_user = ".$userobj->id;
 		$sql .= " AND pt.entity IN (".getEntity('project').")";
-		if ($morewherefilter) $sql .= $morewherefilter;
+		if ($morewherefilter) {
+			$sql .= $morewherefilter;
+		}
 
 		dol_syslog(get_class($this)."::fetchAllTimeSpent", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				$newobj = new stdClass();
@@ -1460,20 +1499,22 @@ class Task extends CommonObject
 		$ret = 0;
 
 		// Check parameters
-		if ($this->timespent_date == '')
-		{
+		if ($this->timespent_date == '') {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Date"));
 			return -1;
 		}
-		if (!($this->timespent_fk_user > 0))
-		{
+		if (!($this->timespent_fk_user > 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("User"));
 			return -1;
 		}
 
 		// Clean parameters
-		if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date;
-		if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note);
+		if (empty($this->timespent_datehour)) {
+			$this->timespent_datehour = $this->timespent_date;
+		}
+		if (isset($this->timespent_note)) {
+			$this->timespent_note = trim($this->timespent_note);
+		}
 
 		$this->db->begin();
 
@@ -1487,27 +1528,27 @@ class Task extends CommonObject
 		$sql .= " WHERE rowid = ".$this->timespent_id;
 
 		dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			if (!$notrigger)
-			{
+		if ($this->db->query($sql)) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_TIMESPENT_MODIFY', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					$ret = -1;
-				} else $ret = 1;
+				} else {
+					$ret = 1;
+				}
 				// End call triggers
-			} else $ret = 1;
+			} else {
+				$ret = 1;
+			}
 		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			$ret = -1;
 		}
 
-		if ($ret == 1 && ($this->timespent_old_duration != $this->timespent_duration))
-		{
+		if ($ret == 1 && ($this->timespent_old_duration != $this->timespent_duration)) {
 			$newDuration = $this->timespent_duration - $this->timespent_old_duration;
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
@@ -1515,15 +1556,16 @@ class Task extends CommonObject
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				$ret = -2;
 			}
 		}
 
-		if ($ret >= 0) $this->db->commit();
+		if ($ret >= 0) {
+			$this->db->commit();
+		}
 		return $ret;
 	}
 
@@ -1547,28 +1589,28 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('TASK_TIMESPENT_DELETE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
 			$sql .= " SET duration_effective = duration_effective - ".$this->db->escape($this->timespent_duration ? $this->timespent_duration : 0);
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$result = 0;
 			} else {
 				$this->error = $this->db->lasterror();
@@ -1577,10 +1619,8 @@ class Task extends CommonObject
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delTimeSpent ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -1633,8 +1673,7 @@ class Task extends CommonObject
 
 		$defaultref = '';
 		$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-		if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
-		{
+		if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php")) {
 			require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
 			$modTask = new $obj;
 			$defaultref = $modTask->getNextValue(0, $clone_task);
@@ -1651,8 +1690,7 @@ class Task extends CommonObject
 		$clone_task->rang = $origin_task->rang;
 
 		//Manage Task Date
-		if ($clone_change_dt)
-		{
+		if ($clone_change_dt) {
 			$projectstatic = new Project($this->db);
 			$projectstatic->fetch($ori_project_id);
 
@@ -1660,20 +1698,17 @@ class Task extends CommonObject
 			$orign_project_dt_start = $projectstatic->date_start;
 
 			//Calcultate new task start date with difference between origin proj start date and origin task start date
-			if (!empty($clone_task->date_start))
-			{
+			if (!empty($clone_task->date_start)) {
 				$clone_task->date_start = $now + $clone_task->date_start - $orign_project_dt_start;
 			}
 
 			//Calcultate new task end date with difference between origin proj end date and origin task end date
-			if (!empty($clone_task->date_end))
-			{
+			if (!empty($clone_task->date_end)) {
 				$clone_task->date_end = $now + $clone_task->date_end - $orign_project_dt_start;
 			}
 		}
 
-		if (!$clone_prog)
-		{
+		if (!$clone_prog) {
 				$clone_task->progress = 0;
 		}
 
@@ -1681,28 +1716,24 @@ class Task extends CommonObject
 		$result = $clone_task->create($user);
 
 		// Other options
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $clone_task->error;
 			$error++;
 		}
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$clone_task_id = $clone_task->id;
 			$clone_task_ref = $clone_task->ref;
 
-	   		//Note Update
-			if (!$clone_note)
-	   		{
+			//Note Update
+			if (!$clone_note) {
 				$clone_task->note_private = '';
 				$clone_task->note_public = '';
 			} else {
 				$this->db->begin();
 				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES | ENT_HTML5), '_public');
-				if ($res < 0)
-				{
+				if ($res < 0) {
 					$this->error .= $clone_task->error;
 					$error++;
 					$this->db->rollback();
@@ -1712,8 +1743,7 @@ class Task extends CommonObject
 
 				$this->db->begin();
 				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_private, ENT_QUOTES | ENT_HTML5), '_private');
-				if ($res < 0)
-				{
+				if ($res < 0) {
 					$this->error .= $clone_task->error;
 					$error++;
 					$this->db->rollback();
@@ -1723,8 +1753,7 @@ class Task extends CommonObject
 			}
 
 			//Duplicate file
-			if ($clone_file)
-			{
+			if ($clone_file) {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 				//retrieve project origin ref to know folder to copy
@@ -1732,8 +1761,7 @@ class Task extends CommonObject
 				$projectstatic->fetch($ori_project_id);
 				$ori_project_ref = $projectstatic->ref;
 
-				if ($ori_project_id != $project_id)
-				{
+				if ($ori_project_id != $project_id) {
 					$projectstatic->fetch($project_id);
 					$clone_project_ref = $projectstatic->ref;
 				} else {
@@ -1744,20 +1772,16 @@ class Task extends CommonObject
 				$ori_task_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($ori_project_ref)."/".dol_sanitizeFileName($fromid);
 
 				$filearray = dol_dir_list($ori_task_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
-				foreach ($filearray as $key => $file)
-				{
-					if (!file_exists($clone_task_dir))
-					{
-						if (dol_mkdir($clone_task_dir) < 0)
-						{
+				foreach ($filearray as $key => $file) {
+					if (!file_exists($clone_task_dir)) {
+						if (dol_mkdir($clone_task_dir) < 0) {
 							$this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
 							$error++;
 						}
 					}
 
 					$rescopy = dol_copy($ori_task_dir.'/'.$file['name'], $clone_task_dir.'/'.$file['name'], 0, 1);
-					if (is_numeric($rescopy) && $rescopy < 0)
-					{
+					if (is_numeric($rescopy) && $rescopy < 0) {
 						$this->error .= $langs->trans("ErrorFailToCopyFile", $ori_task_dir.'/'.$file['name'], $clone_task_dir.'/'.$file['name']);
 						$error++;
 					}
@@ -1765,27 +1789,22 @@ class Task extends CommonObject
 			}
 
 			// clone affectation
-			if ($clone_affectation)
-			{
+			if ($clone_affectation) {
 				$origin_task = new Task($this->db);
 				$origin_task->fetch($fromid);
 
-				foreach (array('internal', 'external') as $source)
-				{
+				foreach (array('internal', 'external') as $source) {
 					$tab = $origin_task->liste_contact(-1, $source);
 					$num = count($tab);
 					$i = 0;
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$clone_task->add_contact($tab[$i]['id'], $tab[$i]['code'], $tab[$i]['source']);
-						if ($clone_task->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-						{
+						if ($clone_task->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 							$langs->load("errors");
 							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
 						} else {
-							if ($clone_task->error != '')
-							{
+							if ($clone_task->error != '') {
 								$this->error .= $clone_task->error;
 								$error++;
 							}
@@ -1795,16 +1814,14 @@ class Task extends CommonObject
 				}
 			}
 
-			if ($clone_time)
-			{
+			if ($clone_time) {
 				//TODO clone time of affectation
 			}
 		}
 
 		unset($clone_task->context['createfromclone']);
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $clone_task_id;
 		} else {
@@ -1851,38 +1868,53 @@ class Task extends CommonObject
 		$this->statuts_short[3] = 'Completed';
 		$this->statuts_short[4] = 'Transfered';
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			return $langs->trans($this->statuts[$status]);
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			return $langs->trans($this->statuts_short[$status]);
-		} elseif ($mode == 2)
-		{
-			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
-			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts_short[$status]);
-			elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut3').' '.$langs->trans($this->statuts_short[$status]);
-			elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
-			elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
-			elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts_short[$status]);
-		} elseif ($mode == 3)
-		{
-			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
-			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1');
-			elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut3');
-			elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-			elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-			elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5');
-		} elseif ($mode == 4)
-		{
-			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut3').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts[$status]);
-		} elseif ($mode == 5)
-		{
+		} elseif ($mode == 2) {
+			if ($status == 0) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
+			} elseif ($status == 1) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts_short[$status]);
+			} elseif ($status == 2) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut3').' '.$langs->trans($this->statuts_short[$status]);
+			} elseif ($status == 3) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
+			} elseif ($status == 4) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
+			} elseif ($status == 5) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts_short[$status]);
+			}
+		} elseif ($mode == 3) {
+			if ($status == 0) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
+			} elseif ($status == 1) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut1');
+			} elseif ($status == 2) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut3');
+			} elseif ($status == 3) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+			} elseif ($status == 4) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+			} elseif ($status == 5) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut5');
+			}
+		} elseif ($mode == 4) {
+			if ($status == 0) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 1) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 2) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut3').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 3) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 4) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 5) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts[$status]);
+			}
+		} elseif ($mode == 5) {
 			/*if ($status==0) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut0');
 			elseif ($status==1) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut1');
 			elseif ($status==2) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut3');
@@ -1892,8 +1924,7 @@ class Task extends CommonObject
 			*/
 			//else return $this->progress.' %';
 			return '&nbsp;';
-		} elseif ($mode == 6)
-		{
+		} elseif ($mode == 6) {
 			/*if ($status==0) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut0');
 			elseif ($status==1) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut1');
 			elseif ($status==2) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut3');
@@ -1970,29 +2001,34 @@ class Task extends CommonObject
 		$sql .= " AND p.fk_statut = 1";
 		$sql .= " AND t.fk_projet = p.rowid";
 		$sql .= " AND (t.progress IS NULL OR t.progress < 100)"; // tasks to do
-		if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")";
+		if (!$user->rights->projet->all->lire) {
+			$sql .= " AND p.rowid IN (".$projectsListId.")";
+		}
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if ($socid) $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		if ($socid) {
+			$sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		}
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		// if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
 
 		//print $sql;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$task_static = new Task($this->db);
 
 			$response = new WorkboardResponse();
 			$response->warning_delay = $conf->projet->task->warning_delay / 60 / 60 / 24;
 			$response->label = $langs->trans("OpenedTasks");
-			if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mainmenu=project';
-			else $response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mode=mine&amp;mainmenu=project';
+			if ($user->rights->projet->all->lire) {
+				$response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mainmenu=project';
+			} else {
+				$response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mode=mine&amp;mainmenu=project';
+			}
 			$response->img = img_object('', "task");
 
 			// This assignment in condition is not a bug. It allows walking the results.
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$response->nbtodo++;
 
 				$task_static->projectstatus = $obj->projectstatus;
@@ -2033,22 +2069,28 @@ class Task extends CommonObject
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+		}
 		$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql .= " WHERE p.entity IN (".getEntity('project', 0).')';
 		$sql .= " AND t.fk_projet = p.rowid"; // tasks to do
-		if ($mine || !$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")";
+		if ($mine || !$user->rights->projet->all->lire) {
+			$sql .= " AND p.rowid IN (".$projectsListId.")";
+		}
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if ($socid) $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id.") OR (s.rowid IS NULL))";
+		if ($socid) {
+			$sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+		}
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id.") OR (s.rowid IS NULL))";
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// This assignment in condition is not a bug. It allows walking the results.
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["tasks"] = $obj->nb;
 			}
 			$this->db->free($resql);
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index 296a36c2dcf..d18950ec482 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -59,8 +59,9 @@ class TaskStats extends Stats
 		$sql = "SELECT";
 		$sql .= " COUNT(t.rowid), t.priority";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = t.fk_projet";
-		if (!$user->rights->societe->client->voir && !$user->soc_id)
+		if (!$user->rights->societe->client->voir && !$user->soc_id) {
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		}
 		$sql .= $this->buildWhere();
 		//$sql .= " AND t.fk_statut <> 0";     // We want historic also, so all task not draft
 		$sql .= " GROUP BY t.priority";
@@ -76,20 +77,22 @@ class TaskStats extends Stats
 			$other = 0;
 			while ($i < $num) {
 				$row = $this->db->fetch_row($resql);
-				if ($i < $limit || $num == $limit)
-				{
+				if ($i < $limit || $num == $limit) {
 					$result[$i] = array(
 						$row[1],
 						$row[0]
 					);
-				} else $other += $row[1];
+				} else {
+					$other += $row[1];
+				}
 				$i++;
 			}
-			if ($num > $limit)
+			if ($num > $limit) {
 				$result[$i] = array(
 						$langs->transnoentitiesnoconv("Other"),
 						$other
 				);
+			}
 			$this->db->free($resql);
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
@@ -115,8 +118,9 @@ class TaskStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = t.fk_projet";
-		if (!$user->rights->societe->client->voir && !$user->soc_id)
+		if (!$user->rights->societe->client->voir && !$user->soc_id) {
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		}
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY year";
 		$sql .= $this->db->order('year', 'DESC');
@@ -137,18 +141,23 @@ class TaskStats extends Stats
 
 		$sqlwhere[] = ' t.entity IN ('.getEntity('project').')';
 
-		if (!empty($this->userid))
+		if (!empty($this->userid)) {
 			$sqlwhere[] = ' t.fk_user_resp='.$this->userid;
+		}
 		// Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project
-		if (!empty($this->socid))
+		if (!empty($this->socid)) {
 			$sqlwhere[] = ' p.fk_soc='.$this->socid; // Link on thirdparty is on project, not on task
-		if (!empty($this->year) && empty($this->yearmonth))
+		}
+		if (!empty($this->year) && empty($this->yearmonth)) {
 			$sqlwhere[] = " date_format(t.datec,'%Y')='".$this->db->escape($this->year)."'";
-		if (!empty($this->yearmonth))
+		}
+		if (!empty($this->yearmonth)) {
 			$sqlwhere[] = " t.datec BETWEEN '".$this->db->idate(dol_get_first_day($this->yearmonth))."' AND '".$this->db->idate(dol_get_last_day($this->yearmonth))."'";
+		}
 
-		if (!empty($this->status))
+		if (!empty($this->status)) {
 			$sqlwhere[] = " t.priority IN (".$this->priority.")";
+		}
 
 		if (count($sqlwhere) > 0) {
 			$sqlwhere_str = ' WHERE '.implode(' AND ', $sqlwhere);
@@ -172,8 +181,9 @@ class TaskStats extends Stats
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = t.fk_projet";
-		if (!$user->rights->societe->client->voir && !$user->soc_id)
+		if (!$user->rights->societe->client->voir && !$user->soc_id) {
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		}
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index 1200e0bc060..ac00e0adfad 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -50,7 +50,9 @@ $planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('p
 // Security check
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projectcard', 'globalcard'));
@@ -62,12 +64,13 @@ $object = new Project($db);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref); // If we create project, ref may be defined into POST but record does not yet exists into database
 	if ($ret > 0) {
 		$object->fetch_thirdparty();
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+			$object->fetchComments();
+		}
 		$id = $object->id;
 	}
 }
@@ -122,20 +125,27 @@ print '<table class="border centpercent">';
 
 // Visibility
 print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-if ($object->public) print $langs->trans('SharedProject');
-else print $langs->trans('PrivateProject');
+if ($object->public) {
+	print $langs->trans('SharedProject');
+} else {
+	print $langs->trans('PrivateProject');
+}
 print '</td></tr>';
 
 // Date start - end
 print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 print dol_print_date($object->date_start, 'day');
 $end = dol_print_date($object->date_end, 'day');
-if ($end) print ' - '.$end;
+if ($end) {
+	print ' - '.$end;
+}
 print '</td></tr>';
 
 // Budget
 print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-if (strcmp($object->budget_amount, '')) print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+if (strcmp($object->budget_amount, '')) {
+	print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+}
 print '</td></tr>';
 
 // Other attributes
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 3942ee4a5a2..fed592a808c 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -28,7 +28,9 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if ($conf->categorie->enabled) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; }
+if ($conf->categorie->enabled) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies'));
@@ -45,7 +47,9 @@ $mine   = GETPOST('mode') == 'mine' ? 1 : 0;
 $object = new Project($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+	$object->fetchComments();
+}
 
 // Security check
 $socid = 0;
@@ -140,8 +144,7 @@ if ($action == 'addcontact') {
 }
 
 // Add new contact
-if ($action == 'addcontact_confirm' && $user->rights->projet->creer)
-{
+if ($action == 'addcontact_confirm' && $user->rights->projet->creer) {
 	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 
@@ -154,15 +157,13 @@ if ($action == 'addcontact_confirm' && $user->rights->projet->creer)
 	$result = 0;
 	$result = $object->fetch($id);
 
-	if (!$error && $result > 0 && $id > 0)
-	{
-  		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+	if (!$error && $result > 0 && $id > 0) {
+		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 
-  		if ($result == 0) {
-  			$langs->load("errors");
-  			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-  		}
-  		elseif ($result < 0) {
+		if ($result == 0) {
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+		} elseif ($result < 0) {
 			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
@@ -171,7 +172,7 @@ if ($action == 'addcontact_confirm' && $user->rights->projet->creer)
 			}
 		}
 
-  		$affecttotask=GETPOST('tasksavailable', 'intcomma');
+		$affecttotask=GETPOST('tasksavailable', 'intcomma');
 		if (!empty($affecttotask)) {
 			require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 			$task_to_affect = explode(',', $affecttotask);
@@ -199,18 +200,15 @@ if ($action == 'addcontact_confirm' && $user->rights->projet->creer)
 		}
 	}
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	}
 }
 
 // Change contact's status
-if ($action == 'swapstatut' && $user->rights->projet->creer)
-{
-	if ($object->fetch($id))
-	{
+if ($action == 'swapstatut' && $user->rights->projet->creer) {
+	if ($object->fetch($id)) {
 		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
 	} else {
 		dol_print_error($db);
@@ -218,13 +216,11 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 }
 
 // Delete a contact
-if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->projet->creer)
-{
+if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->projet->creer) {
 	$object->fetch($id);
 	$result = $object->delete_contact(GETPOST("lineid"));
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: contact.php?id=".$object->id);
 		exit;
 	} else {
@@ -239,7 +235,9 @@ if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->pr
  */
 
 $title = $langs->trans("ProjectContact").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("ProjectContact");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->ref.' '.$object->name.' - '.$langs->trans("ProjectContact");
+}
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 llxHeader('', $title, $help_url);
 
@@ -254,9 +252,10 @@ $userstatic = new User($db);
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || !empty($ref))
-{
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+if ($id > 0 || !empty($ref)) {
+	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+		$object->fetchComments();
+	}
 	// To verify role of users
 	//$userAccess = $object->restrictedProjectArea($user,'read');
 	$userWrite = $object->restrictedProjectArea($user, 'write');
@@ -271,8 +270,11 @@ if ($id > 0 || !empty($ref))
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -285,15 +287,13 @@ if ($id > 0 || !empty($ref))
 	// Title
 	$morehtmlref .= $object->title;
 	// Thirdparty
-	if ($object->thirdparty->id > 0)
-	{
+	if ($object->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire)
-	{
+	if (!$user->rights->projet->all->lire) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 		$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
@@ -312,22 +312,19 @@ if ($id > 0 || !empty($ref))
 	print $langs->trans("Usage");
 	print '</td>';
 	print '<td>';
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-	{
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 		print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectFollowOpportunity");
 		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 		print '<br>';
 	}
-	if (empty($conf->global->PROJECT_HIDE_TASKS))
-	{
+	if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 		print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectFollowTasks");
 		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 		print '<br>';
 	}
-	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-	{
+	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 		print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectBillTimeDescription");
 		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -337,26 +334,34 @@ if ($id > 0 || !empty($ref))
 
 	// Visibility
 	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-	if ($object->public) print $langs->trans('SharedProject');
-	else print $langs->trans('PrivateProject');
+	if ($object->public) {
+		print $langs->trans('SharedProject');
+	} else {
+		print $langs->trans('PrivateProject');
+	}
 	print '</td></tr>';
 
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && $object->opp_status)
-	{
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && $object->opp_status) {
 		// Opportunity status
 		print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
 		$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
-		if ($code) print $langs->trans("OppStatus".$code);
+		if ($code) {
+			print $langs->trans("OppStatus".$code);
+		}
 		print '</td></tr>';
 
 		// Opportunity percent
 		print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-		if (strcmp($object->opp_percent, '')) print price($object->opp_percent, '', $langs, 1, 0).' %';
+		if (strcmp($object->opp_percent, '')) {
+			print price($object->opp_percent, '', $langs, 1, 0).' %';
+		}
 		print '</td></tr>';
 
 		// Opportunity Amount
 		print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-		if (strcmp($object->opp_amount, '')) print price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency);
+		if (strcmp($object->opp_amount, '')) {
+			print price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency);
+		}
 		print '</td></tr>';
 	}
 
@@ -367,12 +372,16 @@ if ($id > 0 || !empty($ref))
 	$end = dol_print_date($object->date_end, 'day');
 	print ' - ';
 	print ($end ? $end : '?');
-	if ($object->hasDelay()) print img_warning("Late");
+	if ($object->hasDelay()) {
+		print img_warning("Late");
+	}
 	print '</td></tr>';
 
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-	if (strcmp($object->budget_amount, '')) print price($object->budget_amount, '', $langs, 0, 0, 0, $conf->currency);
+	if (strcmp($object->budget_amount, '')) {
+		print price($object->budget_amount, '', $langs, 0, 0, 0, $conf->currency);
+	}
 	print '</td></tr>';
 
 	// Other attributes
@@ -414,10 +423,11 @@ if ($id > 0 || !empty($ref))
 
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-	foreach ($dirtpls as $reldir)
-	{
+	foreach ($dirtpls as $reldir) {
 		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) break;
+		if ($res) {
+			break;
+		}
 	}
 }
 
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 5557740704d..795e10f2739 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -48,7 +48,9 @@ $result = restrictedArea($user, 'projet', $id, 'projet&project');
 $object = new Project($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+	$object->fetchComments();
+}
 
 if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->ref);
@@ -59,16 +61,26 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) { $sortfield = $conf->global->MAIN_DOC_SORT_FIELD; }
-if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) { $sortorder = $conf->global->MAIN_DOC_SORT_ORDER; }
+if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) {
+	$sortfield = $conf->global->MAIN_DOC_SORT_FIELD;
+}
+if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) {
+	$sortorder = $conf->global->MAIN_DOC_SORT_ORDER;
+}
 
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 
 
@@ -84,15 +96,16 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
  */
 
 $title = $langs->trans("Project").' - '.$langs->trans("Document").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("Document");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Document");
+}
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 
 llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
 	// To verify role of users
@@ -107,8 +120,7 @@ if ($object->id > 0)
 	// Files list constructor
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
@@ -121,15 +133,13 @@ if ($object->id > 0)
 	// Title
 	$morehtmlref .= $object->title;
 	// Thirdparty
-	if ($object->thirdparty->id > 0)
-	{
+	if ($object->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire)
-	{
+	if (!$user->rights->projet->all->lire) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 		$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 3df802018ef..fa9dc351a60 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -34,41 +34,105 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->propal->enabled))         require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (!empty($conf->facture->enabled))		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (!empty($conf->facture->enabled))		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
-if (!empty($conf->commande->enabled))		require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->supplier_proposal->enabled)) require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-if (!empty($conf->fournisseur->enabled))	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (!empty($conf->fournisseur->enabled))	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (!empty($conf->contrat->enabled))		require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (!empty($conf->ficheinter->enabled))	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (!empty($conf->expedition->enabled))	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-if (!empty($conf->deplacement->enabled))	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
-if (!empty($conf->expensereport->enabled))	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-if (!empty($conf->agenda->enabled))		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-if (!empty($conf->don->enabled))			require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (!empty($conf->loan->enabled))			require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
-if (!empty($conf->loan->enabled))			require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
-if (!empty($conf->stock->enabled))			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-if (!empty($conf->tax->enabled))			require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-if (!empty($conf->banque->enabled))		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
-if (!empty($conf->salaries->enabled))		require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
-if (!empty($conf->categorie->enabled))		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->mrp->enabled))		require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
+if (!empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (!empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+}
+if (!empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+}
+if (!empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (!empty($conf->supplier_proposal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+}
+if (!empty($conf->fournisseur->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+}
+if (!empty($conf->fournisseur->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+}
+if (!empty($conf->contrat->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+}
+if (!empty($conf->ficheinter->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+}
+if (!empty($conf->expedition->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+}
+if (!empty($conf->deplacement->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+}
+if (!empty($conf->expensereport->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+}
+if (!empty($conf->agenda->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+}
+if (!empty($conf->don->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
+}
+if (!empty($conf->loan->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+}
+if (!empty($conf->loan->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
+}
+if (!empty($conf->stock->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+}
+if (!empty($conf->tax->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+}
+if (!empty($conf->banque->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+}
+if (!empty($conf->salaries->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
+}
+if (!empty($conf->categorie->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
+if (!empty($conf->mrp->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies', 'suppliers', 'compta'));
-if (!empty($conf->facture->enabled))		$langs->load("bills");
-if (!empty($conf->commande->enabled))		$langs->load("orders");
-if (!empty($conf->propal->enabled))		$langs->load("propal");
-if (!empty($conf->ficheinter->enabled))	$langs->load("interventions");
-if (!empty($conf->deplacement->enabled))	$langs->load("trips");
-if (!empty($conf->expensereport->enabled)) $langs->load("trips");
-if (!empty($conf->don->enabled))			$langs->load("donations");
-if (!empty($conf->loan->enabled))			$langs->load("loan");
-if (!empty($conf->salaries->enabled))		$langs->load("salaries");
-if (!empty($conf->mrp->enabled))		$langs->load("mrp");
+if (!empty($conf->facture->enabled)) {
+	$langs->load("bills");
+}
+if (!empty($conf->commande->enabled)) {
+	$langs->load("orders");
+}
+if (!empty($conf->propal->enabled)) {
+	$langs->load("propal");
+}
+if (!empty($conf->ficheinter->enabled)) {
+	$langs->load("interventions");
+}
+if (!empty($conf->deplacement->enabled)) {
+	$langs->load("trips");
+}
+if (!empty($conf->expensereport->enabled)) {
+	$langs->load("trips");
+}
+if (!empty($conf->don->enabled)) {
+	$langs->load("donations");
+}
+if (!empty($conf->loan->enabled)) {
+	$langs->load("loan");
+}
+if (!empty($conf->salaries->enabled)) {
+	$langs->load("salaries");
+}
+if (!empty($conf->mrp->enabled)) {
+	$langs->load("mrp");
+}
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -77,8 +141,12 @@ $datesrfc = GETPOST('datesrfc');
 $dateerfc = GETPOST('dateerfc');
 $dates = dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST('datesyear'));
 $datee = dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear'));
-if (empty($dates) && !empty($datesrfc)) $dates = dol_stringtotime($datesrfc);
-if (empty($datee) && !empty($dateerfc)) $datee = dol_stringtotime($dateerfc);
+if (empty($dates) && !empty($datesrfc)) {
+	$dates = dol_stringtotime($datesrfc);
+}
+if (empty($datee) && !empty($dateerfc)) {
+	$datee = dol_stringtotime($dateerfc);
+}
 if (!GETPOSTISSET('datesrfc') && !GETPOSTISSET('datesday') && !empty($conf->global->PROJECT_LINKED_ELEMENT_DEFAULT_FILTER_YEAR)) {
 	$new = dol_now();
 	$tmp = dol_getdate($new);
@@ -86,8 +154,7 @@ if (!GETPOSTISSET('datesrfc') && !GETPOSTISSET('datesday') && !empty($conf->glob
 	//$dates=dol_time_plus_duree($datee, -1, 'y');
 	$dates = dol_get_first_day($tmp['year'], 1);
 }
-if ($id == '' && $ref == '')
-{
+if ($id == '' && $ref == '') {
 	setEventMessage($langs->trans('ErrorBadParameters'), 'errors');
 	header('Location: list.php');
 	exit();
@@ -99,7 +166,9 @@ $mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
 $object = new Project($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+	$object->fetchComments();
+}
 
 // Security check
 $socid = $object->socid;
@@ -114,7 +183,9 @@ $hookmanager->initHooks(array('projectOverview'));
  */
 
 $title = $langs->trans("ProjectReferers").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("ProjectReferers");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->ref.' '.$object->name.' - '.$langs->trans("ProjectReferers");
+}
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 llxHeader("", $langs->trans("Referers"), $help_url);
 
@@ -139,15 +210,13 @@ $morehtmlref = '<div class="refidno">';
 // Title
 $morehtmlref .= $object->title;
 // Thirdparty
-if ($object->thirdparty->id > 0)
-{
+if ($object->thirdparty->id > 0) {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 }
 $morehtmlref .= '</div>';
 
 // Define a complementary filter for search of next/prev ref.
-if (!$user->rights->projet->all->lire)
-{
+if (!$user->rights->projet->all->lire) {
 	$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 	$object->next_prev_filter = " te.rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 }
@@ -166,22 +235,19 @@ print '<tr><td class="tdtop">';
 print $langs->trans("Usage");
 print '</td>';
 print '<td>';
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-{
+if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 	$htmltext = $langs->trans("ProjectFollowOpportunity");
 	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 	print '<br>';
 }
-if (empty($conf->global->PROJECT_HIDE_TASKS))
-{
+if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 	$htmltext = $langs->trans("ProjectFollowTasks");
 	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 	print '<br>';
 }
-if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-{
+if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 	$htmltext = $langs->trans("ProjectBillTimeDescription");
 	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -191,26 +257,34 @@ print '</td></tr>';
 
 // Visibility
 print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-if ($object->public) print $langs->trans('SharedProject');
-else print $langs->trans('PrivateProject');
+if ($object->public) {
+	print $langs->trans('SharedProject');
+} else {
+	print $langs->trans('PrivateProject');
+}
 print '</td></tr>';
 
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-{
+if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 	// Opportunity status
 	print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
 	$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
-	if ($code) print $langs->trans("OppStatus".$code);
+	if ($code) {
+		print $langs->trans("OppStatus".$code);
+	}
 	print '</td></tr>';
 
 	// Opportunity percent
 	print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-	if (strcmp($object->opp_percent, '')) print price($object->opp_percent, '', $langs, 1, 0).' %';
+	if (strcmp($object->opp_percent, '')) {
+		print price($object->opp_percent, '', $langs, 1, 0).' %';
+	}
 	print '</td></tr>';
 
 	// Opportunity Amount
 	print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-	if (strcmp($object->opp_amount, '')) print price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency);
+	if (strcmp($object->opp_amount, '')) {
+		print price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency);
+	}
 	print '</td></tr>';
 }
 
@@ -221,12 +295,16 @@ print ($start ? $start : '?');
 $end = dol_print_date($object->date_end, 'day');
 print ' - ';
 print ($end ? $end : '?');
-if ($object->hasDelay()) print img_warning("Late");
+if ($object->hasDelay()) {
+	print img_warning("Late");
+}
 print '</td></tr>';
 
 // Budget
 print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-if (strcmp($object->budget_amount, '')) print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+if (strcmp($object->budget_amount, '')) {
+	print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+}
 print '</td></tr>';
 
 // Other attributes
@@ -517,11 +595,11 @@ $listofreferent = array(
 	'table'=>'actioncomm',
 	'datefieldname'=>'datep',
 	'disableamount'=>1,
-    'urlnew'=>DOL_URL_ROOT.'/comm/action/card.php?action=create&projectid='.$id.'&socid='.$socid,
-    'lang'=>'agenda',
-    'buttonnew'=>'AddEvent',
-    'testnew'=>$user->rights->agenda->myactions->create,
-    'test'=>$conf->agenda->enabled && $user->rights->agenda->myactions->read),
+	'urlnew'=>DOL_URL_ROOT.'/comm/action/card.php?action=create&projectid='.$id.'&socid='.$socid,
+	'lang'=>'agenda',
+	'buttonnew'=>'AddEvent',
+	'testnew'=>$user->rights->agenda->myactions->create,
+	'test'=>$conf->agenda->enabled && $user->rights->agenda->myactions->read),
 */
 );
 
@@ -558,24 +636,20 @@ if (!empty($hookmanager->resArray)) {
 	$listofreferent = array_merge($listofreferent, $hookmanager->resArray);
 }
 
-if ($action == "addelement")
-{
+if ($action == "addelement") {
 	$tablename = GETPOST("tablename");
 	$elementselectid = GETPOST("elementselect");
 	$result = $object->update_element($tablename, $elementselectid);
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-} elseif ($action == "unlink")
-{
+} elseif ($action == "unlink") {
 	$tablename = GETPOST("tablename", "aZ09");
 	$projectField = GETPOSTISSET('projectfield') ? GETPOST('projectfield', 'aZ09') : 'fk_projet';
 	$elementselectid = GETPOST("elementselect", "int");
 
 	$result = $object->remove_element($tablename, $elementselectid, $projectField);
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -586,8 +660,7 @@ $elementuser = new User($db);
 
 $showdatefilter = 0;
 // Show the filter on date on top of element list
-if (!$showdatefilter)
-{
+if (!$showdatefilter) {
 	print '<div class="center centpercent">';
 	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -614,7 +687,9 @@ if (!$showdatefilter)
 
 $langs->loadLangs(array("suppliers", "bills", "orders", "proposals", "margins"));
 
-if (!empty($conf->stock->enabled)) $langs->load('stocks');
+if (!empty($conf->stock->enabled)) {
+	$langs->load('stocks');
+}
 
 print load_fiche_titre($langs->trans("Profit"), '', 'title_accountancy');
 
@@ -623,13 +698,11 @@ print '<tr class="liste_titre">';
 print '<td class="left" width="200">';
 $tooltiponprofit = $langs->trans("ProfitIsCalculatedWith")."<br>\n";
 $tooltiponprofitplus = $tooltiponprofitminus = '';
-foreach ($listofreferent as $key => $value)
-{
+foreach ($listofreferent as $key => $value) {
 	$name = $langs->trans($value['name']);
 	$qualified = $value['test'];
 	$margin = $value['margin'];
-	if ($qualified && isset($margin))		// If this element must be included into profit calculation ($margin is 'minus' or 'add')
-	{
+	if ($qualified && isset($margin)) {		// If this element must be included into profit calculation ($margin is 'minus' or 'add')
 		if ($margin == 'add') {
 			$tooltiponprofitplus .= ' &gt; '.$name." (+)<br>\n";
 		}
@@ -651,8 +724,7 @@ $total_revenue_ht = 0;
 $balance_ht = 0;
 $balance_ttc = 0;
 
-foreach ($listofreferent as $key => $value)
-{
+foreach ($listofreferent as $key => $value) {
 	$parameters = array(
 		'total_revenue_ht' =>& $total_revenue_ht,
 		'balance_ht' =>& $balance_ht,
@@ -694,25 +766,38 @@ foreach ($listofreferent as $key => $value)
 				$idofelementuser = $tmp[1];
 
 				$element->fetch($idofelement);
-				if ($idofelementuser) $elementuser->fetch($idofelementuser);
+				if ($idofelementuser) {
+					$elementuser->fetch($idofelementuser);
+				}
 
 				// Define if record must be used for total or not
 				$qualifiedfortotal = true;
 				if ($key == 'invoice') {
-				    if (!empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal = false; // Replacement invoice, do not include into total
-				    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $element->type == Facture::TYPE_DEPOSIT) $qualifiedfortotal = false; // If hidden option to use deposits as payment (deprecated, not recommended to use this), deposits are not included
+					if (!empty($element->close_code) && $element->close_code == 'replaced') {
+						$qualifiedfortotal = false; // Replacement invoice, do not include into total
+					}
+					if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $element->type == Facture::TYPE_DEPOSIT) {
+						$qualifiedfortotal = false; // If hidden option to use deposits as payment (deprecated, not recommended to use this), deposits are not included
+					}
 				}
 				if ($key == 'propal') {
-					if ($element->status != Propal::STATUS_SIGNED && $element->status != Propal::STATUS_BILLED) $qualifiedfortotal = false; // Only signed proposal must not be included in total
+					if ($element->status != Propal::STATUS_SIGNED && $element->status != Propal::STATUS_BILLED) {
+						$qualifiedfortotal = false; // Only signed proposal must not be included in total
+					}
 				}
 
-				if ($tablename != 'expensereport_det' && method_exists($element, 'fetch_thirdparty')) $element->fetch_thirdparty();
+				if ($tablename != 'expensereport_det' && method_exists($element, 'fetch_thirdparty')) {
+					$element->fetch_thirdparty();
+				}
 
 				// Define $total_ht_by_line
-				if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ht_by_line = $element->amount;
-				elseif ($tablename == 'fichinter') $total_ht_by_line = $element->getAmount();
-				elseif ($tablename == 'stock_mouvement') $total_ht_by_line = $element->price * abs($element->qty);
-				elseif ($tablename == 'projet_task') {
+				if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') {
+					$total_ht_by_line = $element->amount;
+				} elseif ($tablename == 'fichinter') {
+					$total_ht_by_line = $element->getAmount();
+				} elseif ($tablename == 'stock_mouvement') {
+					$total_ht_by_line = $element->price * abs($element->qty);
+				} elseif ($tablename == 'projet_task') {
 					if ($idofelementuser) {
 						$tmp = $element->getSumOfAmount($elementuser, $dates, $datee);
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
@@ -743,18 +828,25 @@ foreach ($listofreferent as $key => $value)
 							}
 						}
 					}
-				} else $total_ht_by_line = $element->total_ht;
+				} else {
+					$total_ht_by_line = $element->total_ht;
+				}
 
 				// Define $total_ttc_by_line
-				if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ttc_by_line = $element->amount;
-				elseif ($tablename == 'fichinter') $total_ttc_by_line = $element->getAmount();
-				elseif ($tablename == 'stock_mouvement') $total_ttc_by_line = $element->price * abs($element->qty);
-				elseif ($tablename == 'projet_task') {
+				if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') {
+					$total_ttc_by_line = $element->amount;
+				} elseif ($tablename == 'fichinter') {
+					$total_ttc_by_line = $element->getAmount();
+				} elseif ($tablename == 'stock_mouvement') {
+					$total_ttc_by_line = $element->price * abs($element->qty);
+				} elseif ($tablename == 'projet_task') {
 					$defaultvat = get_default_tva($mysoc, $mysoc);
 					$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
 				} elseif ($key == 'loan') {
 						$total_ttc_by_line = $total_ht_by_line; // For loan there is actually no taxe managed in Dolibarr
-				} else $total_ttc_by_line = $element->total_ttc;
+				} else {
+					$total_ttc_by_line = $element->total_ttc;
+				}
 
 				// Change sign of $total_ht_by_line and $total_ttc_by_line for some cases
 				if ($tablename == 'payment_various') {
@@ -773,7 +865,9 @@ foreach ($listofreferent as $key => $value)
 
 			// Each element with at least one line is output
 			$qualifiedforfinalprofit = true;
-			if ($key == 'intervention' && empty($conf->global->PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT)) $qualifiedforfinalprofit = false;
+			if ($key == 'intervention' && empty($conf->global->PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT)) {
+				$qualifiedforfinalprofit = false;
+			}
 			//var_dump($key.' '.$qualifiedforfinalprofit);
 
 			// Calculate margin
@@ -798,18 +892,24 @@ foreach ($listofreferent as $key => $value)
 			print '<td class="right">'.$i.'</td>';
 			// Amount HT
 			print '<td class="right">';
-			if ($key == 'intervention' && !$qualifiedforfinalprofit) print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("NA"), $langs->trans("AmountOfInteventionNotIncludedByDefault")).'</span>';
-			else {
+			if ($key == 'intervention' && !$qualifiedforfinalprofit) {
+				print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("NA"), $langs->trans("AmountOfInteventionNotIncludedByDefault")).'</span>';
+			} else {
 				print price($total_ht);
-				if ($key == 'propal') print '<span class="opacitymedium">'.$form->textwithpicto('', $langs->trans("SignedOnly")).'</span>';
+				if ($key == 'propal') {
+					print '<span class="opacitymedium">'.$form->textwithpicto('', $langs->trans("SignedOnly")).'</span>';
+				}
 			}
 			print '</td>';
 			// Amount TTC
 			print '<td class="right">';
-			if ($key == 'intervention' && !$qualifiedforfinalprofit) print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("NA"), $langs->trans("AmountOfInteventionNotIncludedByDefault")).'</span>';
-			else {
+			if ($key == 'intervention' && !$qualifiedforfinalprofit) {
+				print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("NA"), $langs->trans("AmountOfInteventionNotIncludedByDefault")).'</span>';
+			} else {
 				print price($total_ttc);
-				if ($key == 'propal') print '<span class="opacitymedium">'.$form->textwithpicto('', $langs->trans("SignedOnly")).'</span>';
+				if ($key == 'propal') {
+					print '<span class="opacitymedium">'.$form->textwithpicto('', $langs->trans("SignedOnly")).'</span>';
+				}
 			}
 			print '</td>';
 			print '</tr>';
@@ -841,8 +941,7 @@ print '<br>';
 
 
 // Detail
-foreach ($listofreferent as $key => $value)
-{
+foreach ($listofreferent as $key => $value) {
 	$parameters = array(
 		'key' => $key,
 		'value' =>& $value,
@@ -869,13 +968,17 @@ foreach ($listofreferent as $key => $value)
 	$project_field = $value['project_field'];
 
 	$exclude_select_element = array('payment_various');
-	if (!empty($value['exclude_select_element'])) $exclude_select_element[] = $value['exclude_select_element'];
+	if (!empty($value['exclude_select_element'])) {
+		$exclude_select_element[] = $value['exclude_select_element'];
+	}
 
 	if ($qualified) {
 		// If we want the project task array to have details of users
 		//if ($key == 'project_task') $key = 'project_task_time';
 
-		if ($langtoload) $langs->load($langtoload);
+		if ($langtoload) {
+			$langs->load($langtoload);
+		}
 
 		$element = new $classname($db);
 
@@ -883,20 +986,18 @@ foreach ($listofreferent as $key => $value)
 
 		$idtofilterthirdparty = 0;
 		$array_of_element_linkable_with_different_thirdparty = array('facture_fourn', 'commande_fournisseur');
-		if (!in_array($tablename, $array_of_element_linkable_with_different_thirdparty))
-		{
+		if (!in_array($tablename, $array_of_element_linkable_with_different_thirdparty)) {
 			$idtofilterthirdparty = $object->thirdparty->id;
-			if (!empty($conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS)) $idtofilterthirdparty .= ','.$conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS;
+			if (!empty($conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS)) {
+				$idtofilterthirdparty .= ','.$conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS;
+			}
 		}
 
-	   	if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element))
-	   	{
+		if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element)) {
 			$selectList = $formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300 minwidth75imp', -2, !empty($project_field) ? $project_field : 'fk_projet');
-			if ($selectList < 0)
-			{
+			if ($selectList < 0) {
 				setEventMessages($formproject->error, $formproject->errors, 'errors');
-			} elseif ($selectList)
-			{
+			} elseif ($selectList) {
 				// Define form with the combo list of elements to link
 				$addform .= '<div class="inline-block valignmiddle">';
 				$addform .= '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
@@ -913,11 +1014,11 @@ foreach ($listofreferent as $key => $value)
 				$addform .= '</div>';
 			}
 		}
-		if (empty($conf->global->PROJECT_CREATE_ON_OVERVIEW_DISABLED) && $urlnew)
-		{
+		if (empty($conf->global->PROJECT_CREATE_ON_OVERVIEW_DISABLED) && $urlnew) {
 			$addform .= '<div class="inline-block valignmiddle">';
-			if ($testnew) $addform .= '<a class="buttonxxx" href="'.$urlnew.'"><span class="valignmiddle text-plus-circle hideonsmartphone">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
-			elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
+			if ($testnew) {
+				$addform .= '<a class="buttonxxx" href="'.$urlnew.'"><span class="valignmiddle text-plus-circle hideonsmartphone">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
+			} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
 				$addform .= '<a class="buttonxxx buttonRefused" disabled="disabled" href="#"><span class="valignmiddle text-plus-circle hideonsmartphone">'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
 			}
 			$addform .= '<div>';
@@ -936,19 +1037,27 @@ foreach ($listofreferent as $key => $value)
 		print '<td'.(($tablename != 'actioncomm' && $tablename != 'projet_task') ? ' style="width: 200px"' : '').'>'.$langs->trans("Ref").'</td>';
 		// Date
 		print '<td'.(($tablename != 'actioncomm' && $tablename != 'projet_task') ? ' style="width: 200px"' : '').' class="center">';
-		if (in_array($tablename, array('projet_task'))) print $langs->trans("TimeSpent");
-		if (!in_array($tablename, array('projet_task'))) print $langs->trans("Date");
+		if (in_array($tablename, array('projet_task'))) {
+			print $langs->trans("TimeSpent");
+		}
+		if (!in_array($tablename, array('projet_task'))) {
+			print $langs->trans("Date");
+		}
 		print '</td>';
 		// Thirdparty or user
 		print '<td>';
-		if (in_array($tablename, array('projet_task')) && $key == 'project_task') print ''; // if $key == 'project_task', we don't want details per user
-		elseif (in_array($tablename, array('payment_various'))) print ''; // if $key == 'payment_various', we don't have any thirdparty
-		elseif (in_array($tablename, array('expensereport_det', 'don', 'projet_task', 'stock_mouvement', 'payment_salary'))) print $langs->trans("User");
-		else print $langs->trans("ThirdParty");
+		if (in_array($tablename, array('projet_task')) && $key == 'project_task') {
+			print ''; // if $key == 'project_task', we don't want details per user
+		} elseif (in_array($tablename, array('payment_various'))) {
+			print ''; // if $key == 'payment_various', we don't have any thirdparty
+		} elseif (in_array($tablename, array('expensereport_det', 'don', 'projet_task', 'stock_mouvement', 'payment_salary'))) {
+			print $langs->trans("User");
+		} else {
+			print $langs->trans("ThirdParty");
+		}
 		print '</td>';
 		// Duration of intervention
-		if ($tablename == 'fichinter')
-				{
+		if ($tablename == 'fichinter') {
 			print '<td>';
 			print $langs->trans("TotalDuration");
 			$total_duration = 0;
@@ -957,22 +1066,32 @@ foreach ($listofreferent as $key => $value)
 		// Amount HT
 		//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>';
 		//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("Amount").'</td>';
-		if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("LoanCapital").'</td>';
-		elseif (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>';
-		else print '<td width="120"></td>';
+		if ($key == 'loan') {
+			print '<td class="right" width="120">'.$langs->trans("LoanCapital").'</td>';
+		} elseif (empty($value['disableamount'])) {
+			print '<td class="right" width="120">'.$langs->trans("AmountHT").'</td>';
+		} else {
+			print '<td width="120"></td>';
+		}
 		// Amount TTC
 		//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
-		if ($key == 'loan') print '<td class="right" width="120">'.$langs->trans("RemainderToPay").'</td>';
-		elseif (empty($value['disableamount'])) print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
-		else print '<td width="120"></td>';
+		if ($key == 'loan') {
+			print '<td class="right" width="120">'.$langs->trans("RemainderToPay").'</td>';
+		} elseif (empty($value['disableamount'])) {
+			print '<td class="right" width="120">'.$langs->trans("AmountTTC").'</td>';
+		} else {
+			print '<td width="120"></td>';
+		}
 		// Status
-		if (in_array($tablename, array('projet_task'))) print '<td class="right" width="200">'.$langs->trans("ProgressDeclared").'</td>';
-		else print '<td class="right" width="200">'.$langs->trans("Status").'</td>';
+		if (in_array($tablename, array('projet_task'))) {
+			print '<td class="right" width="200">'.$langs->trans("ProgressDeclared").'</td>';
+		} else {
+			print '<td class="right" width="200">'.$langs->trans("Status").'</td>';
+		}
 		print '</tr>';
 
 		$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field) ? $project_field : 'fk_projet');
-		if (is_array($elementarray) && count($elementarray) > 0)
-		{
+		if (is_array($elementarray) && count($elementarray) > 0) {
 			$total_ht = 0;
 			$total_ttc = 0;
 
@@ -982,26 +1101,27 @@ foreach ($listofreferent as $key => $value)
 			$saved_third_id = 0;
 			$breakline = '';
 
-			if (canApplySubtotalOn($tablename))
-			{
+			if (canApplySubtotalOn($tablename)) {
 				// Sort
 				$elementarray = sortElementsByClientName($elementarray);
 			}
 
 			$num = count($elementarray);
-			for ($i = 0; $i < $num; $i++)
-			{
+			for ($i = 0; $i < $num; $i++) {
 				$tmp = explode('_', $elementarray[$i]);
 				$idofelement = $tmp[0];
 				$idofelementuser = $tmp[1];
 
 				$element->fetch($idofelement);
-				if ($idofelementuser) $elementuser->fetch($idofelementuser);
+				if ($idofelementuser) {
+					$elementuser->fetch($idofelementuser);
+				}
 
 				// Special cases
-				if ($tablename != 'expensereport_det')
-				{
-					if (method_exists($element, 'fetch_thirdparty')) $element->fetch_thirdparty();
+				if ($tablename != 'expensereport_det') {
+					if (method_exists($element, 'fetch_thirdparty')) {
+						$element->fetch_thirdparty();
+					}
 				} else {
 					$expensereport = new ExpenseReport($db);
 					$expensereport->fetch($element->fk_expensereport);
@@ -1009,8 +1129,7 @@ foreach ($listofreferent as $key => $value)
 
 				//print 'xxx'.$tablename.'yyy'.$classname;
 
-				if ($breakline && $saved_third_id != $element->thirdparty->id)
-				{
+				if ($breakline && $saved_third_id != $element->thirdparty->id) {
 					print $breakline;
 
 					$saved_third_id = $element->thirdparty->id;
@@ -1022,19 +1141,18 @@ foreach ($listofreferent as $key => $value)
 				$saved_third_id = $element->thirdparty->id;
 
 				$qualifiedfortotal = true;
-				if ($key == 'invoice')
-				{
-					if (!empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal = false; // Replacement invoice, do not include into total
+				if ($key == 'invoice') {
+					if (!empty($element->close_code) && $element->close_code == 'replaced') {
+						$qualifiedfortotal = false; // Replacement invoice, do not include into total
+					}
 				}
 
 				print '<tr class="oddeven">';
 
 				// Remove link
 				print '<td style="width: 24px">';
-				if ($tablename != 'projet_task' && $tablename != 'stock_mouvement')
-				{
-					if (empty($conf->global->PROJECT_DISABLE_UNLINK_FROM_OVERVIEW) || $user->admin)		// PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by defaut, so this test true
-					{
+				if ($tablename != 'projet_task' && $tablename != 'stock_mouvement') {
+					if (empty($conf->global->PROJECT_DISABLE_UNLINK_FROM_OVERVIEW) || $user->admin) {		// PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by defaut, so this test true
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=unlink&tablename='.$tablename.'&elementselect='.$element->id.($project_field ? '&projectfield='.$project_field : '').'" class="reposition">';
 						print img_picto($langs->trans('Unlink'), 'unlink');
 						print '</a>';
@@ -1044,19 +1162,19 @@ foreach ($listofreferent as $key => $value)
 
 				// Ref
 				print '<td class="left nowraponall">';
-				if ($tablename == 'expensereport_det')
-				{
+				if ($tablename == 'expensereport_det') {
 					print $expensereport->getNomUrl(1);
 				} else {
 					// Show ref with link
-					if ($element instanceof Task)
-					{
+					if ($element instanceof Task) {
 						print $element->getNomUrl(1, 'withproject', 'time');
 						print ' - '.dol_trunc($element->label, 48);
 					} elseif ($key == 'loan') {
 						print $element->getNomUrl(1);
 						print ' - '.dol_trunc($element->label, 48);
-					} else print $element->getNomUrl(1);
+					} else {
+						print $element->getNomUrl(1);
+					}
 
 					$element_doc = $element->element;
 					$filename = dol_sanitizeFileName($element->ref);
@@ -1074,32 +1192,48 @@ foreach ($listofreferent as $key => $value)
 					print '<div class="inline-block valignmiddle">'.$formfile->getDocumentsLink($element_doc, $filename, $filedir).'</div>';
 
 					// Show supplier ref
-					if (!empty($element->ref_supplier)) print ' - '.$element->ref_supplier;
+					if (!empty($element->ref_supplier)) {
+						print ' - '.$element->ref_supplier;
+					}
 					// Show customer ref
-					if (!empty($element->ref_customer)) print ' - '.$element->ref_customer;
+					if (!empty($element->ref_customer)) {
+						print ' - '.$element->ref_customer;
+					}
 				}
 				print "</td>\n";
 
 				// Date or TimeSpent
 				$date = ''; $total_time_by_line = null;
-				if ($tablename == 'expensereport_det') $date = $element->date; // No draft status on lines
-				elseif ($tablename == 'stock_mouvement') $date = $element->datem;
-				elseif ($tablename == 'payment_salary') $date = $element->datev;
-				elseif ($tablename == 'payment_various') $date = $element->datev;
-				elseif ($tablename == 'chargesociales') $date = $element->date_ech;
-				elseif (!empty($element->status) || !empty($element->statut) || !empty($element->fk_status))
-				{
-					if ($tablename == 'don') $date = $element->datedon;
-					if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
-					{
+				if ($tablename == 'expensereport_det') {
+					$date = $element->date; // No draft status on lines
+				} elseif ($tablename == 'stock_mouvement') {
+					$date = $element->datem;
+				} elseif ($tablename == 'payment_salary') {
+					$date = $element->datev;
+				} elseif ($tablename == 'payment_various') {
+					$date = $element->datev;
+				} elseif ($tablename == 'chargesociales') {
+					$date = $element->date_ech;
+				} elseif (!empty($element->status) || !empty($element->statut) || !empty($element->fk_status)) {
+					if ($tablename == 'don') {
+						$date = $element->datedon;
+					}
+					if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order') {
 						$date = ($element->date_commande ? $element->date_commande : $element->date_valid);
-					} elseif ($tablename == 'supplier_proposal') $date = $element->date_validation; // There is no other date for this
-					elseif ($tablename == 'fichinter') $date = $element->datev; // There is no other date for this
-					elseif ($tablename == 'projet_task') $date = ''; // We show no date. Showing date of beginning of task make user think it is date of time consumed
-					else {
+					} elseif ($tablename == 'supplier_proposal') {
+						$date = $element->date_validation; // There is no other date for this
+					} elseif ($tablename == 'fichinter') {
+						$date = $element->datev; // There is no other date for this
+					} elseif ($tablename == 'projet_task') {
+						$date = ''; // We show no date. Showing date of beginning of task make user think it is date of time consumed
+					} else {
 						$date = $element->date; // invoice, ...
-						if (empty($date)) $date = $element->date_contrat;
-						if (empty($date)) $date = $element->datev;
+						if (empty($date)) {
+							$date = $element->date_contrat;
+						}
+						if (empty($date)) {
+							$date = $element->datev;
+						}
 						if (empty($date) && !empty($datefieldname)) {
 							$date = $element->$datefieldname;
 						}
@@ -1109,18 +1243,20 @@ foreach ($listofreferent as $key => $value)
 				}
 
 				print '<td class="center">';
-				if ($tablename == 'actioncomm')
-				{
+				if ($tablename == 'actioncomm') {
 					print dol_print_date($element->datep, 'dayhour');
-					if ($element->datef && $element->datef > $element->datep) print " - ".dol_print_date($element->datef, 'dayhour');
-				} elseif (in_array($tablename, array('projet_task')))
-				{
+					if ($element->datef && $element->datef > $element->datep) {
+						print " - ".dol_print_date($element->datef, 'dayhour');
+					}
+				} elseif (in_array($tablename, array('projet_task'))) {
 					$tmpprojtime = $element->getSumOfAmount($elementuser, $dates, $datee); // $element is a task. $elementuser may be empty
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$idofelement.'&withproject=1">';
 					print convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin');
 					print '</a>';
 					$total_time_by_line = $tmpprojtime['nbseconds'];
-				} else print dol_print_date($date, 'day');
+				} else {
+					print dol_print_date($date, 'day');
+				}
 				print '</td>';
 
 				// Third party or user
@@ -1131,28 +1267,23 @@ foreach ($listofreferent as $key => $value)
 					$tmpuser = new User($db);
 					$tmpuser->fetch($expensereport->fk_user_author);
 					print $tmpuser->getNomUrl(1, '', 48);
-				} elseif ($tablename == 'payment_salary')
-				{
+				} elseif ($tablename == 'payment_salary') {
 					$tmpuser = new User($db);
 					$tmpuser->fetch($element->fk_user);
 					print $tmpuser->getNomUrl(1, '', 48);
-				} elseif ($tablename == 'don' || $tablename == 'stock_mouvement')
-				{
-					if ($element->fk_user_author > 0)
-					{
+				} elseif ($tablename == 'don' || $tablename == 'stock_mouvement') {
+					if ($element->fk_user_author > 0) {
 						$tmpuser2 = new User($db);
 						$tmpuser2->fetch($element->fk_user_author);
 						print $tmpuser2->getNomUrl(1, '', 48);
 					}
-				} elseif ($tablename == 'projet_task' && $key == 'project_task_time')	// if $key == 'project_task', we don't want details per user
-				{
+				} elseif ($tablename == 'projet_task' && $key == 'project_task_time') {	// if $key == 'project_task', we don't want details per user
 					print $elementuser->getNomUrl(1);
 				}
 				print '</td>';
 
 				// Add duration and store it in counter for fichinter
-				if ($tablename == 'fichinter')
-				{
+				if ($tablename == 'fichinter') {
 					print '<td>';
 					print convertSecondToTime($element->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
 					$total_duration += $element->duration;
@@ -1161,113 +1292,123 @@ foreach ($listofreferent as $key => $value)
 
 				// Amount without tax
 				$warning = '';
-				if (empty($value['disableamount']))
-				{
+				if (empty($value['disableamount'])) {
 					$total_ht_by_line = null;
 					$othermessage = '';
-					if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ht_by_line = $element->amount;
-					elseif ($tablename == 'fichinter') $total_ht_by_line = $element->getAmount();
-					elseif ($tablename == 'stock_mouvement') $total_ht_by_line = $element->price * abs($element->qty);
-					elseif (in_array($tablename, array('projet_task')))
-					{
-						if (!empty($conf->salaries->enabled))
-						{
+					if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') {
+						$total_ht_by_line = $element->amount;
+					} elseif ($tablename == 'fichinter') {
+						$total_ht_by_line = $element->getAmount();
+					} elseif ($tablename == 'stock_mouvement') {
+						$total_ht_by_line = $element->price * abs($element->qty);
+					} elseif (in_array($tablename, array('projet_task'))) {
+						if (!empty($conf->salaries->enabled)) {
 							// TODO Permission to read daily rate to show value
 							$total_ht_by_line = price2num($tmpprojtime['amount'], 'MT');
-							if ($tmpprojtime['nblinesnull'] > 0)
-							{
+							if ($tmpprojtime['nblinesnull'] > 0) {
 								$langs->load("errors");
 								$warning = $langs->trans("WarningSomeLinesWithNullHourlyRate", $conf->currency);
 							}
 						} else {
 							$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
 						}
-					} elseif ($key == 'loan') $total_ht_by_line = $element->capital;
-					else {
+					} elseif ($key == 'loan') {
+						$total_ht_by_line = $element->capital;
+					} else {
 						$total_ht_by_line = $element->total_ht;
 					}
 
 					// Change sign of $total_ht_by_line and $total_ttc_by_line for some cases
-					if ($tablename == 'payment_various')
-					{
-						if ($element->sens == 0)
-						{
+					if ($tablename == 'payment_various') {
+						if ($element->sens == 0) {
 							$total_ht_by_line = -$total_ht_by_line;
 						}
 					}
 
 					print '<td class="right">';
-					if ($othermessage) print $othermessage;
-					if (isset($total_ht_by_line))
-					{
-						if (!$qualifiedfortotal) print '<strike>';
-						print price($total_ht_by_line);
-						if (!$qualifiedfortotal) print '</strike>';
+					if ($othermessage) {
+						print $othermessage;
+					}
+					if (isset($total_ht_by_line)) {
+						if (!$qualifiedfortotal) {
+							print '<strike>';
+						}
+						print price($total_ht_by_line);
+						if (!$qualifiedfortotal) {
+							print '</strike>';
+						}
+					}
+					if ($warning) {
+						print ' '.img_warning($warning);
 					}
-					if ($warning) print ' '.img_warning($warning);
 					print '</td>';
-				} else print '<td></td>';
+				} else {
+					print '<td></td>';
+				}
 
 				// Amount inc tax
-				if (empty($value['disableamount']))
-				{
+				if (empty($value['disableamount'])) {
 					$total_ttc_by_line = null;
-					if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ttc_by_line = $element->amount;
-					elseif ($tablename == 'fichinter') $total_ttc_by_line = $element->getAmount();
-					elseif ($tablename == 'stock_mouvement') $total_ttc_by_line = $element->price * abs($element->qty);
-					elseif ($tablename == 'projet_task')
-					{
-						if (!empty($conf->salaries->enabled))
-						{
+					if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') {
+						$total_ttc_by_line = $element->amount;
+					} elseif ($tablename == 'fichinter') {
+						$total_ttc_by_line = $element->getAmount();
+					} elseif ($tablename == 'stock_mouvement') {
+						$total_ttc_by_line = $element->price * abs($element->qty);
+					} elseif ($tablename == 'projet_task') {
+						if (!empty($conf->salaries->enabled)) {
 							// TODO Permission to read daily rate
 							$defaultvat = get_default_tva($mysoc, $mysoc);
 							$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
 						} else {
 							$othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
 						}
-					} elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
-					else {
+					} elseif ($key == 'loan') {
+						$total_ttc_by_line = $element->capital - $element->getSumPayment();
+					} else {
 						$total_ttc_by_line = $element->total_ttc;
 					}
 
 					// Change sign of $total_ht_by_line and $total_ttc_by_line for some cases
-					if ($tablename == 'payment_various')
-					{
-						if ($element->sens == 0)
-						{
+					if ($tablename == 'payment_various') {
+						if ($element->sens == 0) {
 							$total_ttc_by_line = -$total_ttc_by_line;
 						}
 					}
 
 					print '<td class="right">';
-					if ($othermessage) print $othermessage;
-					if (isset($total_ttc_by_line))
-					{
-						if (!$qualifiedfortotal) print '<strike>';
-						print price($total_ttc_by_line);
-						if (!$qualifiedfortotal) print '</strike>';
+					if ($othermessage) {
+						print $othermessage;
+					}
+					if (isset($total_ttc_by_line)) {
+						if (!$qualifiedfortotal) {
+							print '<strike>';
+						}
+						print price($total_ttc_by_line);
+						if (!$qualifiedfortotal) {
+							print '</strike>';
+						}
+					}
+					if ($warning) {
+						print ' '.img_warning($warning);
 					}
-					if ($warning) print ' '.img_warning($warning);
 					print '</td>';
-				} else print '<td></td>';
+				} else {
+					print '<td></td>';
+				}
 
 				// Status
 				print '<td class="right">';
-				if ($tablename == 'expensereport_det')
-				{
+				if ($tablename == 'expensereport_det') {
 					print $expensereport->getLibStatut(5);
-				} elseif ($element instanceof CommonInvoice)
-				{
+				} elseif ($element instanceof CommonInvoice) {
 					//This applies for Facture and FactureFournisseur
 					print $element->getLibStatut(5, $element->getSommePaiement());
-				} elseif ($element instanceof Task)
-				{
-					if ($element->progress != '')
-					{
+				} elseif ($element instanceof Task) {
+					if ($element->progress != '') {
 						print $element->progress.' %';
 					}
-				} elseif ($tablename == 'stock_mouvement')
-				{
+				} elseif ($tablename == 'stock_mouvement') {
 					print $element->getLibStatut(3);
 				} else {
 					print $element->getLibStatut(5);
@@ -1276,8 +1417,7 @@ foreach ($listofreferent as $key => $value)
 
 				print '</tr>';
 
-				if ($qualifiedfortotal)
-				{
+				if ($qualifiedfortotal) {
 					$total_ht = $total_ht + $total_ht_by_line;
 					$total_ttc = $total_ttc + $total_ttc_by_line;
 
@@ -1287,8 +1427,7 @@ foreach ($listofreferent as $key => $value)
 					$total_time = $total_time + $total_time_by_line;
 				}
 
-				if (canApplySubtotalOn($tablename))
-				{
+				if (canApplySubtotalOn($tablename)) {
 					$breakline = '<tr class="liste_total liste_sub_total">';
 					$breakline .= '<td colspan="2">';
 					$breakline .= '</td>';
@@ -1296,7 +1435,9 @@ foreach ($listofreferent as $key => $value)
 					$breakline .= '</td>';
 					$breakline .= '<td class="right">';
 					$breakline .= $langs->trans('SubTotal').' : ';
-					if (is_object($element->thirdparty)) $breakline .= $element->thirdparty->getNomUrl(0, '', 48);
+					if (is_object($element->thirdparty)) {
+						$breakline .= $element->thirdparty->getNomUrl(0, '', 48);
+					}
 					$breakline .= '</td>';
 					$breakline .= '<td class="right">'.price($total_ht_by_third).'</td>';
 					$breakline .= '<td class="right">'.price($total_ttc_by_third).'</td>';
@@ -1307,14 +1448,17 @@ foreach ($listofreferent as $key => $value)
 				//var_dump($element->thirdparty->name.' - '.$saved_third_id.' - '.$element->thirdparty->id);
 			}
 
-			if ($breakline) print $breakline;
+			if ($breakline) {
+				print $breakline;
+			}
 
 			// Total
 			$colspan = 4;
-			if (in_array($tablename, array('projet_task'))) $colspan = 2;
+			if (in_array($tablename, array('projet_task'))) {
+				$colspan = 2;
+			}
 			print '<tr class="liste_total"><td colspan="'.$colspan.'">'.$langs->trans("Number").': '.$i.'</td>';
-			if (in_array($tablename, array('projet_task')))
-			{
+			if (in_array($tablename, array('projet_task'))) {
 				print '<td class="center">';
 				print convertSecondToTime($total_time, 'allhourmin');
 				print '</td>';
@@ -1324,28 +1468,33 @@ foreach ($listofreferent as $key => $value)
 			//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_ht).'</td>';
 			//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("Total").' : '.price($total_ht).'</td>';
 						// If fichinter add the total_duration
-						if ($tablename == 'fichinter') print '<td class="left">'.convertSecondToTime($total_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
+			if ($tablename == 'fichinter') {
+				print '<td class="left">'.convertSecondToTime($total_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
+			}
 			print '<td class="right">';
-			if (empty($value['disableamount']))
-			{
-				if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("LoanCapital").' : '.price($total_ttc);
-				elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht);
+			if (empty($value['disableamount'])) {
+				if ($key == 'loan') {
+					print $langs->trans("Total").' '.$langs->trans("LoanCapital").' : '.price($total_ttc);
+				} elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) {
+					print ''.$langs->trans("TotalHT").' : '.price($total_ht);
+				}
 			}
 			print '</td>';
 			//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td class="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_ttc).'</td>';
 			//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td class="right" width="100"></td>';
 			print '<td class="right">';
-			if (empty($value['disableamount']))
-			{
-				if ($key == 'loan') print $langs->trans("Total").' '.$langs->trans("RemainderToPay").' : '.price($total_ttc);
-				elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc);
+			if (empty($value['disableamount'])) {
+				if ($key == 'loan') {
+					print $langs->trans("Total").' '.$langs->trans("RemainderToPay").' : '.price($total_ttc);
+				} elseif ($tablename != 'projet_task' || !empty($conf->salaries->enabled)) {
+					print $langs->trans("TotalTTC").' : '.price($total_ttc);
+				}
 			}
 			print '</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 		} else {
-			if (!is_array($elementarray))	// error
-			{
+			if (!is_array($elementarray)) {	// error
 				print $elementarray;
 			}
 		}
@@ -1356,8 +1505,7 @@ foreach ($listofreferent as $key => $value)
 }
 
 // Enhance with select2
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 	$comboenhancement = ajax_combobox('.elementselect');
 
@@ -1380,7 +1528,9 @@ function canApplySubtotalOn($tablename)
 {
 	global $conf;
 
-	if (empty($conf->global->PROJECT_ADD_SUBTOTAL_LINES)) return false;
+	if (empty($conf->global->PROJECT_ADD_SUBTOTAL_LINES)) {
+		return false;
+	}
 	return in_array($tablename, array('facture_fourn', 'commande_fournisseur'));
 }
 
@@ -1397,10 +1547,8 @@ function sortElementsByClientName($elementarray)
 	$element = new $classname($db);
 
 	$clientname = array();
-	foreach ($elementarray as $key => $id)	// id = id of object
-	{
-		if (empty($clientname[$id]))
-		{
+	foreach ($elementarray as $key => $id) {	// id = id of object
+		if (empty($clientname[$id])) {
 			$element->fetch($id);
 			$element->fetch_thirdparty();
 
@@ -1412,8 +1560,7 @@ function sortElementsByClientName($elementarray)
 	asort($clientname); // sort on name
 
 	$elementarray = array();
-	foreach ($clientname as $id => $name)
-	{
+	foreach ($clientname as $id => $name) {
 		$elementarray[] = $id;
 	}
 
diff --git a/htdocs/projet/event.php b/htdocs/projet/event.php
index 8cbd1895b89..b033cb95742 100644
--- a/htdocs/projet/event.php
+++ b/htdocs/projet/event.php
@@ -74,8 +74,11 @@ if ($action == 'update' && empty(GETPOST('cancel')) && $permissiontoadd) {
 		$action = 'edit';
 	} else {
 		$db->commit();
-		if (GETPOST('socid', 'int') > 0) $object->fetch_thirdparty(GETPOST('socid', 'int'));
-		else unset($object->thirdparty);
+		if (GETPOST('socid', 'int') > 0) {
+			$object->fetch_thirdparty(GETPOST('socid', 'int'));
+		} else {
+			unset($object->thirdparty);
+		}
 		$action='';
 	}
 }
@@ -87,7 +90,9 @@ if ($action == 'update' && empty(GETPOST('cancel')) && $permissiontoadd) {
  */
 
 $title = $langs->trans("Project").' - '.$langs->trans("ConferenceOrBoothTab").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("Note");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Note");
+}
 //TODO Make wiki docs
 $help_url = '';
 llxHeader("", $title, $help_url);
@@ -97,8 +102,7 @@ $userstatic = new User($db);
 
 $now = dol_now();
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$head = project_prepare_head($object);
 	print dol_get_fiche_head($head, 'eventorganisation', $langs->trans('ConferenceOrBoothTab'), -1);
 
@@ -110,15 +114,13 @@ if ($id > 0 || !empty($ref))
 	// Title
 	$morehtmlref .= $object->title;
 	// Thirdparty
-	if ($object->thirdparty->id > 0)
-	{
+	if ($object->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire)
-	{
+	if (!$user->rights->projet->all->lire) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 		$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
@@ -137,30 +139,26 @@ if ($id > 0 || !empty($ref))
 	print $langs->trans("Usage");
 	print '</td>';
 	print '<td>';
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-	{
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 		print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectFollowOpportunity");
 		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 		print '<br>';
 	}
-	if (empty($conf->global->PROJECT_HIDE_TASKS))
-	{
+	if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 		print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectFollowTasks");
 		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 		print '<br>';
 	}
-	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-	{
+	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 		print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectBillTimeDescription");
 		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 		print '<br>';
 	}
 
-	if (!empty($conf->eventorganization->enabled))
-	{
+	if (!empty($conf->eventorganization->enabled)) {
 		print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 		print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
@@ -169,21 +167,27 @@ if ($id > 0 || !empty($ref))
 
 	// Visibility
 	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-	if ($object->public) print $langs->trans('SharedProject');
-	else print $langs->trans('PrivateProject');
+	if ($object->public) {
+		print $langs->trans('SharedProject');
+	} else {
+		print $langs->trans('PrivateProject');
+	}
 	print '</td></tr>';
 
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity))
-	{
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity)) {
 		// Opportunity status
 		print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
 		$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
-		if ($code) print $langs->trans("OppStatus".$code);
+		if ($code) {
+			print $langs->trans("OppStatus".$code);
+		}
 		print '</td></tr>';
 
 		// Opportunity percent
 		print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-		if (strcmp($object->opp_percent, '')) print price($object->opp_percent, 0, $langs, 1, 0).' %';
+		if (strcmp($object->opp_percent, '')) {
+			print price($object->opp_percent, 0, $langs, 1, 0).' %';
+		}
 		print '</td></tr>';
 
 		// Opportunity Amount
@@ -192,12 +196,16 @@ if ($id > 0 || !empty($ref))
 		{
 		   print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
 		}*/
-		if (strcmp($object->opp_amount, '')) print price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+		if (strcmp($object->opp_amount, '')) {
+			print price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+		}
 		print '</td></tr>';
 
 		// Opportunity Weighted Amount
 		print '<tr><td>'.$langs->trans('OpportunityWeightedAmount').'</td><td>';
-		if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) print price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency);
+		if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) {
+			print price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency);
+		}
 		print '</td></tr>';
 	}
 
@@ -208,12 +216,16 @@ if ($id > 0 || !empty($ref))
 	$end = dol_print_date($object->date_end, 'day');
 	print ' - ';
 	print ($end ? $end : '?');
-	if ($object->hasDelay()) print img_warning("Late");
+	if ($object->hasDelay()) {
+		print img_warning("Late");
+	}
 	print '</td></tr>';
 
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-	if (strcmp($object->budget_amount, '')) print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+	if (strcmp($object->budget_amount, '')) {
+		print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+	}
 	print '</td></tr>';
 
 	// Other attributes
@@ -281,12 +293,16 @@ if ($id > 0 || !empty($ref))
 
 		//Price of registration
 		print '<tr><td class="valignmiddle">' . $langs->trans("PriceOfRegistration") . '</td><td>';
-		if (strcmp($object->price_registration, '')) print price($object->price_registration, 0, $langs, 1, 0, 0, $conf->currency);
+		if (strcmp($object->price_registration, '')) {
+			print price($object->price_registration, 0, $langs, 1, 0, 0, $conf->currency);
+		}
 		print "</td></tr>";
 
 		//Price of registration
 		print '<tr><td class="valignmiddle">' . $langs->trans("PriceOfBooth") . '</td><td>';
-		if (strcmp($object->price_booth, '')) print price($object->price_booth, 0, $langs, 1, 0, 0, $conf->currency);
+		if (strcmp($object->price_booth, '')) {
+			print price($object->price_booth, 0, $langs, 1, 0, 0, $conf->currency);
+		}
 		print "</td></tr>";
 	}
 
@@ -309,8 +325,7 @@ if ($id > 0 || !empty($ref))
 
 print dol_get_fiche_end();
 
-if ($action == 'edit' && $permissiontoadd > 0)
-{
+if ($action == 'edit' && $permissiontoadd > 0) {
 	print '<div class="center">';
 	print '<input name="update" class="button" type="submit" value="'.$langs->trans("Save").'">&nbsp; &nbsp; &nbsp;';
 	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -321,19 +336,16 @@ if ($action == 'edit' && $permissiontoadd > 0)
 
 
 /*
-     * Actions Buttons
-     */
+	 * Actions Buttons
+	 */
 print '<div class="tabsAction">';
 $parameters = array();
 $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 // modified by hook
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Modify
-	if ($object->statut != Project::STATUS_CLOSED && $action=='')
-	{
-		if ($permissiontoadd > 0)
-		{
+	if ($object->statut != Project::STATUS_CLOSED && $action=='') {
+		if ($permissiontoadd > 0) {
 			print '<a class="butAction" href="event.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index bacd7607f82..d83c10ec6bd 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -116,12 +116,10 @@ if (g.getDivId() != null)
 	$level = 0;
 	$tnums = count($tasks);
 	$old_project_id = 0;
-	for ($tcursor = 0; $tcursor < $tnums; $tcursor++)
-	{
+	for ($tcursor = 0; $tcursor < $tnums; $tcursor++) {
 		$t = $tasks[$tcursor];
 
-		if (empty($old_project_id) || $old_project_id != $t['task_project_id'])
-		{
+		if (empty($old_project_id) || $old_project_id != $t['task_project_id']) {
 			// Break on project, create a fictive task for project id $t['task_project_id']
 			$projecttmp = new Project($db);
 			$projecttmp->fetch($t['task_project_id']);
@@ -140,8 +138,7 @@ if (g.getDivId() != null)
 			$old_project_id = $t['task_project_id'];
 		}
 
-		if ($t["task_parent"] <= 0)
-		{
+		if ($t["task_parent"] <= 0) {
 			constructGanttLine($tasks, $t, $task_dependencies, $level, $t['task_project_id']);
 			findChildGanttLine($tasks, $t["task_id"], $task_dependencies, $level + 1);
 		}
@@ -180,7 +177,9 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 
 	$start_date = $task["task_start_date"];
 	$end_date = $task["task_end_date"];
-	if (!$end_date) $end_date = $start_date;
+	if (!$end_date) {
+		$end_date = $start_date;
+	}
 	$start_date = dol_print_date($start_date, $dateformatinput2);
 	$end_date = dol_print_date($end_date, $dateformatinput2);
 	// Resources
@@ -198,8 +197,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	}
 	// $depend .= "\"";
 	// Define parent
-	if ($project_id && $level < 0)
-	{
+	if ($project_id && $level < 0) {
 		$parent = '-'.$project_id;
 	} else {
 		$parent = $task["task_parent_alternate_id"];
@@ -208,8 +206,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	// Define percent
 	$percent = $task['task_percent_complete'] ? $task['task_percent_complete'] : 0;
 	// Link (more information)
-	if ($task["task_id"] < 0)
-	{
+	if ($task["task_id"] < 0) {
 		//$link=DOL_URL_ROOT.'/projet/tasks.php?withproject=1&id='.abs($task["task_id"]);
 		$link = '';
 	} else {
@@ -221,8 +218,8 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	$name = $task['task_name'];
 
 	/*for($i=0; $i < $level; $i++) {
-        $name=' - '.$name;
-    }*/
+		$name=' - '.$name;
+	}*/
 	// Add line to gantt
 	/*
 	g.AddTaskItem(new JSGantt.TaskItem(1, 'Define Chart API','',          '',          'ggroupblack','', 0, 'Brian', 0,  1,0,1,'','','Some Notes text',g));
@@ -247,7 +244,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	<dt>pCaption</dt><dd>(optional) caption that will be added after task bar if CaptionType set to "Caption"</dd>
 	<dt>pNotes</dt><dd>(optional) Detailed task information that will be displayed in tool tip for this task</dd>
 	<dt>pGantt</dt><dd>(required) javascript JSGantt.GanttChart object from which to take settings.  Defaults to &quot;g&quot; for backwards compatibility</dd>
-    */
+	*/
 
 	//$note="";
 
@@ -289,18 +286,16 @@ function findChildGanttLine($tarr, $parent, $task_dependencies, $level)
 	$n = count($tarr);
 
 	$old_parent_id = 0;
-	for ($x = 0; $x < $n; $x++)
-	{
-		if ($tarr[$x]["task_parent"] == $parent && $tarr[$x]["task_parent"] != $tarr[$x]["task_id"])
-		{
+	for ($x = 0; $x < $n; $x++) {
+		if ($tarr[$x]["task_parent"] == $parent && $tarr[$x]["task_parent"] != $tarr[$x]["task_id"]) {
 			// Create a grouping parent task for the new level
 			/*if (empty($old_parent_id) || $old_parent_id != $tarr[$x]['task_project_id'])
 			{
 				$tmpt = array(
-	        	'task_id'=> -98, 'task_name'=>'Level '.$level, 'task_resources'=>'', 'task_start_date'=>'', 'task_end_date'=>'',
-    	    	'task_is_group'=>1, 'task_css'=>'ggroupblack', 'task_milestone'=> 0, 'task_parent'=>$tarr[$x]["task_parent"], 'task_notes'=>'');
-        		constructGanttLine($tasks, $tmpt, array(), 0, $tarr[$x]['task_project_id']);
-        		$old_parent_id = $tarr[$x]['task_project_id'];
+				'task_id'=> -98, 'task_name'=>'Level '.$level, 'task_resources'=>'', 'task_start_date'=>'', 'task_end_date'=>'',
+				'task_is_group'=>1, 'task_css'=>'ggroupblack', 'task_milestone'=> 0, 'task_parent'=>$tarr[$x]["task_parent"], 'task_notes'=>'');
+				constructGanttLine($tasks, $tmpt, array(), 0, $tarr[$x]['task_project_id']);
+				$old_parent_id = $tarr[$x]['task_project_id'];
 			}*/
 
 			constructGanttLine($tarr, $tarr[$x], $task_dependencies, $level, null);
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 8b2f41554d3..b4dbc21e894 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -43,7 +43,9 @@ $mine = ($mode == 'mine' ? 1 : 0);
 $object = new Project($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+	$object->fetchComments();
+}
 
 // Security check
 $socid = 0;
@@ -74,8 +76,7 @@ $task = new Task($db);
 
 $arrayofcss = array('/includes/jsgantt/jsgantt.css');
 
-if (!empty($conf->use_javascript_ajax))
-{
+if (!empty($conf->use_javascript_ajax)) {
 	$arrayofjs = array(
 	'/includes/jsgantt/jsgantt.js',
 	'/projet/jsgantt_language.js.php?lang='.$langs->defaultlang
@@ -84,12 +85,13 @@ if (!empty($conf->use_javascript_ajax))
 
 //$title=$langs->trans("Gantt").($object->ref?' - '.$object->ref.' '.$object->name:'');
 $title = $langs->trans("Gantt");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = ($object->ref ? $object->ref.' '.$object->name.' - ' : '').$langs->trans("Gantt");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = ($object->ref ? $object->ref.' '.$object->name.' - ' : '').$langs->trans("Gantt");
+}
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 llxHeader("", $title, $help_url, '', 0, 0, $arrayofjs, $arrayofcss);
 
-if (($id > 0 && is_numeric($id)) || !empty($ref))
-{
+if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 	// To verify role of users
 	//$userAccess = $object->restrictedProjectArea($user,'read');
 	$userWrite = $object->restrictedProjectArea($user, 'write');
@@ -113,15 +115,13 @@ if (($id > 0 && is_numeric($id)) || !empty($ref))
 	// Title
 	$morehtmlref .= $object->title;
 	// Thirdparty
-	if ($object->thirdparty->id > 0)
-	{
+	if ($object->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire)
-	{
+	if (!$user->rights->projet->all->lire) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 		$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
@@ -140,22 +140,19 @@ if (($id > 0 && is_numeric($id)) || !empty($ref))
 	print $langs->trans("Usage");
 	print '</td>';
 	print '<td>';
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-	{
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 		print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectFollowOpportunity");
 		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 		print '<br>';
 	}
-	if (empty($conf->global->PROJECT_HIDE_TASKS))
-	{
+	if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 		print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectFollowTasks");
 		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 		print '<br>';
 	}
-	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-	{
+	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 		print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectBillTimeDescription");
 		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -165,8 +162,11 @@ if (($id > 0 && is_numeric($id)) || !empty($ref))
 
 	// Visibility
 	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-	if ($object->public) print $langs->trans('SharedProject');
-	else print $langs->trans('PrivateProject');
+	if ($object->public) {
+		print $langs->trans('SharedProject');
+	} else {
+		print $langs->trans('PrivateProject');
+	}
 	print '</td></tr>';
 
 	// Date start - end
@@ -176,12 +176,16 @@ if (($id > 0 && is_numeric($id)) || !empty($ref))
 	$end = dol_print_date($object->date_end, 'day');
 	print ' - ';
 	print ($end ? $end : '?');
-	if ($object->hasDelay()) print img_warning("Late");
+	if ($object->hasDelay()) {
+		print img_warning("Late");
+	}
 	print '</td></tr>';
 
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-	if (strcmp($object->budget_amount, '')) print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+	if (strcmp($object->budget_amount, '')) {
+		print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+	}
 	print '</td></tr>';
 
 	// Other attributes
@@ -252,8 +256,7 @@ $tasksarray = $task->getTasksArray(0, 0, ($object->id ? $object->id : $id), $soc
 //var_dump($tasksrole);
 
 
-if (count($tasksarray) > 0)
-{
+if (count($tasksarray) > 0) {
 	// Show Gant diagram from $taskarray using JSGantt
 
 	$dateformat = $langs->trans("FormatDateShortJQuery"); // Used by include ganttchart.inc.php later
@@ -262,8 +265,7 @@ if (count($tasksarray) > 0)
 	$tasks = array();
 	$task_dependencies = array();
 	$taskcursor = 0;
-	foreach ($tasksarray as $key => $val)	// Task array are sorted by "project, position, date"
-	{
+	foreach ($tasksarray as $key => $val) {	// Task array are sorted by "project, position, date"
 		$task->fetch($val->id, '');
 
 		$idparent = ($val->fk_parent ? $val->fk_parent : '-'.$val->fk_project); // If start with -, id is a project id
@@ -299,34 +301,34 @@ if (count($tasksarray) > 0)
 
 		$idofusers = $task->getListContactId('internal');
 		$idofcontacts = $task->getListContactId('external');
-  		$s = '';
-		if (count($idofusers) > 0)
-		{
+		$s = '';
+		if (count($idofusers) > 0) {
 			$s .= $langs->trans("Internals").': ';
 			$i = 0;
-			foreach ($idofusers as $valid)
-			{
+			foreach ($idofusers as $valid) {
 				$userstatic->fetch($valid);
-				if ($i) $s .= ', ';
+				if ($i) {
+					$s .= ', ';
+				}
 				$s .= $userstatic->login;
 				$i++;
 			}
 		}
 		//if (count($idofusers)>0 && (count($idofcontacts)>0)) $s.=' - ';
-		if (count($idofcontacts) > 0)
-		{
-			if ($s) $s .= ' - ';
+		if (count($idofcontacts) > 0) {
+			if ($s) {
+				$s .= ' - ';
+			}
 			$s .= $langs->trans("Externals").': ';
 			$i = 0;
 			$contactidfound = array();
-			foreach ($idofcontacts as $valid)
-			{
-				if (empty($contactidfound[$valid]))
-				{
+			foreach ($idofcontacts as $valid) {
+				if (empty($contactidfound[$valid])) {
 					$res = $contactstatic->fetch($valid);
-					if ($res > 0)
-					{
-						if ($i) $s .= ', ';
+					if ($res > 0) {
+						if ($i) {
+							$s .= ', ';
+						}
 						$s .= $contactstatic->getFullName($langs);
 						$contactidfound[$valid] = 1;
 						$i++;
@@ -338,30 +340,30 @@ if (count($tasksarray) > 0)
 		/* For JSGanttImproved */
 		//if ($s) $tasks[$taskcursor]['task_resources']=implode(',',$idofusers);
 		$tasks[$taskcursor]['task_resources'] = $s;
-		if ($s) $tasks[$taskcursor]['task_resources'] = '<a href="'.DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$val->id.'&withproject=1" title="'.dol_escape_htmltag($s).'">'.$langs->trans("List").'</a>';
+		if ($s) {
+			$tasks[$taskcursor]['task_resources'] = '<a href="'.DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$val->id.'&withproject=1" title="'.dol_escape_htmltag($s).'">'.$langs->trans("List").'</a>';
+		}
 		//print "xxx".$val->id.$tasks[$taskcursor]['task_resources'];
 		$tasks[$taskcursor]['note'] = $task->note_public;
 		$taskcursor++;
 	}
 
 	// Search parent to set task_parent_alternate_id (requird by ganttchart)
-	foreach ($tasks as $tmpkey => $tmptask)
-	{
-		foreach ($tasks as $tmptask2)
-		{
-			if ($tmptask2['task_id'] == $tmptask['task_parent'])
-			{
+	foreach ($tasks as $tmpkey => $tmptask) {
+		foreach ($tasks as $tmptask2) {
+			if ($tmptask2['task_id'] == $tmptask['task_parent']) {
 				$tasks[$tmpkey]['task_parent_alternate_id'] = $tmptask2['task_alternate_id'];
 				break;
 			}
 		}
-		if (empty($tasks[$tmpkey]['task_parent_alternate_id'])) $tasks[$tmpkey]['task_parent_alternate_id'] = $tasks[$tmpkey]['task_parent'];
+		if (empty($tasks[$tmpkey]['task_parent_alternate_id'])) {
+			$tasks[$tmpkey]['task_parent_alternate_id'] = $tasks[$tmpkey]['task_parent'];
+		}
 	}
 
 	print "\n";
 
- 	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		//var_dump($_SESSION);
 
 		// How the date for data are formated (format used bu jsgantt)
@@ -369,7 +371,7 @@ if (count($tasksarray) > 0)
 		// How the date for data are formated (format used by dol_print_date)
 		$dateformatinput2 = 'standard';
 		//var_dump($dateformatinput);
-  		//var_dump($dateformatinput2);
+		//var_dump($dateformatinput2);
 
 		$moreforfilter = '<div class="liste_titre liste_titre_bydiv centpercent">';
 
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 66b04527772..7795981c4c3 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -17,19 +17,21 @@
 
 // variable $listofopplabel and $listofoppstatus should be defined
 
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-{
+if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 	$sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount";
 	$sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls ON p.fk_opp_status = cls.rowid";	// If lead status has been removed, we must show it in stats as unknown
 	$sql .= " WHERE p.entity IN (".getEntity('project').")";
 	$sql .= " AND p.fk_statut = 1"; // Opend projects only
-	if ($mine || empty($user->rights->projet->all->lire)) $sql .= " AND p.rowid IN (".$projectsListId.")";
-	if ($socid)	$sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	if ($mine || empty($user->rights->projet->all->lire)) {
+		$sql .= " AND p.rowid IN (".$projectsListId.")";
+	}
+	if ($socid) {
+		$sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	}
 	$sql .= " GROUP BY p.fk_opp_status, cls.code";
 	$resql = $db->query($sql);
 
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
@@ -41,15 +43,15 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		$valsamount = array();
 		$dataseries = array();
 		// -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$valsnb[$obj->opp_status] = $obj->nb;
 				$valsamount[$obj->opp_status] = $obj->opp_amount;
 				$totalnb += $obj->nb;
-				if ($obj->opp_status) $totaloppnb += $obj->nb;
+				if ($obj->opp_status) {
+					$totaloppnb += $obj->nb;
+				}
 				if (!in_array($obj->code, array('WON', 'LOST'))) {
 					$totalamount += $obj->opp_amount;
 					$ponderated_opp_amount += $obj->ponderated_opp_amount;
@@ -63,40 +65,43 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		$ponderated_opp_amount = $ponderated_opp_amount / 100;
 
 		print '<div class="div-table-responsive-no-min">';
-	    print '<table class="noborder nohover centpercent">';
-	    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'</th></tr>'."\n";
+		print '<table class="noborder nohover centpercent">';
+		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'</th></tr>'."\n";
 
-	    $listofstatus = array_keys($listofoppstatus);
+		$listofstatus = array_keys($listofoppstatus);
 		// Complete with values found into database and not into the dictionary
-	    foreach ($valsamount as $key => $val) {
-	    	if (!in_array($key, $listofstatus) && $key) {
-	    		$listofstatus[] = $key;
-	    	}
-	    }
+		foreach ($valsamount as $key => $val) {
+			if (!in_array($key, $listofstatus) && $key) {
+				$listofstatus[] = $key;
+			}
+		}
 
-	    foreach ($listofstatus as $status)
-	    {
-	    	$labelStatus = '';
+		foreach ($listofstatus as $status) {
+			$labelStatus = '';
 
 			$code = dol_getIdFromCode($db, $status, 'c_lead_status', 'rowid', 'code');
-	        if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus".$code);
-	        if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
-	        if (empty($labelStatus)) $labelStatus = $langs->transnoentitiesnoconv('OldValue', $status);	// When id is id of an entry no more in dictionary for example.
+			if ($code) {
+				$labelStatus = $langs->transnoentitiesnoconv("OppStatus".$code);
+			}
+			if (empty($labelStatus)) {
+				$labelStatus = $listofopplabel[$status];
+			}
+			if (empty($labelStatus)) {
+				$labelStatus = $langs->transnoentitiesnoconv('OldValue', $status);	// When id is id of an entry no more in dictionary for example.
+			}
 
 			//$labelStatus .= ' ('.$langs->trans("Coeff").': '.price2num($listofoppstatus[$status]).')';
 			//$labelStatus .= ' - '.price2num($listofoppstatus[$status]).'%';
 
 			$dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0));
-			if (!$conf->use_javascript_ajax)
-			{
+			if (!$conf->use_javascript_ajax) {
 				print '<tr class="oddeven">';
 				print '<td>'.$labelStatus.'</td>';
 				print '<td class="right"><a href="list.php?statut='.$status.'">'.price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency).'</a></td>';
 				print "</tr>\n";
 			}
 		}
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			print '<tr><td class="center nopaddingleftimp nopaddingrightimp" colspan="2">';
 
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index f2b1820c019..25844a573dd 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -42,13 +42,19 @@ $langs->loadLangs(array('projects', 'companies'));
 $action = GETPOST('action', 'aZ09');
 $search_project_user = GETPOST('search_project_user', 'int');
 $mine = GETPOST('mode', 'aZ09') == 'mine' ? 1 : 0;
-if ($mine == 0 && $search_project_user === '') $search_project_user = $user->conf->MAIN_SEARCH_PROJECT_USER_PROJECTSINDEX;
-if ($search_project_user == $user->id) $mine = 1;
+if ($mine == 0 && $search_project_user === '') {
+	$search_project_user = $user->conf->MAIN_SEARCH_PROJECT_USER_PROJECTSINDEX;
+}
+if ($search_project_user == $user->id) {
+	$mine = 1;
+}
 
 // Security check
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
@@ -62,7 +68,9 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 if (empty($reshook)) {
 	if ($action == 'refresh_search_project_user') {
 		$search_project_user = GETPOST('search_project_user', 'int');
@@ -95,8 +103,11 @@ $title = $langs->trans("ProjectsArea");
 
 // Title for combo list see all projects
 $titleall = $langs->trans("AllAllowedProjects");
-if (!empty($user->rights->projet->all->lire) && !$socid) $titleall = $langs->trans("AllProjects");
-else $titleall = $langs->trans("AllAllowedProjects").'<br><br>';
+if (!empty($user->rights->projet->all->lire) && !$socid) {
+	$titleall = $langs->trans("AllProjects");
+} else {
+	$titleall = $langs->trans("AllAllowedProjects").'<br><br>';
+}
 
 $morehtml = '';
 $morehtml .= '<form name="projectform" method="POST">';
@@ -109,10 +120,14 @@ $morehtml .= '</SELECT>';
 $morehtml .= '<input type="submit" class="button smallpaddingimp" name="refresh" value="'.$langs->trans("Refresh").'">';
 $morehtml .= '</form>';
 
-if ($mine) $tooltiphelp = $langs->trans("MyProjectsDesc");
-else {
-	if (!empty($user->rights->projet->all->lire) && !$socid) $tooltiphelp = $langs->trans("ProjectsDesc");
-	else $tooltiphelp = $langs->trans("ProjectsPublicDesc");
+if ($mine) {
+	$tooltiphelp = $langs->trans("MyProjectsDesc");
+} else {
+	if (!empty($user->rights->projet->all->lire) && !$socid) {
+		$tooltiphelp = $langs->trans("ProjectsDesc");
+	} else {
+		$tooltiphelp = $langs->trans("ProjectsPublicDesc");
+	}
 }
 
 print_barre_liste($form->textwithpicto($title, $tooltiphelp), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'project', 0, $morehtml);
@@ -125,13 +140,11 @@ $sql = "SELECT cls.rowid, cls.code, cls.percent, cls.label";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_lead_status as cls";
 $sql .= " WHERE active=1";
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($resql);
 		$listofoppstatus[$objp->rowid] = $objp->percent;
 		$listofopplabel[$objp->rowid] = $objp->label;
@@ -161,34 +174,36 @@ if ($resql)
 		}
 		$i++;
 	}
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 //var_dump($listofoppcode);
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
-{
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
 	// Search project
-	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
-	{
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
 		$listofsearchfields['search_project'] = array('text'=>'Project');
 	}
 
-	if (count($listofsearchfields))
-	{
+	if (count($listofsearchfields)) {
 		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder nohover centpercent">';
 		$i = 0;
-		foreach ($listofsearchfields as $key => $value)
-		{
-			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+		foreach ($listofsearchfields as $key => $value) {
+			if ($i == 0) {
+				print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			}
 			print '<tr>';
 			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			if ($i == 0) {
+				print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			}
 			print '</tr>';
 			$i++;
 		}
@@ -222,14 +237,17 @@ $sql .= ", s.canvas, s.status as thirdpartystatus";
 $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql .= " WHERE p.entity IN (".getEntity('project').")";
-if ($mine || empty($user->rights->projet->all->lire)) $sql .= " AND p.rowid IN (".$projectsListId.")"; // If we have this test true, it also means projectset is not 2
-if ($socid)	$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+if ($mine || empty($user->rights->projet->all->lire)) {
+	$sql .= " AND p.rowid IN (".$projectsListId.")"; // If we have this test true, it also means projectset is not 2
+}
+if ($socid) {
+	$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+}
 $sql .= " ORDER BY p.tms DESC";
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -238,11 +256,9 @@ if ($resql)
 
 	$num = $db->num_rows($resql);
 
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -290,8 +306,7 @@ if ($resql)
 			print '</td>';
 
 			print '<td class="nowrap">';
-			if ($companystatic->id > 0)
-			{
+			if ($companystatic->id > 0) {
 				print $companystatic->getNomUrl(1, 'company', 16);
 			}
 			print '</td>';
@@ -304,7 +319,9 @@ if ($resql)
 		print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 	print "</table></div>";
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 
 $companystatic = new Societe($db); // We need a clean new object for next loop because current one has some properties set.
@@ -320,15 +337,18 @@ $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql .= " WHERE p.entity IN (".getEntity('project').")";
 $sql .= " AND p.fk_statut = 1";
-if ($mine || empty($user->rights->projet->all->lire)) $sql .= " AND p.rowid IN (".$projectsListId.")"; // If we have this test true, it also means projectset is not 2
-if ($socid)	$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+if ($mine || empty($user->rights->projet->all->lire)) {
+	$sql .= " AND p.rowid IN (".$projectsListId.")"; // If we have this test true, it also means projectset is not 2
+}
+if ($socid) {
+	$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+}
 $sql .= " GROUP BY s.rowid, s.nom, s.name_alias, s.code_client, s.code_compta, s.client, s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur, s.logo, s.email, s.entity, s.canvas, s.status";
 $sql .= $db->order($sortfield, $sortorder);
 //$sql .= $db->plimit($max + 1, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 	$othernb = 0;
@@ -345,8 +365,7 @@ if ($resql)
 		print "</tr>\n";
 	}
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
 		if ($i >= $max) {
@@ -357,8 +376,7 @@ if ($resql)
 
 		print '<tr class="oddeven">';
 		print '<td class="nowraponall tdoverflowmax100">';
-		if ($obj->socid > 0)
-		{
+		if ($obj->socid > 0) {
 			$companystatic->id = $obj->socid;
 			$companystatic->name = $obj->name;
 			$companystatic->name_alias = $obj->name_alias;
@@ -380,8 +398,11 @@ if ($resql)
 		}
 		print '</td>';
 		print '<td class="right">';
-		if ($obj->socid) print '<a href="'.DOL_URL_ROOT.'/projet/list.php?socid='.$obj->socid.'&search_status=1">'.$obj->nb.'</a>';
-		else print '<a href="'.DOL_URL_ROOT.'/projet/list.php?search_societe='.urlencode('^$').'&search_status=1">'.$obj->nb.'</a>';
+		if ($obj->socid) {
+			print '<a href="'.DOL_URL_ROOT.'/projet/list.php?socid='.$obj->socid.'&search_status=1">'.$obj->nb.'</a>';
+		} else {
+			print '<a href="'.DOL_URL_ROOT.'/projet/list.php?search_societe='.urlencode('^$').'&search_status=1">'.$obj->nb.'</a>';
+		}
 		print '</td>';
 		print "</tr>\n";
 
@@ -408,8 +429,7 @@ if ($resql)
 	dol_print_error($db);
 }
 
-if (empty($conf->global->PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA))
-{
+if (empty($conf->global->PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA)) {
 	// This list can be very long, so we allow to hide it to prefer to use the list page.
 	// Add constant PROJECT_HIDE_PROJECT_LIST_ON_PROJECT_AREA to hide this list
 
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index e87aa25dadb..d99da02caa6 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -42,16 +42,21 @@ $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
-if (!$sortfield) $sortfield = "a.datep,a.id";
-if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) {
+	$sortfield = "a.datep,a.id";
+}
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
 } else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
@@ -63,7 +68,9 @@ $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
-if (!$user->rights->projet->lire)	accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 
 
@@ -73,11 +80,12 @@ if (!$user->rights->projet->lire)	accessforbidden();
 
 $parameters = array('id'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 	$actioncode = '';
 	$search_agenda_label = '';
 }
@@ -91,16 +99,19 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 $form = new Form($db);
 $object = new Project($db);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+		$object->fetchComments();
+	}
 	$object->info($object->id);
 }
 
 $title = $langs->trans("Project").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
+}
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 llxHeader("", $title, $help_url);
 
@@ -117,15 +128,13 @@ $morehtmlref = '<div class="refidno">';
 // Title
 $morehtmlref .= $object->title;
 // Thirdparty
-if ($object->thirdparty->id > 0)
-{
+if ($object->thirdparty->id > 0) {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 }
 $morehtmlref .= '</div>';
 
 // Define a complementary filter for search of next/prev ref.
-if (!$user->rights->projet->all->lire)
-{
+if (!$user->rights->projet->all->lire) {
 	$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 	$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 }
@@ -149,29 +158,30 @@ print dol_get_fiche_end();
 
 $out = '';
 $permok = $user->rights->agenda->myactions->create;
-if ($permok)
-{
+if ($permok) {
 	$out .= '&projectid='.$object->id;
 }
 
 
 //print '<div class="tabsAction">';
 $morehtmlcenter = '';
-if (!empty($conf->agenda->enabled))
-{
+if (!empty($conf->agenda->enabled)) {
 	$addActionBtnRight = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
-    $morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&socid='.$object->socid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
+	$morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&socid='.$object->socid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
 }
 
 //print '</div>';
 
-if (!empty($object->id))
-{
+if (!empty($object->id)) {
 	print '<br>';
 
 	$param = '&id='.$object->id;
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.$contextpage;
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.$limit;
+	}
 
 	print_barre_liste($langs->trans("ActionsOnProject"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
 
diff --git a/htdocs/projet/jsgantt_language.js.php b/htdocs/projet/jsgantt_language.js.php
index 41fcd1934ae..35ab1132ae7 100644
--- a/htdocs/projet/jsgantt_language.js.php
+++ b/htdocs/projet/jsgantt_language.js.php
@@ -20,13 +20,27 @@
  *		\brief      Fichier de javascript de traduction pour JSGantt
  */
 
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1);
-if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require_once __DIR__.'/../main.inc.php';
 
@@ -40,20 +54,22 @@ $langs->load("projects");
 var vLangs={'<?php print $langs->getDefaultLang(1); ?>':
 	{
 	'format':'<?php print $langs->transnoentities('Period'); ?>','hour':'"<?php print $langs->transnoentities('Hour'); ?>','day':'<?php print $langs->transnoentities('Day'); ?>',
-    'week':'<?php print $langs->transnoentities('Week'); ?>','month':'<?php print $langs->transnoentities('Month'); ?>','quarter':'<?php print $langs->transnoentities('Quadri'); ?>',
-    'hours':'<?php print $langs->transnoentities('Hours'); ?>','days':'<?php print $langs->transnoentities('Days'); ?>','weeks':'<?php print $langs->transnoentities('Weeks'); ?>',
-    'months':'<?php print $langs->transnoentities('Months'); ?>','quarters':'<?php print $langs->transnoentities('Quadri'); ?>','hr':'Hr','dy':'<?php print $langs->transnoentities('Day'); ?>','wk':'<?php print $langs->transnoentities('Week'); ?>','mth':'<?php print $langs->transnoentities('Month'); ?>','qtr':'<?php print $langs->transnoentities('Quadri'); ?>','hrs':'<?php print $langs->transnoentities('Hours'); ?>',
-    'dys':'<?php print $langs->transnoentities('Days'); ?>','wks':'<?php print $langs->transnoentities('Weeks'); ?>','mths':'<?php print $langs->transnoentities('Months'); ?>','qtrs':'<?php print $langs->transnoentities('Quadri'); ?>','resource':'<?php print dol_escape_js($langs->transnoentities('Resource')); ?>','duration':'<?php print dol_escape_js($langs->transnoentities('Duration')); ?>','comp':'%',
-    'completion':'<?php print $langs->transnoentities('Total'); ?>','startdate':'<?php print $langs->transnoentities('DateStart'); ?>','enddate':'<?php print $langs->transnoentities('DateEnd'); ?>','moreinfo':'<?php print dol_escape_js($langs->transnoentities('ShowTask')); ?>',
-    'notes':'<?php print $langs->transnoentities('NotePublic'); ?>',
-    'january':'<?php print $langs->transnoentities('January'); ?>','february':'<?php print $langs->transnoentities('February'); ?>','march':'<?php print $langs->transnoentities('March'); ?>','april':'<?php print $langs->transnoentities('April'); ?>','maylong':'<?php print $langs->transnoentities('May'); ?>','june':'<?php print $langs->transnoentities('June'); ?>','july':'<?php print $langs->transnoentities('July'); ?>',
-    'august':'<?php print $langs->transnoentities('August'); ?>','september':'<?php print $langs->transnoentities('September'); ?>','october':'<?php print $langs->transnoentities('October'); ?>','november':'<?php print $langs->transnoentities('November'); ?>','december':'<?php print $langs->transnoentities('December'); ?>',
-    'jan':'<?php print $langs->transnoentities('MonthShort01'); ?>','feb':'<?php print $langs->transnoentities('MonthShort02'); ?>','mar':'<?php print $langs->transnoentities('MonthShort03'); ?>','apr':'<?php print $langs->transnoentities('MonthShort04'); ?>','may':'<?php print $langs->transnoentities('MonthShort05'); ?>','jun':'<?php print $langs->transnoentities('MonthShort06'); ?>','jul':'<?php print $langs->transnoentities('MonthShort07'); ?>',
-    'aug':'<?php print $langs->transnoentities('MonthShort08'); ?>','sep':'<?php print $langs->transnoentities('MonthShort09'); ?>','oct':'<?php print $langs->transnoentities('MonthShort10'); ?>','nov':'<?php print $langs->transnoentities('MonthShort11'); ?>','dec':'<?php print $langs->transnoentities('MonthShort12'); ?>',
-    'sunday':'<?php print $langs->transnoentities('Sunday'); ?>','monday':'<?php print $langs->transnoentities('Monday'); ?>','tuesday':'<?php print $langs->transnoentities('Tuesday'); ?>','wednesday':'<?php print $langs->transnoentities('Wednesday'); ?>','thursday':'<?php print $langs->transnoentities('Thursday'); ?>','friday':'<?php print $langs->transnoentities('Friday'); ?>','saturday':'<?php print $langs->transnoentities('Saturday'); ?>',
-    'sun':'<?php print $langs->transnoentities('SundayMin'); ?>','mon':'<?php print $langs->transnoentities('MondayMin'); ?>','tue':'<?php print $langs->transnoentities('TuesdayMin'); ?>','wed':'<?php print $langs->transnoentities('WednesdayMin'); ?>','thu':'<?php print $langs->transnoentities('ThursdayMin'); ?>','fri':'<?php print $langs->transnoentities('FridayMin'); ?>','sat':'<?php print $langs->transnoentities('SaturdayMin'); ?>'
-    }
+	'week':'<?php print $langs->transnoentities('Week'); ?>','month':'<?php print $langs->transnoentities('Month'); ?>','quarter':'<?php print $langs->transnoentities('Quadri'); ?>',
+	'hours':'<?php print $langs->transnoentities('Hours'); ?>','days':'<?php print $langs->transnoentities('Days'); ?>','weeks':'<?php print $langs->transnoentities('Weeks'); ?>',
+	'months':'<?php print $langs->transnoentities('Months'); ?>','quarters':'<?php print $langs->transnoentities('Quadri'); ?>','hr':'Hr','dy':'<?php print $langs->transnoentities('Day'); ?>','wk':'<?php print $langs->transnoentities('Week'); ?>','mth':'<?php print $langs->transnoentities('Month'); ?>','qtr':'<?php print $langs->transnoentities('Quadri'); ?>','hrs':'<?php print $langs->transnoentities('Hours'); ?>',
+	'dys':'<?php print $langs->transnoentities('Days'); ?>','wks':'<?php print $langs->transnoentities('Weeks'); ?>','mths':'<?php print $langs->transnoentities('Months'); ?>','qtrs':'<?php print $langs->transnoentities('Quadri'); ?>','resource':'<?php print dol_escape_js($langs->transnoentities('Resource')); ?>','duration':'<?php print dol_escape_js($langs->transnoentities('Duration')); ?>','comp':'%',
+	'completion':'<?php print $langs->transnoentities('Total'); ?>','startdate':'<?php print $langs->transnoentities('DateStart'); ?>','enddate':'<?php print $langs->transnoentities('DateEnd'); ?>','moreinfo':'<?php print dol_escape_js($langs->transnoentities('ShowTask')); ?>',
+	'notes':'<?php print $langs->transnoentities('NotePublic'); ?>',
+	'january':'<?php print $langs->transnoentities('January'); ?>','february':'<?php print $langs->transnoentities('February'); ?>','march':'<?php print $langs->transnoentities('March'); ?>','april':'<?php print $langs->transnoentities('April'); ?>','maylong':'<?php print $langs->transnoentities('May'); ?>','june':'<?php print $langs->transnoentities('June'); ?>','july':'<?php print $langs->transnoentities('July'); ?>',
+	'august':'<?php print $langs->transnoentities('August'); ?>','september':'<?php print $langs->transnoentities('September'); ?>','october':'<?php print $langs->transnoentities('October'); ?>','november':'<?php print $langs->transnoentities('November'); ?>','december':'<?php print $langs->transnoentities('December'); ?>',
+	'jan':'<?php print $langs->transnoentities('MonthShort01'); ?>','feb':'<?php print $langs->transnoentities('MonthShort02'); ?>','mar':'<?php print $langs->transnoentities('MonthShort03'); ?>','apr':'<?php print $langs->transnoentities('MonthShort04'); ?>','may':'<?php print $langs->transnoentities('MonthShort05'); ?>','jun':'<?php print $langs->transnoentities('MonthShort06'); ?>','jul':'<?php print $langs->transnoentities('MonthShort07'); ?>',
+	'aug':'<?php print $langs->transnoentities('MonthShort08'); ?>','sep':'<?php print $langs->transnoentities('MonthShort09'); ?>','oct':'<?php print $langs->transnoentities('MonthShort10'); ?>','nov':'<?php print $langs->transnoentities('MonthShort11'); ?>','dec':'<?php print $langs->transnoentities('MonthShort12'); ?>',
+	'sunday':'<?php print $langs->transnoentities('Sunday'); ?>','monday':'<?php print $langs->transnoentities('Monday'); ?>','tuesday':'<?php print $langs->transnoentities('Tuesday'); ?>','wednesday':'<?php print $langs->transnoentities('Wednesday'); ?>','thursday':'<?php print $langs->transnoentities('Thursday'); ?>','friday':'<?php print $langs->transnoentities('Friday'); ?>','saturday':'<?php print $langs->transnoentities('Saturday'); ?>',
+	'sun':'<?php print $langs->transnoentities('SundayMin'); ?>','mon':'<?php print $langs->transnoentities('MondayMin'); ?>','tue':'<?php print $langs->transnoentities('TuesdayMin'); ?>','wed':'<?php print $langs->transnoentities('WednesdayMin'); ?>','thu':'<?php print $langs->transnoentities('ThursdayMin'); ?>','fri':'<?php print $langs->transnoentities('FridayMin'); ?>','sat':'<?php print $langs->transnoentities('SaturdayMin'); ?>'
+	}
 };
 var vLang='<?php print $langs->getDefaultLang(1); ?>';
 <?php
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+	$db->close();
+}
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 820834b2b8e..933abd53692 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -35,8 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
-if (!empty($conf->categorie->enabled))
-{
+if (!empty($conf->categorie->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
@@ -59,13 +58,14 @@ $title = $langs->trans("Projects");
 // Security check
 $socid = (is_numeric($_GET["socid"]) ? $_GET["socid"] : 0);
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-if ($socid > 0)
-{
+if ($socid > 0) {
 	$soc = new Societe($db);
 	$soc->fetch($socid);
 	$title .= ' (<a href="list.php">'.$soc->name.'</a>)';
 }
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 $diroutputmassaction = $conf->projet->dir_output.'/temp/massgeneration/'.$user->id;
 
@@ -73,9 +73,15 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
-if (!$sortfield) $sortfield = "p.ref";
-if (!$sortorder) $sortorder = "ASC";
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters
+if (!$sortfield) {
+	$sortfield = "p.ref";
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -103,7 +109,9 @@ $search_price_booth = GETPOST("search_price_booth", 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
-if ($mine) { $search_project_user = $user->id; $mine = 0; }
+if ($mine) {
+	$search_project_user = $user->id; $mine = 0;
+}
 
 $search_sday	= GETPOST('search_sday', 'int');
 $search_smonth	= GETPOST('search_smonth', 'int');
@@ -112,10 +120,11 @@ $search_eday	= GETPOST('search_eday', 'int');
 $search_emonth	= GETPOST('search_emonth', 'int');
 $search_eyear	= GETPOST('search_eyear', 'int');
 
-if ($search_status == '') $search_status = -1; // -1 or 1
+if ($search_status == '') {
+	$search_status = -1; // -1 or 1
+}
 
-if (!empty($conf->categorie->enabled))
-{
+if (!empty($conf->categorie->enabled)) {
 	$search_category_array = GETPOST("search_category_".Categorie::TYPE_PROJECT."_list", "array");
 }
 
@@ -179,21 +188,25 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+	$massaction = '';
+}
 
 $parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_all = '';
 		$search_ref = "";
 		$search_label = "";
@@ -236,17 +249,14 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	// Close records
-	if (!$error && $massaction == 'close' && $user->rights->projet->creer)
-	{
+	if (!$error && $massaction == 'close' && $user->rights->projet->creer) {
 		$db->begin();
 
 		$objecttmp = new $objectclass($db);
 		$nbok = 0;
-		foreach ($toselect as $toselectid)
-		{
+		foreach ($toselect as $toselectid) {
 			$result = $objecttmp->fetch($toselectid);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$userWrite = $object->restrictedProjectArea($user, 'write');
 				if ($userWrite > 0 && $objecttmp->statut == 1) {
 					$result = $objecttmp->setClose($user);
@@ -254,7 +264,9 @@ if (empty($reshook))
 						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 						$error++;
 						break;
-					} else $nbok++;
+					} else {
+						$nbok++;
+					}
 				} elseif ($userWrite <= 0) {
 					setEventMessages($langs->trans("DontHavePermissionForCloseProject", $objecttmp->ref), null, 'warnings');
 				} else {
@@ -267,10 +279,12 @@ if (empty($reshook))
 			}
 		}
 
-		if (!$error)
-		{
-			if ($nbok > 1) setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
-			else setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
+		if (!$error) {
+			if ($nbok > 1) {
+				setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
+			} else {
+				setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
+			}
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -294,7 +308,9 @@ $title = $langs->trans("Projects");
 
 // Get list of project id allowed to user (in a string list separated by comma)
 $projectsListId = '';
-if (!$user->rights->projet->all->lire) $projectsListId = $object->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+if (!$user->rights->projet->all->lire) {
+	$projectsListId = $object->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+}
 
 // Get id of types of contacts for projects (This list never contains a lot of elements)
 $listofprojectcontacttype = array();
@@ -302,14 +318,16 @@ $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc"
 $sql .= " WHERE ctc.element = '".$db->escape($object->element)."'";
 $sql .= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
-if ($resql)
-{
-	while ($obj = $db->fetch_object($resql))
-	{
+if ($resql) {
+	while ($obj = $db->fetch_object($resql)) {
 		$listofprojectcontacttype[$obj->rowid] = $obj->code;
 	}
-} else dol_print_error($db);
-if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
+} else {
+	dol_print_error($db);
+}
+if (count($listofprojectcontacttype) == 0) {
+	$listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
+}
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
 $sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as status, p.fk_opp_status, p.public, p.fk_user_creat";
@@ -320,7 +338,9 @@ $sql .= ", s.rowid as socid, s.nom as name, s.email";
 $sql .= ", cls.code as opp_status_code";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	}
 }
 // Add fields from hooks
 $parameters = array();
@@ -328,67 +348,121 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as p";
-if (!empty($conf->categorie->enabled))
-{
+if (!empty($conf->categorie->enabled)) {
 	$sql .= Categorie::getFilterJoinQuery(Categorie::TYPE_PROJECT, "p.rowid");
 }
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (p.rowid = ef.fk_object)";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (p.rowid = ef.fk_object)";
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
 // We'll need this table joined to the select in order to filter by sale
 // No check is done on company permission because readability is managed by public status of project and assignement.
 //if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-if ($search_sale > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-if ($search_project_user > 0)
-{
+if ($search_sale > 0) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+}
+if ($search_project_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp";
 }
 $sql .= " WHERE p.entity IN (".getEntity('project').')';
-if (!empty($conf->categorie->enabled))
-{
+if (!empty($conf->categorie->enabled)) {
 	$sql .= Categorie::getFilterSelectQuery(Categorie::TYPE_PROJECT, "p.rowid", $search_category_array);
 }
-if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+if (!$user->rights->projet->all->lire) {
+	$sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+}
 // No need to check if company is external user, as filtering of projects must be done by getProjectsAuthorizedForUser
-if ($socid > 0) $sql .= " AND (p.fk_soc = ".$socid.")"; // This filter if when we use a hard coded filter on company on url (not related to filter for external users)
-if ($search_ref) $sql .= natural_search('p.ref', $search_ref);
-if ($search_label) $sql .= natural_search('p.title', $search_label);
-if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-if ($search_opp_amount) $sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
-if ($search_opp_percent) $sql .= natural_search('p.opp_percent', $search_opp_percent, 1);
+if ($socid > 0) {
+	$sql .= " AND (p.fk_soc = ".$socid.")"; // This filter if when we use a hard coded filter on company on url (not related to filter for external users)
+}
+if ($search_ref) {
+	$sql .= natural_search('p.ref', $search_ref);
+}
+if ($search_label) {
+	$sql .= natural_search('p.title', $search_label);
+}
+if ($search_societe) {
+	$sql .= natural_search('s.nom', $search_societe);
+}
+if ($search_opp_amount) {
+	$sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
+}
+if ($search_opp_percent) {
+	$sql .= natural_search('p.opp_percent', $search_opp_percent, 1);
+}
 $sql .= dolSqlDateFilter('p.dateo', $search_sday, $search_smonth, $search_syear);
 $sql .= dolSqlDateFilter('p.datee', $search_eday, $search_emonth, $search_eyear);
-if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
-if ($search_status >= 0)
-{
-	if ($search_status == 99) $sql .= " AND p.fk_statut <> 2";
-	else $sql .= " AND p.fk_statut = ".$db->escape($search_status);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-if ($search_opp_status)
-{
-	if (is_numeric($search_opp_status) && $search_opp_status > 0) $sql .= " AND p.fk_opp_status = ".$db->escape($search_opp_status);
-	if ($search_opp_status == 'all') $sql .= " AND (p.fk_opp_status IS NOT NULL AND p.fk_opp_status <> -1)";
-	if ($search_opp_status == 'openedopp') $sql .= " AND p.fk_opp_status IS NOT NULL AND p.fk_opp_status <> -1 AND p.fk_opp_status NOT IN (SELECT rowid FROM ".MAIN_DB_PREFIX."c_lead_status WHERE code IN ('WON','LOST'))";
-	if ($search_opp_status == 'notopenedopp') $sql .= " AND (p.fk_opp_status IS NULL OR p.fk_opp_status = -1 OR p.fk_opp_status IN (SELECT rowid FROM ".MAIN_DB_PREFIX."c_lead_status WHERE code IN ('WON')))";
-	if ($search_opp_status == 'none') $sql .= " AND (p.fk_opp_status IS NULL OR p.fk_opp_status = -1)";
+if ($search_status >= 0) {
+	if ($search_status == 99) {
+		$sql .= " AND p.fk_statut <> 2";
+	} else {
+		$sql .= " AND p.fk_statut = ".$db->escape($search_status);
+	}
+}
+if ($search_opp_status) {
+	if (is_numeric($search_opp_status) && $search_opp_status > 0) {
+		$sql .= " AND p.fk_opp_status = ".$db->escape($search_opp_status);
+	}
+	if ($search_opp_status == 'all') {
+		$sql .= " AND (p.fk_opp_status IS NOT NULL AND p.fk_opp_status <> -1)";
+	}
+	if ($search_opp_status == 'openedopp') {
+		$sql .= " AND p.fk_opp_status IS NOT NULL AND p.fk_opp_status <> -1 AND p.fk_opp_status NOT IN (SELECT rowid FROM ".MAIN_DB_PREFIX."c_lead_status WHERE code IN ('WON','LOST'))";
+	}
+	if ($search_opp_status == 'notopenedopp') {
+		$sql .= " AND (p.fk_opp_status IS NULL OR p.fk_opp_status = -1 OR p.fk_opp_status IN (SELECT rowid FROM ".MAIN_DB_PREFIX."c_lead_status WHERE code IN ('WON')))";
+	}
+	if ($search_opp_status == 'none') {
+		$sql .= " AND (p.fk_opp_status IS NULL OR p.fk_opp_status = -1)";
+	}
+}
+if ($search_public != '') {
+	$sql .= " AND p.public = ".$db->escape($search_public);
 }
-if ($search_public != '') $sql .= " AND p.public = ".$db->escape($search_public);
 // For external user, no check is done on company permission because readability is managed by public status of project and assignement.
 //if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
-if ($search_sale > 0) $sql .= " AND sc.fk_user = ".$search_sale;
+if ($search_sale > 0) {
+	$sql .= " AND sc.fk_user = ".$search_sale;
+}
 // No check is done on company permission because readability is managed by public status of project and assignement.
 //if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
-if ($search_project_user > 0) $sql .= " AND ecp.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user;
-if ($search_opp_amount != '') $sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
-if ($search_budget_amount != '') $sql .= natural_search('p.budget_amount', $search_budget_amount, 1);
-if ($search_usage_opportunity != '' && $search_usage_opportunity >= 0) $sql .= natural_search('p.usage_opportunity', $search_usage_opportunity, 2);
-if ($search_usage_task != '' && $search_usage_task >= 0)               $sql .= natural_search('p.usage_task', $search_usage_task, 2);
-if ($search_usage_bill_time != '' && $search_usage_bill_time >= 0)     $sql .= natural_search('p.usage_bill_time', $search_usage_bill_time, 2);
-if ($search_usage_event_organization != '' && $search_usage_event_organization >= 0)     $sql .= natural_search('p.usage_organize_event', $search_usage_event_organization, 2);
-if ($search_accept_conference_suggestions != '' && $search_accept_conference_suggestions >= 0)     $sql .= natural_search('p.accept_conference_suggestions', $search_accept_conference_suggestions, 2);
-if ($search_accept_booth_suggestions != '' && $search_accept_booth_suggestions >= 0)     $sql .= natural_search('p.accept_booth_suggestions', $search_accept_booth_suggestions, 2);
-if ($search_price_registration != '') $sql .= natural_search('p.price_registration', $search_price_registration, 1);
-if ($search_price_booth != '') $sql .= natural_search('p.price_booth', $search_price_booth, 1);
+if ($search_project_user > 0) {
+	$sql .= " AND ecp.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user;
+}
+if ($search_opp_amount != '') {
+	$sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
+}
+if ($search_budget_amount != '') {
+	$sql .= natural_search('p.budget_amount', $search_budget_amount, 1);
+}
+if ($search_usage_opportunity != '' && $search_usage_opportunity >= 0) {
+	$sql .= natural_search('p.usage_opportunity', $search_usage_opportunity, 2);
+}
+if ($search_usage_task != '' && $search_usage_task >= 0) {
+	$sql .= natural_search('p.usage_task', $search_usage_task, 2);
+}
+if ($search_usage_bill_time != '' && $search_usage_bill_time >= 0) {
+	$sql .= natural_search('p.usage_bill_time', $search_usage_bill_time, 2);
+}
+if ($search_usage_event_organization != '' && $search_usage_event_organization >= 0) {
+	$sql .= natural_search('p.usage_organize_event', $search_usage_event_organization, 2);
+}
+if ($search_accept_conference_suggestions != '' && $search_accept_conference_suggestions >= 0) {
+	$sql .= natural_search('p.accept_conference_suggestions', $search_accept_conference_suggestions, 2);
+}
+if ($search_accept_booth_suggestions != '' && $search_accept_booth_suggestions >= 0) {
+	$sql .= natural_search('p.accept_booth_suggestions', $search_accept_booth_suggestions, 2);
+}
+if ($search_price_registration != '') {
+	$sql .= natural_search('p.price_registration', $search_price_registration, 1);
+}
+if ($search_price_booth != '') {
+	$sql .= natural_search('p.price_booth', $search_price_booth, 1);
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -411,7 +485,9 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
 	$num = $nbtotalofrecords;
 } else {
-	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+	if ($limit) {
+		$sql .= $db->plimit($limit + 1, $offset);
+	}
 
 	$resql = $db->query($sql);
 	if (!$resql) {
@@ -423,8 +499,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 }
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all) {
 	$obj = $db->fetch_object($resql);
 	header("Location: ".DOL_URL_ROOT.'/projet/card.php?id='.$obj->id);
 	exit;
@@ -441,36 +516,96 @@ llxHeader('', $title, $help_url);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($search_all != '') 			$param .= '&search_all='.urlencode($search_all);
-if ($search_sday)              		    $param .= '&search_sday='.urlencode($search_sday);
-if ($search_smonth)              		$param .= '&search_smonth='.urlencode($search_smonth);
-if ($search_syear)               		$param .= '&search_syear='.urlencode($search_syear);
-if ($search_eday)               		$param .= '&search_eday='.urlencode($search_eday);
-if ($search_emonth)              		$param .= '&search_emonth='.urlencode($search_emonth);
-if ($search_eyear)               		$param .= '&search_eyear='.urlencode($search_eyear);
-if ($socid)				        $param .= '&socid='.urlencode($socid);
-if ($search_categ)              $param .= '&search_categ='.urlencode($search_categ);
-if ($search_ref != '') 			$param .= '&search_ref='.urlencode($search_ref);
-if ($search_label != '') 		$param .= '&search_label='.urlencode($search_label);
-if ($search_societe != '') 		$param .= '&search_societe='.urlencode($search_societe);
-if ($search_status >= 0) 		$param .= '&search_status='.urlencode($search_status);
-if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all', 'openedopp', 'notopenedopp', 'none'))) 	    $param .= '&search_opp_status='.urlencode($search_opp_status);
-if ($search_opp_percent != '') 	$param .= '&search_opp_percent='.urlencode($search_opp_percent);
-if ($search_public != '') 		$param .= '&search_public='.urlencode($search_public);
-if ($search_project_user != '')   $param .= '&search_project_user='.urlencode($search_project_user);
-if ($search_sale > 0)    		$param .= '&search_sale='.urlencode($search_sale);
-if ($search_opp_amount != '')    $param .= '&search_opp_amount='.urlencode($search_opp_amount);
-if ($search_budget_amount != '') $param .= '&search_budget_amount='.urlencode($search_budget_amount);
-if ($search_usage_task != '') $param .= '&search_usage_task='.urlencode($search_usage_task);
-if ($search_usage_bill_time != '') $param .= '&search_usage_opportunity='.urlencode($search_usage_bill_time);
-if ($search_usage_event_organization != '') $param .= '&search_usage_event_organization='.urlencode($search_usage_event_organization);
-if ($search_accept_conference_suggestions != '') $param .= '&search_accept_conference_suggestions='.urlencode($search_accept_conference_suggestions);
-if ($search_accept_booth_suggestions != '') $param .= '&search_accept_booth_suggestions='.urlencode($search_accept_booth_suggestions);
-if ($search_price_registration != '') $param .= '&search_price_registration='.urlencode($search_price_registration);
-if ($search_price_booth != '') $param .= '&search_price_booth='.urlencode($search_price_booth);
-if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($search_all != '') {
+	$param .= '&search_all='.urlencode($search_all);
+}
+if ($search_sday) {
+	$param .= '&search_sday='.urlencode($search_sday);
+}
+if ($search_smonth) {
+	$param .= '&search_smonth='.urlencode($search_smonth);
+}
+if ($search_syear) {
+	$param .= '&search_syear='.urlencode($search_syear);
+}
+if ($search_eday) {
+	$param .= '&search_eday='.urlencode($search_eday);
+}
+if ($search_emonth) {
+	$param .= '&search_emonth='.urlencode($search_emonth);
+}
+if ($search_eyear) {
+	$param .= '&search_eyear='.urlencode($search_eyear);
+}
+if ($socid) {
+	$param .= '&socid='.urlencode($socid);
+}
+if ($search_categ) {
+	$param .= '&search_categ='.urlencode($search_categ);
+}
+if ($search_ref != '') {
+	$param .= '&search_ref='.urlencode($search_ref);
+}
+if ($search_label != '') {
+	$param .= '&search_label='.urlencode($search_label);
+}
+if ($search_societe != '') {
+	$param .= '&search_societe='.urlencode($search_societe);
+}
+if ($search_status >= 0) {
+	$param .= '&search_status='.urlencode($search_status);
+}
+if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all', 'openedopp', 'notopenedopp', 'none'))) {
+	$param .= '&search_opp_status='.urlencode($search_opp_status);
+}
+if ($search_opp_percent != '') {
+	$param .= '&search_opp_percent='.urlencode($search_opp_percent);
+}
+if ($search_public != '') {
+	$param .= '&search_public='.urlencode($search_public);
+}
+if ($search_project_user != '') {
+	$param .= '&search_project_user='.urlencode($search_project_user);
+}
+if ($search_sale > 0) {
+	$param .= '&search_sale='.urlencode($search_sale);
+}
+if ($search_opp_amount != '') {
+	$param .= '&search_opp_amount='.urlencode($search_opp_amount);
+}
+if ($search_budget_amount != '') {
+	$param .= '&search_budget_amount='.urlencode($search_budget_amount);
+}
+if ($search_usage_task != '') {
+	$param .= '&search_usage_task='.urlencode($search_usage_task);
+}
+if ($search_usage_bill_time != '') {
+	$param .= '&search_usage_opportunity='.urlencode($search_usage_bill_time);
+}
+if ($search_usage_event_organization != '') {
+	$param .= '&search_usage_event_organization='.urlencode($search_usage_event_organization);
+}
+if ($search_accept_conference_suggestions != '') {
+	$param .= '&search_accept_conference_suggestions='.urlencode($search_accept_conference_suggestions);
+}
+if ($search_accept_booth_suggestions != '') {
+	$param .= '&search_accept_booth_suggestions='.urlencode($search_accept_booth_suggestions);
+}
+if ($search_price_registration != '') {
+	$param .= '&search_price_registration='.urlencode($search_price_registration);
+}
+if ($search_price_booth != '') {
+	$param .= '&search_price_booth='.urlencode($search_price_booth);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -481,19 +616,31 @@ $arrayofmassactions = array(
 	//'presend'=>$langs->trans("SendByMail"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->rights->projet->creer) $arrayofmassactions['close'] = $langs->trans("Close");
-if ($user->rights->projet->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if ($user->rights->projet->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) $arrayofmassactions = array();
+if ($user->rights->projet->creer) {
+	$arrayofmassactions['close'] = $langs->trans("Close");
+}
+if ($user->rights->projet->supprimer) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if ($user->rights->projet->creer) {
+	$arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
+}
+if (in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
+	$arrayofmassactions = array();
+}
 
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $url = DOL_URL_ROOT.'/projet/card.php?action=create';
-if (!empty($socid)) $url .= '&socid='.$socid;
+if (!empty($socid)) {
+	$url .= '&socid='.$socid;
+}
 $newcardbutton = dolGetButtonTitle($langs->trans('NewProject'), '', 'fa fa-plus-circle', $url, '', $user->rights->projet->creer);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -503,10 +650,14 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 // Show description of content
 $texthelp = '';
-if ($search_project_user == $user->id) $texthelp .= $langs->trans("MyProjectsDesc");
-else {
-	if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("ProjectsDesc");
-	else $texthelp .= $langs->trans("ProjectsPublicDesc");
+if ($search_project_user == $user->id) {
+	$texthelp .= $langs->trans("MyProjectsDesc");
+} else {
+	if ($user->rights->projet->all->lire && !$socid) {
+		$texthelp .= $langs->trans("ProjectsDesc");
+	} else {
+		$texthelp .= $langs->trans("ProjectsPublicDesc");
+	}
 }
 
 print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'project', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -518,17 +669,17 @@ $objecttmp = new Project($db);
 $trackid = 'proj'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($search_all)
-{
-	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
 
 // Filter on categories
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
-{
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array);
 }
@@ -538,13 +689,14 @@ $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('ProjectsWithThisUserAsContact').': ';
 //$includeonly = 'hierarchyme';
 $includeonly = '';
-if (empty($user->rights->user->user->lire)) $includeonly = array($user->id);
+if (empty($user->rights->user->user->lire)) {
+	$includeonly = array($user->id);
+}
 $moreforfilter .= $form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
 // If the user can view thirdparties other than his'
-if ($user->rights->societe->client->voir || $socid)
-{
+if ($user->rights->societe->client->voir || $socid) {
 	$langs->load("commercial");
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
@@ -552,8 +704,7 @@ if ($user->rights->societe->client->voir || $socid)
 	$moreforfilter .= '</div>';
 }
 
-if (!empty($moreforfilter))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	$parameters = array();
@@ -573,22 +724,19 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
 // Project ref
-if (!empty($arrayfields['p.ref']['checked']))
-{
+if (!empty($arrayfields['p.ref']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_ref" value="'.dol_escape_htmltag($search_ref).'" size="6">';
 	print '</td>';
 }
 // Project label
-if (!empty($arrayfields['p.title']['checked']))
-{
+if (!empty($arrayfields['p.title']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_label" size="8" value="'.dol_escape_htmltag($search_label).'">';
 	print '</td>';
 }
 // Third party
-if (!empty($arrayfields['s.nom']['checked']))
-{
+if (!empty($arrayfields['s.nom']['checked'])) {
 	print '<td class="liste_titre">';
 	if ($socid > 0) {
 		$tmpthirdparty = new Societe($db);
@@ -599,110 +747,97 @@ if (!empty($arrayfields['s.nom']['checked']))
 	print '</td>';
 }
 // Sale representative
-if (!empty($arrayfields['commercial']['checked']))
-{
+if (!empty($arrayfields['commercial']['checked'])) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 // Start date
-if (!empty($arrayfields['p.dateo']['checked']))
-{
+if (!empty($arrayfields['p.dateo']['checked'])) {
 	print '<td class="liste_titre center nowraponall">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_sday" value="'.dol_escape_htmltag($search_sday).'">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_sday" value="'.dol_escape_htmltag($search_sday).'">';
+	}
 	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_smonth" value="'.dol_escape_htmltag($search_smonth).'">';
 	$formother->select_year($search_syear ? $search_syear : -1, 'search_syear', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
 	print '</td>';
 }
 // End date
-if (!empty($arrayfields['p.datee']['checked']))
-{
+if (!empty($arrayfields['p.datee']['checked'])) {
 	print '<td class="liste_titre center nowraponall">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_eday" value="'.dol_escape_htmltag($search_eday).'">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_eday" value="'.dol_escape_htmltag($search_eday).'">';
+	}
 	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_emonth" value="'.dol_escape_htmltag($search_emonth).'">';
 	$formother->select_year($search_eyear ? $search_eyear : -1, 'search_eyear', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
 	print '</td>';
 }
-if (!empty($arrayfields['p.public']['checked']))
-{
+if (!empty($arrayfields['p.public']['checked'])) {
 	print '<td class="liste_titre">';
 	$array = array(''=>'', 0 => $langs->trans("PrivateProject"), 1 => $langs->trans("SharedProject"));
 	print $form->selectarray('search_public', $array, $search_public);
 	print '</td>';
 }
 // Opp status
-if (!empty($arrayfields['p.fk_opp_status']['checked']))
-{
+if (!empty($arrayfields['p.fk_opp_status']['checked'])) {
 	print '<td class="liste_titre nowrap center">';
 	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth100');
 	print '</td>';
 }
-if (!empty($arrayfields['p.opp_amount']['checked']))
-{
+if (!empty($arrayfields['p.opp_amount']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print '<input type="text" class="flat" name="search_opp_amount" size="3" value="'.$search_opp_amount.'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.opp_percent']['checked']))
-{
+if (!empty($arrayfields['p.opp_percent']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print '<input type="text" class="flat" name="search_opp_percent" size="2" value="'.$search_opp_percent.'">';
 	print '</td>';
 }
-if (!empty($arrayfields['opp_weighted_amount']['checked']))
-{
+if (!empty($arrayfields['opp_weighted_amount']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.budget_amount']['checked']))
-{
+if (!empty($arrayfields['p.budget_amount']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print '<input type="text" class="flat" name="search_budget_amount" size="4" value="'.$search_budget_amount.'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.usage_opportunity']['checked']))
-{
+if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print $form->selectyesno('search_usage_opportunity', $search_usage_opportunity, 1, false, 1);
 	print '';
 	print '</td>';
 }
-if (!empty($arrayfields['p.usage_task']['checked']))
-{
+if (!empty($arrayfields['p.usage_task']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print $form->selectyesno('search_usage_task', $search_usage_task, 1, false, 1);
 	print '</td>';
 }
-if (!empty($arrayfields['p.usage_bill_time']['checked']))
-{
+if (!empty($arrayfields['p.usage_bill_time']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print $form->selectyesno('search_usage_bill_time', $search_usage_bill_time, 1, false, 1);
 	print '</td>';
 }
-if (!empty($arrayfields['p.usage_organize_event']['checked']))
-{
+if (!empty($arrayfields['p.usage_organize_event']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print $form->selectyesno('search_usage_event_organization', $search_usage_event_organization, 1, false, 1);
 	print '</td>';
 }
-if (!empty($arrayfields['p.accept_conference_suggestions']['checked']))
-{
+if (!empty($arrayfields['p.accept_conference_suggestions']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print $form->selectyesno('search_accept_conference_suggestions', $search_accept_conference_suggestions, 1, false, 1);
 	print '</td>';
 }
-if (!empty($arrayfields['p.accept_booth_suggestions']['checked']))
-{
+if (!empty($arrayfields['p.accept_booth_suggestions']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print $form->selectyesno('search_accept_booth_suggestions', $search_accept_booth_suggestions, 1, false, 1);
 	print '</td>';
 }
-if (!empty($arrayfields['p.price_registration']['checked']))
-{
+if (!empty($arrayfields['p.price_registration']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print '<input type="text" class="flat" name="search_price_registration" size="4" value="'.$search_price_registration.'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.price_booth']['checked']))
-{
+if (!empty($arrayfields['p.price_booth']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print '<input type="text" class="flat" name="search_price_booth" size="4" value="'.$search_price_booth.'">';
 	print '</td>';
@@ -714,23 +849,22 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (!empty($arrayfields['p.datec']['checked']))
-{
+if (!empty($arrayfields['p.datec']['checked'])) {
 	// Date creation
 	print '<td class="liste_titre">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.tms']['checked']))
-{
+if (!empty($arrayfields['p.tms']['checked'])) {
 	// Date modification
 	print '<td class="liste_titre">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.fk_statut']['checked']))
-{
+if (!empty($arrayfields['p.fk_statut']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	$arrayofstatus = array();
-	foreach ($object->statuts_short as $key => $val) $arrayofstatus[$key] = $langs->trans($val);
+	foreach ($object->statuts_short as $key => $val) {
+		$arrayofstatus[$key] = $langs->trans($val);
+	}
 	$arrayofstatus['99'] = $langs->trans("NotClosed").' ('.$langs->trans('Draft').' + '.$langs->trans('Opened').')';
 	print $form->selectarray('search_status', $arrayofstatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'minwidth75imp maxwidth150 selectarrowonleft');
 	print ajax_combobox('search_status');
@@ -745,35 +879,81 @@ print '</td>';
 print '</tr>'."\n";
 
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['p.ref']['checked']))           print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['p.title']['checked']))         print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['commercial']['checked']))      print_liste_field_titre($arrayfields['commercial']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder, 'tdoverflowmax100imp ');
-if (!empty($arrayfields['p.dateo']['checked']))         print_liste_field_titre($arrayfields['p.dateo']['label'], $_SERVER["PHP_SELF"], "p.dateo", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['p.datee']['checked']))         print_liste_field_titre($arrayfields['p.datee']['label'], $_SERVER["PHP_SELF"], "p.datee", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['p.public']['checked']))        print_liste_field_titre($arrayfields['p.public']['label'], $_SERVER["PHP_SELF"], "p.public", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER['PHP_SELF'], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['opp_weighted_amount']['checked']))   print_liste_field_titre($arrayfields['opp_weighted_amount']['label'], $_SERVER['PHP_SELF'], 'opp_weighted_amount', '', $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['p.usage_opportunity']['checked'])) print_liste_field_titre($arrayfields['p.usage_opportunity']['label'], $_SERVER["PHP_SELF"], 'p.usage_opportunity', "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['p.usage_task']['checked']))        print_liste_field_titre($arrayfields['p.usage_task']['label'], $_SERVER["PHP_SELF"], 'p.usage_task', "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['p.usage_bill_time']['checked']))   print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['p.usage_organize_event']['checked']))   print_liste_field_titre($arrayfields['p.usage_organize_event']['label'], $_SERVER["PHP_SELF"], 'p.usage_organize_event', "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['p.accept_conference_suggestions']['checked']))   print_liste_field_titre($arrayfields['p.accept_conference_suggestions']['label'], $_SERVER["PHP_SELF"], 'p.accept_conference_suggestions', "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['p.accept_booth_suggestions']['checked']))   print_liste_field_titre($arrayfields['p.accept_booth_suggestions']['label'], $_SERVER["PHP_SELF"], 'p.accept_booth_suggestions', "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['p.price_registration']['checked'])) print_liste_field_titre($arrayfields['p.price_registration']['label'], $_SERVER["PHP_SELF"], 'p.price_registration', "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['p.price_booth']['checked'])) print_liste_field_titre($arrayfields['p.price_booth']['label'], $_SERVER["PHP_SELF"], 'p.price_booth', "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.title']['checked'])) {
+	print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['commercial']['checked'])) {
+	print_liste_field_titre($arrayfields['commercial']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder, 'tdoverflowmax100imp ');
+}
+if (!empty($arrayfields['p.dateo']['checked'])) {
+	print_liste_field_titre($arrayfields['p.dateo']['label'], $_SERVER["PHP_SELF"], "p.dateo", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['p.datee']['checked'])) {
+	print_liste_field_titre($arrayfields['p.datee']['label'], $_SERVER["PHP_SELF"], "p.datee", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['p.public']['checked'])) {
+	print_liste_field_titre($arrayfields['p.public']['label'], $_SERVER["PHP_SELF"], "p.public", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.fk_opp_status']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['p.opp_amount']['checked'])) {
+	print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['p.opp_percent']['checked'])) {
+	print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER['PHP_SELF'], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['opp_weighted_amount']['checked'])) {
+	print_liste_field_titre($arrayfields['opp_weighted_amount']['label'], $_SERVER['PHP_SELF'], 'opp_weighted_amount', '', $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['p.budget_amount']['checked'])) {
+	print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
+	print_liste_field_titre($arrayfields['p.usage_opportunity']['label'], $_SERVER["PHP_SELF"], 'p.usage_opportunity', "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['p.usage_task']['checked'])) {
+	print_liste_field_titre($arrayfields['p.usage_task']['label'], $_SERVER["PHP_SELF"], 'p.usage_task', "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['p.usage_bill_time']['checked'])) {
+	print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['p.usage_organize_event']['checked'])) {
+	print_liste_field_titre($arrayfields['p.usage_organize_event']['label'], $_SERVER["PHP_SELF"], 'p.usage_organize_event', "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['p.accept_conference_suggestions']['checked'])) {
+	print_liste_field_titre($arrayfields['p.accept_conference_suggestions']['label'], $_SERVER["PHP_SELF"], 'p.accept_conference_suggestions', "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['p.accept_booth_suggestions']['checked'])) {
+	print_liste_field_titre($arrayfields['p.accept_booth_suggestions']['label'], $_SERVER["PHP_SELF"], 'p.accept_booth_suggestions', "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['p.price_registration']['checked'])) {
+	print_liste_field_titre($arrayfields['p.price_registration']['label'], $_SERVER["PHP_SELF"], 'p.price_registration', "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['p.price_booth']['checked'])) {
+	print_liste_field_titre($arrayfields['p.price_booth']['label'], $_SERVER["PHP_SELF"], 'p.price_booth', "", $param, '', $sortfield, $sortorder, 'right ');
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (!empty($arrayfields['p.datec']['checked']))  print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (!empty($arrayfields['p.tms']['checked']))    print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (!empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['p.datec']['checked'])) {
+	print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['p.tms']['checked'])) {
+	print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['p.fk_statut']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+}
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
 
@@ -782,8 +962,7 @@ $totalarray = array(
 	'nbfield' => 0,
 	'val' => array(),
 );
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
 	$object->id = $obj->id;
@@ -798,8 +977,7 @@ while ($i < min($num, $limit))
 	$object->title = $obj->title;
 
 	$userAccess = $object->restrictedProjectArea($user); // why this ?
-	if ($userAccess >= 0)
-	{
+	if ($userAccess >= 0) {
 		$socstatic->id = $obj->socid;
 		$socstatic->name = $obj->name;
 		$socstatic->email = $obj->email;
@@ -807,25 +985,28 @@ while ($i < min($num, $limit))
 		print '<tr class="oddeven">';
 
 		// Project url
-		if (!empty($arrayfields['p.ref']['checked']))
-		{
+		if (!empty($arrayfields['p.ref']['checked'])) {
 			print '<td class="nowraponall">';
 			print $object->getNomUrl(1);
-			if ($object->hasDelay()) print img_warning($langs->trans('Late'));
+			if ($object->hasDelay()) {
+				print img_warning($langs->trans('Late'));
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Title
-		if (!empty($arrayfields['p.title']['checked']))
-		{
+		if (!empty($arrayfields['p.title']['checked'])) {
 			print '<td class="tdoverflowmax200">';
 			print dol_trunc($obj->title, 80);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Company
-		if (!empty($arrayfields['s.nom']['checked']))
-		{
+		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td class="tdoverflowmax100">';
 			if ($obj->socid) {
 				print $socstatic->getNomUrl(1);
@@ -833,7 +1014,9 @@ while ($i < min($num, $limit))
 				print '&nbsp;';
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Sales Representatives
 		if (!empty($arrayfields['commercial']['checked'])) {
@@ -873,180 +1056,207 @@ while ($i < min($num, $limit))
 				print '&nbsp;';
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Date start
-		if (!empty($arrayfields['p.dateo']['checked']))
-		{
+		if (!empty($arrayfields['p.dateo']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_start), 'day');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Date end
-		if (!empty($arrayfields['p.datee']['checked']))
-		{
+		if (!empty($arrayfields['p.datee']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_end), 'day');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Visibility
-		if (!empty($arrayfields['p.public']['checked']))
-		{
+		if (!empty($arrayfields['p.public']['checked'])) {
 			print '<td class="left">';
-			if ($obj->public) print $langs->trans('SharedProject');
-			else print $langs->trans('PrivateProject');
+			if ($obj->public) {
+				print $langs->trans('SharedProject');
+			} else {
+				print $langs->trans('PrivateProject');
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Opp Status
-		if (!empty($arrayfields['p.fk_opp_status']['checked']))
-		{
+		if (!empty($arrayfields['p.fk_opp_status']['checked'])) {
 			print '<td class="center">';
-			if ($obj->opp_status_code) print $langs->trans("OppStatus".$obj->opp_status_code);
+			if ($obj->opp_status_code) {
+				print $langs->trans("OppStatus".$obj->opp_status_code);
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Opp Amount
-		if (!empty($arrayfields['p.opp_amount']['checked']))
-		{
+		if (!empty($arrayfields['p.opp_amount']['checked'])) {
 			print '<td class="right">';
 			//if ($obj->opp_status_code)
-			if (strcmp($obj->opp_amount, ''))
-			{
+			if (strcmp($obj->opp_amount, '')) {
 				print price($obj->opp_amount, 1, $langs, 1, -1, -1, '');
 				$totalarray['val']['p.opp_amount'] += $obj->opp_amount;
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.opp_amount';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.opp_amount';
+			}
 		}
 		// Opp percent
-		if (!empty($arrayfields['p.opp_percent']['checked']))
-		{
+		if (!empty($arrayfields['p.opp_percent']['checked'])) {
 			print '<td class="right">';
-			if ($obj->opp_percent) print price($obj->opp_percent, 1, $langs, 1, 0).'%';
+			if ($obj->opp_percent) {
+				print price($obj->opp_percent, 1, $langs, 1, 0).'%';
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Opp weighted amount
-		if (!empty($arrayfields['opp_weighted_amount']['checked']))
-		{
-			if (!isset($totalarray['val']['opp_weighted_amount']))  $totalarray['val']['opp_weighted_amount'] = 0;
+		if (!empty($arrayfields['opp_weighted_amount']['checked'])) {
+			if (!isset($totalarray['val']['opp_weighted_amount'])) {
+				$totalarray['val']['opp_weighted_amount'] = 0;
+			}
 			print '<td align="right">';
 			if ($obj->opp_weighted_amount) {
 				print price($obj->opp_weighted_amount, 1, $langs, 1, -1, -1, '');
 				$totalarray['val']['opp_weighted_amount'] += $obj->opp_weighted_amount;
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'opp_weighted_amount';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'opp_weighted_amount';
+			}
 		}
 		// Budget
-		if (!empty($arrayfields['p.budget_amount']['checked']))
-		{
+		if (!empty($arrayfields['p.budget_amount']['checked'])) {
 			print '<td class="right">';
-			if ($obj->budget_amount != '')
-			{
+			if ($obj->budget_amount != '') {
 				print price($obj->budget_amount, 1, $langs, 1, -1, -1);
 				$totalarray['val']['p.budget_amount'] += $obj->budget_amount;
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.budget_amount';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.budget_amount';
+			}
 		}
 		// Usage opportunity
-		if (!empty($arrayfields['p.usage_opportunity']['checked']))
-		{
+		if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
 			print '<td class="right">';
-			if ($obj->usage_opportunity)
-			{
+			if ($obj->usage_opportunity) {
 				print yn($obj->usage_opportunity);
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Usage task
-		if (!empty($arrayfields['p.usage_task']['checked']))
-		{
+		if (!empty($arrayfields['p.usage_task']['checked'])) {
 			print '<td class="right">';
-			if ($obj->usage_task)
-			{
+			if ($obj->usage_task) {
 				print yn($obj->usage_task);
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Bill time
-		if (!empty($arrayfields['p.usage_bill_time']['checked']))
-		{
+		if (!empty($arrayfields['p.usage_bill_time']['checked'])) {
 			print '<td class="right">';
-			if ($obj->usage_bill_time)
-			{
+			if ($obj->usage_bill_time) {
 				print yn($obj->usage_bill_time);
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Event Organization
-		if (!empty($arrayfields['p.usage_organize_event']['checked']))
-		{
+		if (!empty($arrayfields['p.usage_organize_event']['checked'])) {
 			print '<td class="right">';
-			if ($obj->usage_event_organization)
-			{
+			if ($obj->usage_event_organization) {
 				print yn($obj->usage_event_organization);
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Allow unknown people to suggest conferences
-		if (!empty($arrayfields['p.accept_conference_suggestions']['checked']))
-		{
+		if (!empty($arrayfields['p.accept_conference_suggestions']['checked'])) {
 			print '<td class="right">';
-			if ($obj->accept_conference_suggestions)
-			{
+			if ($obj->accept_conference_suggestions) {
 				print yn($obj->accept_conference_suggestions);
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Allow unknown people to suggest booth
-		if (!empty($arrayfields['p.accept_booth_suggestions']['checked']))
-		{
+		if (!empty($arrayfields['p.accept_booth_suggestions']['checked'])) {
 			print '<td class="right">';
-			if ($obj->accept_booth_suggestions)
-			{
+			if ($obj->accept_booth_suggestions) {
 				print yn($obj->accept_booth_suggestions);
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Price of registration
-		if (!empty($arrayfields['p.price_registration']['checked']))
-		{
+		if (!empty($arrayfields['p.price_registration']['checked'])) {
 			print '<td class="right">';
-			if ($obj->price_registration != '')
-			{
+			if ($obj->price_registration != '') {
 				print price($obj->price_registration, 1, $langs, 1, -1, -1);
 				$totalarray['val']['p.price_registration'] += $obj->price_registration;
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.price_registration';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.price_registration';
+			}
 		}
 		// PriceOfBooth
-		if (!empty($arrayfields['p.price_booth']['checked']))
-		{
+		if (!empty($arrayfields['p.price_booth']['checked'])) {
 			print '<td class="right">';
-			if ($obj->price_booth != '')
-			{
+			if ($obj->price_booth != '') {
 				print price($obj->price_booth, 1, $langs, 1, -1, -1);
 				$totalarray['val']['p.price_booth'] += $obj->price_booth;
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.price_booth';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.price_booth';
+			}
 		}
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
@@ -1055,37 +1265,43 @@ while ($i < min($num, $limit))
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
-		if (!empty($arrayfields['p.datec']['checked']))
-		{
+		if (!empty($arrayfields['p.datec']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Date modification
-		if (!empty($arrayfields['p.tms']['checked']))
-		{
+		if (!empty($arrayfields['p.tms']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Status
-		if (!empty($arrayfields['p.fk_statut']['checked']))
-		{
+		if (!empty($arrayfields['p.fk_statut']['checked'])) {
 			print '<td class="right">'.$object->getLibStatut(5).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Action column
 		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		{
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			$selected = 0;
-			if (in_array($obj->id, $arrayofselected)) $selected = 1;
+			if (in_array($obj->id, $arrayofselected)) {
+				$selected = 1;
+			}
 			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		print "</tr>\n";
 	}
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 65172311441..a1ef737ddc7 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -39,7 +39,9 @@ $mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
 $object = new Project($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+	$object->fetchComments();
+}
 
 // Security check
 $socid = 0;
@@ -61,7 +63,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
  */
 
 $title = $langs->trans("Project").' - '.$langs->trans("Note").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("Note");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Note");
+}
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 llxHeader("", $title, $help_url);
 
@@ -70,8 +74,7 @@ $userstatic = new User($db);
 
 $now = dol_now();
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	// To verify role of users
 	//$userAccess = $object->restrictedProjectArea($user,'read');
 	$userWrite = $object->restrictedProjectArea($user, 'write');
@@ -90,15 +93,13 @@ if ($id > 0 || !empty($ref))
 	// Title
 	$morehtmlref .= $object->title;
 	// Thirdparty
-	if ($object->thirdparty->id > 0)
-	{
+	if ($object->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire)
-	{
+	if (!$user->rights->projet->all->lire) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 		$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index add142f1f57..f25e78bceda 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -28,8 +28,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/projectstats.class.php';
 
 // Security check
-if (!$user->rights->projet->lire)
+if (!$user->rights->projet->lire) {
 	accessforbidden();
+}
 
 
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
@@ -38,8 +39,7 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -73,9 +73,15 @@ dol_mkdir($dir);
 
 
 $stats_project = new ProjectStats($db);
-if (!empty($userid) && $userid != -1) $stats_project->userid = $userid;
-if (!empty($socid) && $socid != -1) $stats_project->socid = $socid;
-if (!empty($year)) $stats_project->year = $year;
+if (!empty($userid) && $userid != -1) {
+	$stats_project->userid = $userid;
+}
+if (!empty($socid) && $socid != -1) {
+	$stats_project->socid = $socid;
+}
+if (!empty($year)) {
+	$stats_project->year = $year;
+}
 
 /*
 if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
@@ -149,12 +155,10 @@ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=projectstats&amp;file=proje
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -172,8 +176,7 @@ if (!$mesg)
 }
 
 
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-{
+if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 	// Build graphic amount of object
 	$data = $stats_project->getAmountByMonthWithPrevYear($endyear, $startyear);
 	//var_dump($data);
@@ -184,11 +187,9 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 
 	$px2 = new DolGraph();
 	$mesg = $px2->isGraphKo();
-	if (!$mesg)
-	{
+	if (!$mesg) {
 		$i = $startyear; $legend = array();
-		while ($i <= $endyear)
-		{
+		while ($i <= $endyear) {
 			$legend[] = $i;
 			$i++;
 		}
@@ -210,8 +211,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	}
 }
 
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-{
+if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 	// Build graphic with transformation rate
 	$data = $stats_project->getWeightedAmountByMonthWithPrevYear($endyear, $startyear, 0, 0);
 	//var_dump($data);
@@ -222,12 +222,10 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 
 	$px3 = new DolGraph();
 	$mesg = $px3->isGraphKo();
-	if (!$mesg)
-	{
+	if (!$mesg) {
 		$px3->SetData($data);
 		$i = $startyear; $legend = array();
-		while ($i <= $endyear)
-		{
+		while ($i <= $endyear) {
 			$legend[] = $i;
 			$i++;
 		}
@@ -251,12 +249,16 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 $stats_project->year = 0;
 $data_all_year = $stats_project->getAllByYear();
 
-if (!empty($year)) $stats_project->year = $year;
+if (!empty($year)) {
+	$stats_project->year = $year;
+}
 $arrayyears = array();
 foreach ($data_all_year as $val) {
 	$arrayyears[$val['year']] = $val['year'];
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 
 $h = 0;
@@ -288,8 +290,12 @@ print $form->select_dolusers($userid, 'userid', 1, array(),0,$includeuserlist);
 print '</td></tr>';*/
 // Year
 print '<tr><td>'.$langs->trans("Year").'</td><td>';
-if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!in_array($year, $arrayyears)) {
+	$arrayyears[$year] = $year;
+}
+if (!in_array($nowyear, $arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
@@ -303,8 +309,7 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre" height="24">';
 print '<td class="center">'.$langs->trans("Year").'</td>';
 print '<td class="right">'.$langs->trans("NbOfProjects").'</td>';
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-{
+if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 	print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
 	print '<td class="right">'.$langs->trans("OpportunityAmountAverageShort").'</td>';
 	print '<td class="right">'.$langs->trans("OpportunityAmountWeigthedShort").'</td>';
@@ -312,17 +317,14 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data_all_year as $val)
-{
+foreach ($data_all_year as $val) {
 	$year = $val['year'];
-	while ($year && $oldyear > $year + 1)
-	{	// If we have empty year
+	while ($year && $oldyear > $year + 1) {	// If we have empty year
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
 		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 			print '<td class="right">0</td>';
 			print '<td class="right">0</td>';
 			print '<td class="right">0</td>';
@@ -334,8 +336,7 @@ foreach ($data_all_year as $val)
 	print '<tr class="oddeven" height="24">';
 	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-	{
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 		print '<td class="right">'.($val['total'] ?price(price2num($val['total'], 'MT'), 1) : '0').'</td>';
 		print '<td class="right">'.($val['avg'] ?price(price2num($val['avg'], 'MT'), 1) : '0').'</td>';
 		print '<td class="right">'.($val['weighted'] ?price(price2num($val['weighted'], 'MT'), 1) : '0').'</td>';
@@ -350,11 +351,12 @@ print '</div>';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 $stringtoshow .= '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; } else {
+if ($mesg) {
+	print $mesg;
+} else {
 	$stringtoshow .= $px1->show();
 	$stringtoshow .= "<br>\n";
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-	{
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 		//$stringtoshow .= $px->show();
 		//$stringtoshow .= "<br>\n";
 		$stringtoshow .= $px2->show();
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index c9994dcf108..fe333a2d01e 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -31,7 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-if ($conf->categorie->enabled) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; }
+if ($conf->categorie->enabled) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'users', 'companies'));
@@ -51,7 +53,9 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -83,10 +87,11 @@ $taskstatic = new Task($db);
 $extrafields = new ExtraFields($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+	$object->fetchComments();
+}
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	// fetch optionals attributes and labels
 	$extrafields->fetch_name_optionals_label($object->table_element);
 }
@@ -95,8 +100,12 @@ $search_array_options = $extrafields->getOptionalsFromPost($taskstatic->table_el
 
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (!$sortfield) { reset($object->fields); $sortfield="t.".key($object->fields); }   // Set here default search field. By default 1st field in definition. Reset is required to avoid key() to return null.
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	reset($object->fields); $sortfield="t.".key($object->fields);
+}   // Set here default search field. By default 1st field in definition. Reset is required to avoid key() to return null.
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 
 // Security check
@@ -148,16 +157,16 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 
 $parameters = array('id'=>$id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_user_id = "";
 		$search_taskref = '';
 		$search_tasklabel = '';
@@ -195,10 +204,14 @@ if (!empty($search_tasklabel)) {
 }
 
 $moresql = dolSqlDateFilter('t.dateo', $search_dtstartday, $search_dtstartmonth, $search_dtstartyear, 1);
-if ($moresql) $morewherefilterarray[] = $moresql;
+if ($moresql) {
+	$morewherefilterarray[] = $moresql;
+}
 
 $moresql = dolSqlDateFilter('t.datee', $search_dtendday, $search_dtendmonth, $search_dtendyear, 1);
-if ($moresql) $morewherefilterarray[] = $moresql;
+if ($moresql) {
+	$morewherefilterarray[] = $moresql;
+}
 
 if (!empty($search_planedworkload)) {
 	$morewherefilterarray[] = natural_search('t.planned_workload', $search_planedworkload, 1, 1);
@@ -223,8 +236,7 @@ if (count($morewherefilterarray) > 0) {
 	$morewherefilter = ' AND '.implode(' AND ', $morewherefilterarray);
 }
 
-if ($action == 'createtask' && $user->rights->projet->creer)
-{
+if ($action == 'createtask' && $user->rights->projet->creer) {
 	$error = 0;
 
 	// If we use user timezone, we must change also view/list to use user timezone everywhere
@@ -233,33 +245,32 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 	$date_start = dol_mktime(GETPOST('dateohour', 'int'), GETPOST('dateomin', 'int'), 0, GETPOST('dateomonth', 'int'), GETPOST('dateoday', 'int'), GETPOST('dateoyear', 'int'));
 	$date_end = dol_mktime(GETPOST('dateehour', 'int'), GETPOST('dateemin', 'int'), 0, GETPOST('dateemonth', 'int'), GETPOST('dateeday', 'int'), GETPOST('dateeyear', 'int'));
 
-	if (!$cancel)
-	{
-		if (empty($taskref))
-		{
+	if (!$cancel) {
+		if (empty($taskref)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 			$action = 'create';
 			$error++;
 		}
-		if (empty($label))
-		{
+		if (empty($label)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$action = 'create';
 			$error++;
-		} elseif (empty($_POST['task_parent']))
-		{
+		} elseif (empty($_POST['task_parent'])) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ChildOfProjectTask")), null, 'errors');
 			$action = 'create';
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$tmparray = explode('_', GETPOST('task_parent'));
 			$projectid = $tmparray[0];
-			if (empty($projectid)) $projectid = $id; // If projectid is ''
+			if (empty($projectid)) {
+				$projectid = $id; // If projectid is ''
+			}
 			$task_parent = $tmparray[1];
-			if (empty($task_parent)) $task_parent = 0; // If task_parent is ''
+			if (empty($task_parent)) {
+				$task_parent = 0; // If task_parent is ''
+			}
 
 			$task = new Task($db);
 
@@ -279,12 +290,10 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 
 			$taskid = $task->create($user);
 
-			if ($taskid > 0)
-			{
+			if ($taskid > 0) {
 				$result = $task->add_contact($_POST["userid"], 'TASKEXECUTIVE', 'internal');
 			} else {
-				if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
+				if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					$langs->load("projects");
 					setEventMessages($langs->trans('NewTaskRefSuggested'), '', 'warnings');
 					$duplicate_code_error = true;
@@ -296,26 +305,21 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			}
 		}
 
-		if (!$error)
-		{
-			if (!empty($backtopage))
-			{
+		if (!$error) {
+			if (!empty($backtopage)) {
 				header("Location: ".$backtopage);
 				exit;
-			} elseif (empty($projectid))
-			{
+			} elseif (empty($projectid)) {
 				header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode) ? '' : '?mode='.$mode));
 				exit;
 			}
 			$id = $projectid;
 		}
 	} else {
-		if (!empty($backtopage))
-		{
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
-		} elseif (empty($id))
-		{
+		} elseif (empty($id)) {
 			// We go back on task list
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode) ? '' : '?mode='.$mode));
 			exit;
@@ -337,14 +341,15 @@ $taskstatic = new Task($db);
 $userstatic = new User($db);
 
 $title = $langs->trans("Project").' - '.$langs->trans("Tasks").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("Tasks");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Tasks");
+}
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 
 llxHeader("", $title, $help_url);
 
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
 	$res = $object->fetch_optionals();
@@ -362,22 +367,54 @@ if ($id > 0 || !empty($ref))
 	print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 	$param = '&id='.$object->id;
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($search_user_id)                 		$param .= '&search_user_id='.urlencode($search_user_id);
-	if ($search_taskref)              		$param .= '&search_taskref='.urlencode($search_taskref);
-	if ($search_tasklabel)              		$param .= '&search_tasklabel='.urlencode($search_tasklabel);
-	if ($search_taskdescription)              		$param .= '&search_taskdescription='.urlencode($search_taskdescription);
-	if ($search_dtstartday)              		$param .= '&search_dtstartday='.urlencode($search_dtstartday);
-	if ($search_dtstartmonth)              		$param .= '&search_dtstartmonth='.urlencode($search_dtstartmonth);
-	if ($search_dtstartyear)              		$param .= '&search_dtstartyear='.urlencode($search_dtstartyear);
-	if ($search_dtendday)              		$param .= '&search_dtendday='.urlencode($search_dtendday);
-	if ($search_dtendmonth)              		$param .= '&search_dtendmonth='.urlencode($search_dtendmonth);
-	if ($search_dtendyear)              		$param .= '&search_dtendyear='.urlencode($search_dtendyear);
-	if ($search_planedworkload)              		$param .= '&search_planedworkload='.urlencode($search_planedworkload);
-	if ($search_timespend)              		$param .= '&search_timespend='.urlencode($search_timespend);
-	if ($search_progresscalc)              		$param .= '&search_progresscalc='.urlencode($search_progresscalc);
-	if ($search_progressdeclare)              		$param .= '&search_progressdeclare='.urlencode($search_progressdeclare);
-	if ($optioncss != '')           $param .= '&optioncss='.urlencode($optioncss);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($search_user_id) {
+		$param .= '&search_user_id='.urlencode($search_user_id);
+	}
+	if ($search_taskref) {
+		$param .= '&search_taskref='.urlencode($search_taskref);
+	}
+	if ($search_tasklabel) {
+		$param .= '&search_tasklabel='.urlencode($search_tasklabel);
+	}
+	if ($search_taskdescription) {
+		$param .= '&search_taskdescription='.urlencode($search_taskdescription);
+	}
+	if ($search_dtstartday) {
+		$param .= '&search_dtstartday='.urlencode($search_dtstartday);
+	}
+	if ($search_dtstartmonth) {
+		$param .= '&search_dtstartmonth='.urlencode($search_dtstartmonth);
+	}
+	if ($search_dtstartyear) {
+		$param .= '&search_dtstartyear='.urlencode($search_dtstartyear);
+	}
+	if ($search_dtendday) {
+		$param .= '&search_dtendday='.urlencode($search_dtendday);
+	}
+	if ($search_dtendmonth) {
+		$param .= '&search_dtendmonth='.urlencode($search_dtendmonth);
+	}
+	if ($search_dtendyear) {
+		$param .= '&search_dtendyear='.urlencode($search_dtendyear);
+	}
+	if ($search_planedworkload) {
+		$param .= '&search_planedworkload='.urlencode($search_planedworkload);
+	}
+	if ($search_timespend) {
+		$param .= '&search_timespend='.urlencode($search_timespend);
+	}
+	if ($search_progresscalc) {
+		$param .= '&search_progresscalc='.urlencode($search_progresscalc);
+	}
+	if ($search_progressdeclare) {
+		$param .= '&search_progressdeclare='.urlencode($search_progressdeclare);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -389,15 +426,13 @@ if ($id > 0 || !empty($ref))
 	// Title
 	$morehtmlref .= $object->title;
 	// Thirdparty
-	if ($object->thirdparty->id > 0)
-	{
+	if ($object->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
 
 	// Define a complementary filter for search of next/prev ref.
-	if (!$user->rights->projet->all->lire)
-	{
+	if (!$user->rights->projet->all->lire) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
 		$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 	}
@@ -415,22 +450,19 @@ if ($id > 0 || !empty($ref))
 	print $langs->trans("Usage");
 	print '</td>';
 	print '<td>';
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-	{
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 		print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectFollowOpportunity");
 		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 		print '<br>';
 	}
-	if (empty($conf->global->PROJECT_HIDE_TASKS))
-	{
+	if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 		print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectFollowTasks");
 		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 		print '<br>';
 	}
-	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-	{
+	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 		print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectBillTimeDescription");
 		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -440,8 +472,11 @@ if ($id > 0 || !empty($ref))
 
 	// Visibility
 	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-	if ($object->public) print $langs->trans('SharedProject');
-	else print $langs->trans('PrivateProject');
+	if ($object->public) {
+		print $langs->trans('SharedProject');
+	} else {
+		print $langs->trans('PrivateProject');
+	}
 	print '</td></tr>';
 
 	// Date start - end
@@ -451,12 +486,16 @@ if ($id > 0 || !empty($ref))
 	$end = dol_print_date($object->date_end, 'day');
 	print ' - ';
 	print ($end ? $end : '?');
-	if ($object->hasDelay()) print img_warning("Late");
+	if ($object->hasDelay()) {
+		print img_warning("Late");
+	}
 	print '</td></tr>';
 
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-	if (strcmp($object->budget_amount, '')) print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+	if (strcmp($object->budget_amount, '')) {
+		print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+	}
 	print '</td></tr>';
 
 	// Other attributes
@@ -497,9 +536,10 @@ if ($id > 0 || !empty($ref))
 }
 
 
-if ($action == 'create' && $user->rights->projet->creer && (empty($object->thirdparty->id) || $userWrite > 0))
-{
-	if ($id > 0 || !empty($ref)) print '<br>';
+if ($action == 'create' && $user->rights->projet->creer && (empty($object->thirdparty->id) || $userWrite > 0)) {
+	if ($id > 0 || !empty($ref)) {
+		print '<br>';
+	}
 
 	print load_fiche_titre($langs->trans("NewTask"), '', 'projecttask');
 
@@ -521,7 +561,9 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="createtask">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	if (!empty($object->id)) print '<input type="hidden" name="id" value="'.$object->id.'">';
+	if (!empty($object->id)) {
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
+	}
 
 	print dol_get_fiche_head('');
 
@@ -529,19 +571,19 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	$defaultref = '';
 	$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-	if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
-	{
+	if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php")) {
 		require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
 		$modTask = new $obj;
 		$defaultref = $modTask->getNextValue($object->thirdparty, null);
 	}
 
-	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+	if (is_numeric($defaultref) && $defaultref <= 0) {
+		$defaultref = '';
+	}
 
 	// Ref
 	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td>';
-	if (empty($duplicate_code_error))
-	{
+	if (empty($duplicate_code_error)) {
 		print (GETPOSTISSET("ref") ? GETPOST("ref", 'alpha') : $defaultref);
 	} else {
 		print $defaultref;
@@ -561,8 +603,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
 	$contactsofproject = (!empty($object->id) ? $object->getListContactId('internal') : '');
-	if (is_array($contactsofproject) && count($contactsofproject))
-	{
+	if (is_array($contactsofproject) && count($contactsofproject)) {
 		print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
 	} else {
 		print $langs->trans("NoUserAssignedToTheProject");
@@ -600,8 +641,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $taskstatic, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	if (empty($reshook) && !empty($extrafields->attributes[$taskstatic->table_element]['label']))
-	{
+	if (empty($reshook) && !empty($extrafields->attributes[$taskstatic->table_element]['label'])) {
 		print $taskstatic->showOptionals($extrafields, 'edit'); // Do not use $object here that is object of project but use $taskstatic
 	}
 
@@ -639,7 +679,9 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	$linktocreatetask = dolGetButtonTitle($langs->trans('AddTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id), '', $linktocreatetaskUserRight, $linktocreatetaskParam);
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -662,28 +704,27 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	// We load also tasks limited to a particular user
 	$tmpuser = new User($db);
-	if ($search_user_id > 0) $tmpuser->fetch($search_user_id);
+	if ($search_user_id > 0) {
+		$tmpuser->fetch($search_user_id);
+	}
 
 	$tasksrole = ($tmpuser->id > 0 ? $taskstatic->getUserRolesForProjectsOrTasks(0, $tmpuser, $object->id, 0) : '');
 	//var_dump($tasksarray);
 	//var_dump($tasksrole);
 
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 	}
 
 	// Filter on categories
 	$moreforfilter = '';
-	if (count($tasksarray) > 0)
-	{
+	if (count($tasksarray) > 0) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans("TasksAssignedTo").': ';
 		$moreforfilter .= $form->select_dolusers($tmpuser->id > 0 ? $tmpuser->id : '', 'search_user_id', 1);
 		$moreforfilter .= '</div>';
 	}
-	if ($moreforfilter)
-	{
+	if ($moreforfilter) {
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>';
@@ -756,8 +797,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	// progress resume not searchable
 	print '<td class="liste_titre right"></td>';
 
-	if ($object->usage_bill_time)
-	{
+	if ($object->usage_bill_time) {
 		if (!empty($arrayfields['t.tobill']['checked'])) {
 			print '<td class="liste_titre right">';
 			print '</td>';
@@ -769,7 +809,9 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		}
 	}
 
-	if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) print '<td class="liste_titre"></td>';
+	if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
+		print '<td class="liste_titre"></td>';
+	}
 
 	$extrafieldsobjectkey = $taskstatic->table_element;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -783,22 +825,47 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	print '<tr class="liste_titre nodrag nodrop">';
 	// print '<td>'.$langs->trans("Project").'</td>';
-	if (!empty($arrayfields['t.ref']['checked'])) print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, '');
-	if (!empty($arrayfields['t.label']['checked'])) print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, '');
-	if (!empty($arrayfields['t.description']['checked'])) print_liste_field_titre($arrayfields['t.description']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, '');
-	if (!empty($arrayfields['t.dateo']['checked'])) print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['t.datee']['checked'])) print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['t.planned_workload']['checked'])) print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
-	if (!empty($arrayfields['t.duration_effective']['checked'])) print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
-	if (!empty($arrayfields['t.progress_calculated']['checked'])) print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
-	if (!empty($arrayfields['t.progress']['checked']))  print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
-	if (!empty($arrayfields['t.progress_summary']['checked'])) print_liste_field_titre($arrayfields['t.progress_summary']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '', 1);
-	if ($object->usage_bill_time)
-	{
-		if (!empty($arrayfields['t.tobill']['checked']))  print_liste_field_titre($arrayfields['t.tobill']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
-		if (!empty($arrayfields['t.billed']['checked'])) print_liste_field_titre($arrayfields['t.billed']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
+	if (!empty($arrayfields['t.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, '');
+	}
+	if (!empty($arrayfields['t.label']['checked'])) {
+		print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, '');
+	}
+	if (!empty($arrayfields['t.description']['checked'])) {
+		print_liste_field_titre($arrayfields['t.description']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, '');
+	}
+	if (!empty($arrayfields['t.dateo']['checked'])) {
+		print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['t.datee']['checked'])) {
+		print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['t.planned_workload']['checked'])) {
+		print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
+	}
+	if (!empty($arrayfields['t.duration_effective']['checked'])) {
+		print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
+	}
+	if (!empty($arrayfields['t.progress_calculated']['checked'])) {
+		print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
+	}
+	if (!empty($arrayfields['t.progress']['checked'])) {
+		print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
+	}
+	if (!empty($arrayfields['t.progress_summary']['checked'])) {
+		print_liste_field_titre($arrayfields['t.progress_summary']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '', 1);
+	}
+	if ($object->usage_bill_time) {
+		if (!empty($arrayfields['t.tobill']['checked'])) {
+			print_liste_field_titre($arrayfields['t.tobill']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
+		}
+		if (!empty($arrayfields['t.billed']['checked'])) {
+			print_liste_field_titre($arrayfields['t.billed']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
+		}
+	}
+	if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
+		print_liste_field_titre("TaskRessourceLinks", $_SERVER["PHP_SELF"], '', '', $param, $sortfield, $sortorder);
 	}
-	if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) print_liste_field_titre("TaskRessourceLinks", $_SERVER["PHP_SELF"], '', '', $param, $sortfield, $sortorder);
 	// Extra fields
 	$disablesortlink = 1;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -809,14 +876,15 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
-	if (count($tasksarray) > 0)
-	{
+	if (count($tasksarray) > 0) {
 		// Show all lines in taskarray (recursive function to go down on tree)
 		$j = 0; $level = 0;
 		$nboftaskshown = projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id, $filterprogresscalc, ($object->usage_bill_time ? 1 : 0), $arrayfields);
 	} else {
 		$colspan = 10;
-		if ($object->usage_bill_time) $colspan += 2;
+		if ($object->usage_bill_time) {
+			$colspan += 2;
+		}
 		print '<tr class="oddeven nobottom"><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoTasks").'</span></td></tr>';
 	}
 
@@ -828,18 +896,14 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	// Test if database is clean. If not we clean it.
 	//print 'mode='.$_REQUEST["mode"].' $nboftaskshown='.$nboftaskshown.' count($tasksarray)='.count($tasksarray).' count($tasksrole)='.count($tasksrole).'<br>';
-	if (!empty($user->rights->projet->all->lire))	// We make test to clean only if user has permission to see all (test may report false positive otherwise)
-	{
-		if ($search_user_id == $user->id)
-		{
-			if ($nboftaskshown < count($tasksrole))
-			{
+	if (!empty($user->rights->projet->all->lire)) {	// We make test to clean only if user has permission to see all (test may report false positive otherwise)
+		if ($search_user_id == $user->id) {
+			if ($nboftaskshown < count($tasksrole)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				cleanCorruptedTree($db, 'projet_task', 'fk_task_parent');
 			}
 		} else {
-			if ($nboftaskshown < count($tasksarray) && !GETPOST('search_user_id', 'int'))
-			{
+			if ($nboftaskshown < count($tasksarray) && !GETPOST('search_user_id', 'int')) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				cleanCorruptedTree($db, 'projet_task', 'fk_task_parent');
 			}
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index 51bf3b6dfa8..9829e079da6 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -50,7 +50,9 @@ $planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('p
 // Security check
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcommentcard', 'globalcard'));
@@ -66,13 +68,10 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 include DOL_DOCUMENT_ROOT.'/core/actions_comments.inc.php';
 
 // Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
-if (!empty($project_ref) && !empty($withproject))
-{
-	if ($projectstatic->fetch('', $project_ref) > 0)
-	{
+if (!empty($project_ref) && !empty($withproject)) {
+	if ($projectstatic->fetch('', $project_ref) > 0) {
 		$objectsarray = $object->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
-		if (count($objectsarray) > 0)
-		{
+		if (count($objectsarray) > 0) {
 			$id = $objectsarray[0]->id;
 		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
@@ -91,10 +90,8 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
 
-if ($id > 0 || !empty($ref))
-{
-	if ($object->fetch($id, $ref) > 0)
-	{
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref) > 0) {
 		$result = $object->fetch_optionals();
 
 		$result = $object->fetchComments();
@@ -103,15 +100,18 @@ if ($id > 0 || !empty($ref))
 		}
 
 		$result = $projectstatic->fetch($object->fk_project);
-		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) $projectstatic->fetchComments();
+		if (!empty($projectstatic->socid)) {
+			$projectstatic->fetch_thirdparty();
+		}
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+			$projectstatic->fetchComments();
+		}
 
 		$object->project = clone $projectstatic;
 
 		$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
 
-		if (!empty($withproject))
-		{
+		if (!empty($withproject)) {
 			// Tabs for project
 			$tab = 'tasks';
 			$head = project_prepare_head($projectstatic);
@@ -127,15 +127,13 @@ if ($id > 0 || !empty($ref))
 			// Title
 			$morehtmlref .= $projectstatic->title;
 			// Thirdparty
-			if ($projectstatic->thirdparty->id > 0)
-			{
+			if ($projectstatic->thirdparty->id > 0) {
 				$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
 			}
 			$morehtmlref .= '</div>';
 
 			// Define a complementary filter for search of next/prev ref.
-			if (!$user->rights->projet->all->lire)
-			{
+			if (!$user->rights->projet->all->lire) {
 				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 				$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 			}
@@ -153,22 +151,19 @@ if ($id > 0 || !empty($ref))
 			print $langs->trans("Usage");
 			print '</td>';
 			print '<td>';
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-			{
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("ProjectFollowOpportunity");
 				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 				print '<br>';
 			}
-			if (empty($conf->global->PROJECT_HIDE_TASKS))
-			{
+			if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("ProjectFollowTasks");
 				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 				print '<br>';
 			}
-			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-			{
+			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("ProjectBillTimeDescription");
 				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -178,31 +173,39 @@ if ($id > 0 || !empty($ref))
 
 			// Visibility
 			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-			if ($projectstatic->public) print $langs->trans('SharedProject');
-			else print $langs->trans('PrivateProject');
+			if ($projectstatic->public) {
+				print $langs->trans('SharedProject');
+			} else {
+				print $langs->trans('PrivateProject');
+			}
 			print '</td></tr>';
 
 			// Usage
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity))
-			{
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity)) {
 				// Opportunity status
 				print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
 				$code = dol_getIdFromCode($db, $projectstatic->opp_status, 'c_lead_status', 'rowid', 'code');
-				if ($code) print $langs->trans("OppStatus".$code);
+				if ($code) {
+					print $langs->trans("OppStatus".$code);
+				}
 				print '</td></tr>';
 
 				// Opportunity percent
 				print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-				if (strcmp($object->opp_percent, '')) print price($projectstatic->opp_percent, 0, $langs, 1, 0).' %';
+				if (strcmp($object->opp_percent, '')) {
+					print price($projectstatic->opp_percent, 0, $langs, 1, 0).' %';
+				}
 				print '</td></tr>';
 
 				// Opportunity Amount
 				print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
 				/*if ($object->opp_status)
-            	 {
-            	 print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
-            	 }*/
-				if (strcmp($projectstatic->opp_amount, '')) print price($projectstatic->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+				 {
+				 print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
+				 }*/
+				if (strcmp($projectstatic->opp_amount, '')) {
+					print price($projectstatic->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+				}
 				print '</td></tr>';
 			}
 
@@ -213,12 +216,16 @@ if ($id > 0 || !empty($ref))
 			$end = dol_print_date($projectstatic->date_end, 'day');
 			print ' - ';
 			print ($end ? $end : '?');
-			if ($projectstatic->hasDelay()) print img_warning("Late");
+			if ($projectstatic->hasDelay()) {
+				print img_warning("Late");
+			}
 			print '</td></tr>';
 
 			// Budget
 			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-			if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			if (strcmp($projectstatic->budget_amount, '')) {
+				print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			}
 			print '</td></tr>';
 
 			// Other attributes
@@ -269,22 +276,21 @@ if ($id > 0 || !empty($ref))
 
 		print dol_get_fiche_head($head, 'task_comment', $langs->trans("Task"), -1, 'projecttask');
 
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&withproject='.$withproject, $langs->trans("DeleteATask"), $langs->trans("ConfirmDeleteATask"), "confirm_delete");
 		}
 
-		if (!GETPOST('withproject') || empty($projectstatic->id))
-		{
+		if (!GETPOST('withproject') || empty($projectstatic->id)) {
 			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 			$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		} else {
+			$object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		}
 
 		$morehtmlref = '';
 
 		// Project
-		if (empty($withproject))
-		{
+		if (empty($withproject)) {
 			$morehtmlref .= '<div class="refidno">';
 			$morehtmlref .= $langs->trans("Project").': ';
 			$morehtmlref .= $projectstatic->getNomUrl(1);
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 1b12bf166f2..854e57bbd1f 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -44,7 +44,9 @@ $project_ref = GETPOST('project_ref', 'alpha');
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 //$result = restrictedArea($user, 'projet', $id, 'projet_task');
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 $object = new Task($db);
 $projectstatic = new Project($db);
@@ -55,8 +57,7 @@ $projectstatic = new Project($db);
  */
 
 // Add new contact
-if ($action == 'addcontact' && $user->rights->projet->creer)
-{
+if ($action == 'addcontact' && $user->rights->projet->creer) {
 	$source  = 'internal';
 	if (GETPOST("addsourceexternal")) {
 		$source  ='external';
@@ -64,8 +65,7 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 
 	$result = $object->fetch($id, $ref);
 
-	if ($result > 0 && $id > 0)
-	{
+	if ($result > 0 && $id > 0) {
 		if ($source == 'internal') {
 			$idfortaskuser = ((GETPOST("userid") != 0 && GETPOST('userid') != -1) ? GETPOST("userid") : 0); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
 			$typeid = GETPOST('type');
@@ -73,16 +73,13 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 			$idfortaskuser = ((GETPOST("contactid") > 0) ? GETPOST("contactid", 'int') : 0); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
 			$typeid = GETPOST('typecontact');
 		}
-		if ($idfortaskuser == -2)
-		{
+		if ($idfortaskuser == -2) {
 			$result = $projectstatic->fetch($object->fk_project);
-			if ($result <= 0)
-			{
+			if ($result <= 0) {
 				dol_print_error($db, $projectstatic->error, $projectstatic->errors);
 			} else {
 				$contactsofproject = $projectstatic->getListContactId('internal');
-				foreach ($contactsofproject as $key => $val)
-				{
+				foreach ($contactsofproject as $key => $val) {
 					$result = $object->add_contact($val, $typeid, $source);
 				}
 			}
@@ -105,8 +102,7 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 }
 
 // bascule du statut d'un contact
-if ($action == 'swapstatut' && $user->rights->projet->creer)
-{
+if ($action == 'swapstatut' && $user->rights->projet->creer) {
 	if ($object->fetch($id, $ref)) {
 		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
@@ -115,13 +111,11 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 }
 
 // Efface un contact
-if ($action == 'deleteline' && $user->rights->projet->creer)
-{
+if ($action == 'deleteline' && $user->rights->projet->creer) {
 	$object->fetch($id, $ref);
 	$result = $object->delete_contact($_GET["lineid"]);
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : ''));
 		exit;
 	} else {
@@ -130,13 +124,10 @@ if ($action == 'deleteline' && $user->rights->projet->creer)
 }
 
 // Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
-if (!empty($project_ref) && !empty($withproject))
-{
-	if ($projectstatic->fetch(0, $project_ref) > 0)
-	{
+if (!empty($project_ref) && !empty($withproject)) {
+	if ($projectstatic->fetch(0, $project_ref) > 0) {
 		$tasksarray = $object->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
-		if (count($tasksarray) > 0)
-		{
+		if (count($tasksarray) > 0) {
 			$id = $tasksarray[0]->id;
 		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
@@ -163,23 +154,26 @@ $userstatic = new User($db);
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || !empty($ref))
-{
-	if ($object->fetch($id, $ref) > 0)
-	{
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref) > 0) {
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+			$object->fetchComments();
+		}
 		$id = $object->id; // So when doing a search from ref, id is also set correctly.
 
 		$result = $projectstatic->fetch($object->fk_project);
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) $projectstatic->fetchComments();
-		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+			$projectstatic->fetchComments();
+		}
+		if (!empty($projectstatic->socid)) {
+			$projectstatic->fetch_thirdparty();
+		}
 
 		$object->project = clone $projectstatic;
 
 		$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
 
-		if ($withproject)
-		{
+		if ($withproject) {
 			// Tabs for project
 			$tab = 'tasks';
 			$head = project_prepare_head($projectstatic);
@@ -195,15 +189,13 @@ if ($id > 0 || !empty($ref))
 			// Title
 			$morehtmlref .= $projectstatic->title;
 			// Thirdparty
-			if ($projectstatic->thirdparty->id > 0)
-			{
+			if ($projectstatic->thirdparty->id > 0) {
 				$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
 			}
 			$morehtmlref .= '</div>';
 
 			// Define a complementary filter for search of next/prev ref.
-			if (!$user->rights->projet->all->lire)
-			{
+			if (!$user->rights->projet->all->lire) {
 				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 				$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 			}
@@ -221,22 +213,19 @@ if ($id > 0 || !empty($ref))
 			print $langs->trans("Usage");
 			print '</td>';
 			print '<td>';
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-			{
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("ProjectFollowOpportunity");
 				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 				print '<br>';
 			}
-			if (empty($conf->global->PROJECT_HIDE_TASKS))
-			{
+			if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("ProjectFollowTasks");
 				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 				print '<br>';
 			}
-			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-			{
+			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("ProjectBillTimeDescription");
 				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -246,8 +235,11 @@ if ($id > 0 || !empty($ref))
 
 			// Visibility
 			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-			if ($projectstatic->public) print $langs->trans('SharedProject');
-			else print $langs->trans('PrivateProject');
+			if ($projectstatic->public) {
+				print $langs->trans('SharedProject');
+			} else {
+				print $langs->trans('PrivateProject');
+			}
 			print '</td></tr>';
 
 			// Date start - end
@@ -257,12 +249,16 @@ if ($id > 0 || !empty($ref))
 			$end = dol_print_date($projectstatic->date_end, 'day');
 			print ' - ';
 			print ($end ? $end : '?');
-			if ($projectstatic->hasDelay()) print img_warning("Late");
+			if ($projectstatic->hasDelay()) {
+				print img_warning("Late");
+			}
 			print '</td></tr>';
 
 			// Budget
 			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-			if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			if (strcmp($projectstatic->budget_amount, '')) {
+				print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			}
 			print '</td></tr>';
 
 			// Other attributes
@@ -315,17 +311,17 @@ if ($id > 0 || !empty($ref))
 		$param = (GETPOST('withproject') ? '&withproject=1' : '');
 		$linkback = GETPOST('withproject') ? '<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>' : '';
 
-		if (!GETPOST('withproject') || empty($projectstatic->id))
-		{
+		if (!GETPOST('withproject') || empty($projectstatic->id)) {
 			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 			$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		} else {
+			$object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		}
 
 		$morehtmlref = '';
 
 		// Project
-		if (empty($withproject))
-		{
+		if (empty($withproject)) {
 			$result = $projectstatic->fetch($object->fk_project);
 			$morehtmlref .= '<div class="refidno">';
 			$morehtmlref .= $langs->trans("Project").': ';
@@ -354,8 +350,8 @@ if ($id > 0 || !empty($ref))
 		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
 		foreach($dirtpls as $reldir)
 		{
-		    $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-		    if ($res) break;
+			$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+			if ($res) break;
 		}
 		*/
 
@@ -366,12 +362,13 @@ if ($id > 0 || !empty($ref))
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="addcontact">';
 		print '<input type="hidden" name="id" value="'.$id.'">';
-		if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+		if ($withproject) {
+			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+		}
 
 		print '<table class="noborder centpercent">';
 
-		if ($action != 'editline' && $user->rights->projet->creer)
-		{
+		if ($action != 'editline' && $user->rights->projet->creer) {
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("NatureOfContact").'</td>';
 			print '<td>'.$langs->trans("ThirdParty").'</td>';
@@ -393,8 +390,11 @@ if ($id > 0 || !empty($ref))
 
 			print '<td>';
 			// On recupere les id des users deja selectionnes
-			if ($object->project->public) $contactsofproject = ''; // Everybody
-			else $contactsofproject = $projectstatic->getListContactId('internal');
+			if ($object->project->public) {
+				$contactsofproject = ''; // Everybody
+			} else {
+				$contactsofproject = $projectstatic->getListContactId('internal');
+			}
 			print $form->select_dolusers((GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 1, $langs->trans("ResourceNotAssignedToProject"));
 			print '</td>';
 			print '<td>';
@@ -404,8 +404,7 @@ if ($id > 0 || !empty($ref))
 			print '</tr>';
 
 			// Line to add an external contact. Only if project linked to a third party.
-			if ($projectstatic->socid)
-			{
+			if ($projectstatic->socid) {
 				print '<tr class="oddeven">';
 
 				print '<td class="nowrap">';
@@ -427,7 +426,9 @@ if ($id > 0 || !empty($ref))
 				$formcompany->selectTypeContact($object, '', 'typecontact', 'external', 'rowid');
 				print '</td>';
 				print '<td class="right" colspan="3" ><input type="submit" class="button" id="add-customer-contact" name="addsourceexternal" value="'.$langs->trans("Add").'"';
-				if (!$nbofcontacts) print ' disabled';
+				if (!$nbofcontacts) {
+					print ' disabled';
+				}
 				print '></td>';
 				print '</tr>';
 			}
@@ -445,44 +446,42 @@ if ($id > 0 || !empty($ref))
 
 		$companystatic = new Societe($db);
 
-		foreach (array('internal', 'external') as $source)
-		{
+		foreach (array('internal', 'external') as $source) {
 			$tab = $object->liste_contact(-1, $source);
 
 			$num = count($tab);
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				print '<tr class="oddeven" valign="top">';
 
 				// Source
 				print '<td class="left">';
-				if ($tab[$i]['source'] == 'internal') print $langs->trans("User");
-				if ($tab[$i]['source'] == 'external') print $langs->trans("ThirdPartyContact");
+				if ($tab[$i]['source'] == 'internal') {
+					print $langs->trans("User");
+				}
+				if ($tab[$i]['source'] == 'external') {
+					print $langs->trans("ThirdPartyContact");
+				}
 				print '</td>';
 
 				// Societe
 				print '<td class="left">';
-				if ($tab[$i]['socid'] > 0)
-				{
+				if ($tab[$i]['socid'] > 0) {
 					$companystatic->fetch($tab[$i]['socid']);
 					print $companystatic->getNomUrl(1);
 				}
-				if ($tab[$i]['socid'] < 0)
-				{
+				if ($tab[$i]['socid'] < 0) {
 					print $conf->global->MAIN_INFO_SOCIETE_NOM;
 				}
-				if (!$tab[$i]['socid'])
-				{
+				if (!$tab[$i]['socid']) {
 					print '&nbsp;';
 				}
 				print '</td>';
 
 				// Contact
 				print '<td>';
-				if ($tab[$i]['source'] == 'internal')
-				{
+				if ($tab[$i]['source'] == 'internal') {
 					$userstatic->id = $tab[$i]['id'];
 					$userstatic->lastname = $tab[$i]['lastname'];
 					$userstatic->firstname = $tab[$i]['firstname'];
@@ -493,8 +492,7 @@ if ($id > 0 || !empty($ref))
 
 					print $userstatic->getNomUrl(-1);
 				}
-				if ($tab[$i]['source'] == 'external')
-				{
+				if ($tab[$i]['source'] == 'external') {
 					$contactstatic->id = $tab[$i]['id'];
 					$contactstatic->lastname = $tab[$i]['lastname'];
 					$contactstatic->firstname = $tab[$i]['firstname'];
@@ -510,15 +508,18 @@ if ($id > 0 || !empty($ref))
 				// Statut
 				print '<td class="center">';
 				// Activation desativation du contact
-				if ($object->statut >= 0) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=swapstatut&ligne='.$tab[$i]['rowid'].($withproject ? '&withproject=1' : '').'">';
+				if ($object->statut >= 0) {
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=swapstatut&ligne='.$tab[$i]['rowid'].($withproject ? '&withproject=1' : '').'">';
+				}
 				print $contactstatic->LibStatut($tab[$i]['status'], 3);
-				if ($object->statut >= 0) print '</a>';
+				if ($object->statut >= 0) {
+					print '</a>';
+				}
 				print '</td>';
 
 				// Icon update et delete
 				print '<td class="center nowrap">';
-				if ($user->rights->projet->creer)
-				{
+				if ($user->rights->projet->creer) {
 					print '&nbsp;';
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteline&token='.newToken().'&lineid='.$tab[$i]['rowid'].($withproject ? '&withproject=1' : '').'">';
 					print img_picto($langs->trans('Unlink'), 'unlink');
@@ -539,8 +540,7 @@ if ($id > 0 || !empty($ref))
 	}
 }
 
-if (is_object($hookmanager))
-{
+if (is_object($hookmanager)) {
 	$hookmanager->initHooks(array('contacttpl'));
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formContactTpl', $parameters, $object, $action);
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index ef4ad0292f3..9e2ea202601 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -48,19 +48,27 @@ $project_ref = GETPOST('project_ref', 'alpha');
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 //$result=restrictedArea($user,'projet',$id,'');
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $object = new Task($db);
 $projectstatic = new Project($db);
@@ -70,13 +78,10 @@ $projectstatic = new Project($db);
  */
 
 // Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
-if (!empty($project_ref) && !empty($withproject))
-{
-	if ($projectstatic->fetch(0, $project_ref) > 0)
-	{
+if (!empty($project_ref) && !empty($withproject)) {
+	if ($projectstatic->fetch(0, $project_ref) > 0) {
 		$tasksarray = $object->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
-		if (count($tasksarray) > 0)
-		{
+		if (count($tasksarray) > 0) {
 			$id = $tasksarray[0]->id;
 			$object->fetch($id);
 		} else {
@@ -86,13 +91,15 @@ if (!empty($project_ref) && !empty($withproject))
 	}
 }
 
-if ($id > 0 || !empty($ref))
-{
-	if ($object->fetch($id, $ref) > 0)
-	{
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref) > 0) {
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+			$object->fetchComments();
+		}
 		$projectstatic->fetch($object->fk_project);
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) $projectstatic->fetchComments();
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+			$projectstatic->fetchComments();
+		}
 
 		if (!empty($projectstatic->socid)) {
 			$projectstatic->fetch_thirdparty();
@@ -117,14 +124,12 @@ $form = new Form($db);
 
 llxHeader('', $langs->trans('Task'));
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$projectstatic->fetch_thirdparty();
 
 	$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
 
-	if (!empty($withproject))
-	{
+	if (!empty($withproject)) {
 		// Tabs for project
 		$tab = 'tasks';
 		$head = project_prepare_head($projectstatic);
@@ -141,15 +146,13 @@ if ($object->id > 0)
 		// Title
 		$morehtmlref .= $projectstatic->title;
 		// Thirdparty
-		if ($projectstatic->thirdparty->id > 0)
-		{
+		if ($projectstatic->thirdparty->id > 0) {
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
 		}
 		$morehtmlref .= '</div>';
 
 		// Define a complementary filter for search of next/prev ref.
-		if (!$user->rights->projet->all->lire)
-		{
+		if (!$user->rights->projet->all->lire) {
 			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 			$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 		}
@@ -167,22 +170,19 @@ if ($object->id > 0)
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS))
-		{
+		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowTasks");
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-		{
+		if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -192,8 +192,11 @@ if ($object->id > 0)
 
 		// Visibility
 		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-		if ($projectstatic->public) print $langs->trans('SharedProject');
-		else print $langs->trans('PrivateProject');
+		if ($projectstatic->public) {
+			print $langs->trans('SharedProject');
+		} else {
+			print $langs->trans('PrivateProject');
+		}
 		print '</td></tr>';
 
 		// Date start - end
@@ -203,12 +206,16 @@ if ($object->id > 0)
 		$end = dol_print_date($projectstatic->date_end, 'day');
 		print ' - ';
 		print ($end ? $end : '?');
-		if ($projectstatic->hasDelay()) print img_warning("Late");
+		if ($projectstatic->hasDelay()) {
+			print img_warning("Late");
+		}
 		print '</td></tr>';
 
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-		if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+		if (strcmp($projectstatic->budget_amount, '')) {
+			print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+		}
 		print '</td></tr>';
 
 		// Other attributes
@@ -255,25 +262,24 @@ if ($object->id > 0)
 	// Files list constructor
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
 	$param = (GETPOST('withproject') ? '&withproject=1' : '');
 	$linkback = GETPOST('withproject') ? '<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>' : '';
 
-	if (!GETPOST('withproject') || empty($projectstatic->id))
-	{
+	if (!GETPOST('withproject') || empty($projectstatic->id)) {
 		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 		$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-	} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+	} else {
+		$object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+	}
 
 	$morehtmlref = '';
 
 	// Project
-	if (empty($withproject))
-	{
+	if (empty($withproject)) {
 		$morehtmlref .= '<div class="refidno">';
 		$morehtmlref .= $langs->trans("Project").': ';
 		$morehtmlref .= $projectstatic->getNomUrl(1);
@@ -307,7 +313,9 @@ if ($object->id > 0)
 	print '<br>';
 
 	$param = '';
-	if ($withproject) $param .= '&withproject=1';
+	if ($withproject) {
+		$param .= '&withproject=1';
+	}
 	$modulepart = 'project_task';
 	$permission = $user->rights->projet->creer;
 	$permtoedit = $user->rights->projet->creer;
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index b318b44f053..57f9ec2b24f 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -47,10 +47,12 @@ $search_categ = GETPOST("search_categ", 'alpha');
 $search_project = GETPOST('search_project');
 
 $search_projectstatus = GETPOST('search_projectstatus');
-if (!isset($search_projectstatus) || $search_projectstatus === '')
-{
-	if ($search_all != '') $search_projectstatus = -1;
-	else $search_projectstatus = 1;
+if (!isset($search_projectstatus) || $search_projectstatus === '') {
+	if ($search_all != '') {
+		$search_projectstatus = -1;
+	} else {
+		$search_projectstatus = 1;
+	}
 }
 
 $search_project_ref = GETPOST('search_project_ref');
@@ -65,7 +67,9 @@ $search_task_progress = GETPOST('search_task_progress');
 $search_societe = GETPOST('search_societe');
 
 $mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
-if ($mine) { $search_task_user = $user->id; $mine = 0; }
+if ($mine) {
+	$search_task_user = $user->id; $mine = 0;
+}
 
 $search_sday	= GETPOST('search_sday', 'int');
 $search_smonth	= GETPOST('search_smonth', 'int');
@@ -89,7 +93,9 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // Security check
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 $diroutputmassaction = $conf->projet->dir_output.'/tasks/temp/massgeneration/'.$user->id;
 
@@ -97,12 +103,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'p.ref';
-if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) {
+	$sortfield = 'p.ref';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -111,7 +123,9 @@ $fieldstosearchall = array(
 	't.description'=>"Description",
 	't.note_public'=>"NotePublic",
 );
-if (empty($user->socid)) $fieldstosearchall['t.note_private'] = "NotePrivate";
+if (empty($user->socid)) {
+	$fieldstosearchall['t.note_private'] = "NotePrivate";
+}
 
 $arrayfields = array(
 	't.fk_task_parent'=>array('label'=>$langs->trans("RefTaskParent"), 'checked'=>0, 'position'=>70),
@@ -146,21 +160,25 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+	$massaction = '';
+}
 
 $parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_all = "";
 		$search_categ = "";
 		$search_project = "";
@@ -193,7 +211,9 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
-if (empty($search_projectstatus) && $search_projectstatus == '') $search_projectstatus = 1;
+if (empty($search_projectstatus) && $search_projectstatus == '') {
+	$search_projectstatus = 1;
+}
 
 
 
@@ -209,8 +229,12 @@ $socstatic = new Societe($db);
 $projectstatic = new Project($db);
 $puser = new User($db);
 $tuser = new User($db);
-if ($search_project_user > 0) $puser->fetch($search_project_user);
-if ($search_task_user > 0) $tuser->fetch($search_task_user);
+if ($search_project_user > 0) {
+	$puser->fetch($search_project_user);
+}
+if ($search_task_user > 0) {
+	$tuser->fetch($search_task_user);
+}
 
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
@@ -220,14 +244,15 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 $title = $langs->trans("Activities");
 //if ($search_task_user == $user->id) $title=$langs->trans("MyActivities");
 
-if ($id)
-{
+if ($id) {
 	$projectstatic->fetch($id);
 	$projectstatic->fetch_thirdparty();
 }
 
 // Get list of project id allowed to user (in a string list separated by coma)
-if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+if (!$user->rights->projet->all->lire) {
+	$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+}
 //var_dump($projectsListId);
 
 // Get id of types of contacts for projects (This list never contains a lot of elements)
@@ -236,28 +261,32 @@ $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc"
 $sql .= " WHERE ctc.element = '".$db->escape($projectstatic->element)."'";
 $sql .= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
-if ($resql)
-{
-	while ($obj = $db->fetch_object($resql))
-	{
+if ($resql) {
+	while ($obj = $db->fetch_object($resql)) {
 		$listofprojectcontacttype[$obj->rowid] = $obj->code;
 	}
-} else dol_print_error($db);
-if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
+} else {
+	dol_print_error($db);
+}
+if (count($listofprojectcontacttype) == 0) {
+	$listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
+}
 // Get id of types of contacts for tasks (This list never contains a lot of elements)
 $listoftaskcontacttype = array();
 $sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
 $sql .= " WHERE ctc.element = '".$db->escape($object->element)."'";
 $sql .= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
-if ($resql)
-{
-	while ($obj = $db->fetch_object($resql))
-	{
+if ($resql) {
+	while ($obj = $db->fetch_object($resql)) {
 		$listoftaskcontacttype[$obj->rowid] = $obj->code;
 	}
-} else dol_print_error($db);
-if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
+} else {
+	dol_print_error($db);
+}
+if (count($listoftaskcontacttype) == 0) {
+	$listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
+}
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is assigned only once.
 $sql = "SELECT ".$distinct." p.rowid as projectid, p.ref as projectref, p.title as projecttitle, p.fk_statut as projectstatus, p.datee as projectdatee, p.fk_opp_status, p.public, p.fk_user_creat as projectusercreate, p.usage_bill_time,";
@@ -266,15 +295,18 @@ $sql .= " t.datec as date_creation, t.dateo as date_start, t.datee as date_end,
 $sql .= " t.rowid as id, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut, ";
 $sql .= " t.description, t.fk_task_parent";
 // We'll need these fields in order to filter by categ
-if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_project";
+if ($search_categ) {
+	$sql .= ", cs.fk_categorie, cs.fk_project";
+}
 // Add sum fields
-if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked']))
-{
+if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked'])) {
 	$sql .= " , SUM(tt.task_duration * ".$db->ifsql("invoice_id IS NULL", "1", "0").") as tobill, SUM(tt.task_duration * ".$db->ifsql("invoice_id IS NULL", "0", "1").") as billed";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	}
 }
 // Add fields from hooks
 $parameters = array();
@@ -283,69 +315,113 @@ $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 // We'll need this table joined to the select in order to filter by categ
-if (!empty($search_categ)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_project as cs ON p.rowid = cs.fk_project"; // We'll need this table joined to the select in order to filter by categ
+if (!empty($search_categ)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_project as cs ON p.rowid = cs.fk_project"; // We'll need this table joined to the select in order to filter by categ
+}
 $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
-if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked']))
-{
+if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tt ON tt.fk_task = t.rowid";
 }
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($search_project_user > 0)  $sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp";
-if ($search_task_user > 0)     $sql .= ", ".MAIN_DB_PREFIX."element_contact as ect";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+if ($search_project_user > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp";
+}
+if ($search_task_user > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ect";
+}
 $sql .= " WHERE t.fk_projet = p.rowid";
 $sql .= " AND p.entity IN (".getEntity('project').')';
-if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".($projectsListId ? $projectsListId : '0').")"; // public and assigned to projects, or restricted to company for external users
-if (is_object($projectstatic) && $projectstatic->id > 0) $sql .= " AND p.rowid = ".$projectstatic->id;
+if (!$user->rights->projet->all->lire) {
+	$sql .= " AND p.rowid IN (".($projectsListId ? $projectsListId : '0').")"; // public and assigned to projects, or restricted to company for external users
+}
+if (is_object($projectstatic) && $projectstatic->id > 0) {
+	$sql .= " AND p.rowid = ".$projectstatic->id;
+}
 // No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
-if ($socid) $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-if ($search_categ > 0)     $sql .= " AND cs.fk_categorie = ".$db->escape($search_categ);
-if ($search_categ == -2)   $sql .= " AND cs.fk_categorie IS NULL";
-if ($search_project_ref)   $sql .= natural_search('p.ref', $search_project_ref);
-if ($search_project_title) $sql .= natural_search('p.title', $search_project_title);
-if ($search_task_ref)      $sql .= natural_search('t.ref', $search_task_ref);
-if ($search_task_label)    $sql .= natural_search('t.label', $search_task_label);
-if ($search_task_description)    $sql .= natural_search('t.description', $search_task_description);
-if ($search_task_ref_parent)    $sql .= ' AND t.fk_task_parent IN (SELECT ipt.rowid FROM '.MAIN_DB_PREFIX.'projet_task  as ipt WHERE '.natural_search('ipt.ref', $search_task_ref_parent, 0, 1).')';
-if ($search_task_progress) $sql .= natural_search('t.progress', $search_task_progress, 1);
-if ($search_societe)       $sql .= natural_search('s.nom', $search_societe);
+if ($socid) {
+	$sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+}
+if ($search_categ > 0) {
+	$sql .= " AND cs.fk_categorie = ".$db->escape($search_categ);
+}
+if ($search_categ == -2) {
+	$sql .= " AND cs.fk_categorie IS NULL";
+}
+if ($search_project_ref) {
+	$sql .= natural_search('p.ref', $search_project_ref);
+}
+if ($search_project_title) {
+	$sql .= natural_search('p.title', $search_project_title);
+}
+if ($search_task_ref) {
+	$sql .= natural_search('t.ref', $search_task_ref);
+}
+if ($search_task_label) {
+	$sql .= natural_search('t.label', $search_task_label);
+}
+if ($search_task_description) {
+	$sql .= natural_search('t.description', $search_task_description);
+}
+if ($search_task_ref_parent) {
+	$sql .= ' AND t.fk_task_parent IN (SELECT ipt.rowid FROM '.MAIN_DB_PREFIX.'projet_task  as ipt WHERE '.natural_search('ipt.ref', $search_task_ref_parent, 0, 1).')';
+}
+if ($search_task_progress) {
+	$sql .= natural_search('t.progress', $search_task_progress, 1);
+}
+if ($search_societe) {
+	$sql .= natural_search('s.nom', $search_societe);
+}
 $sql .= dolSqlDateFilter('t.dateo', $search_sday, $search_smonth, $search_syear);
 $sql .= dolSqlDateFilter('t.datee', $search_eday, $search_emonth, $search_eyear);
-if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
-if ($search_projectstatus >= 0)
-{
-	if ($search_projectstatus == 99) $sql .= " AND p.fk_statut <> 2";
-	else $sql .= " AND p.fk_statut = ".$db->escape($search_projectstatus);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+}
+if ($search_projectstatus >= 0) {
+	if ($search_projectstatus == 99) {
+		$sql .= " AND p.fk_statut <> 2";
+	} else {
+		$sql .= " AND p.fk_statut = ".$db->escape($search_projectstatus);
+	}
+}
+if ($search_public != '') {
+	$sql .= " AND p.public = ".$db->escape($search_public);
+}
+if ($search_project_user > 0) {
+	$sql .= " AND ecp.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user;
+}
+if ($search_task_user > 0) {
+	$sql .= " AND ect.fk_c_type_contact IN (".join(',', array_keys($listoftaskcontacttype)).") AND ect.element_id = t.rowid AND ect.fk_socpeople = ".$search_task_user;
 }
-if ($search_public != '') $sql .= " AND p.public = ".$db->escape($search_public);
-if ($search_project_user > 0) $sql .= " AND ecp.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).") AND ecp.element_id = p.rowid AND ecp.fk_socpeople = ".$search_project_user;
-if ($search_task_user > 0) $sql .= " AND ect.fk_c_type_contact IN (".join(',', array_keys($listoftaskcontacttype)).") AND ect.element_id = t.rowid AND ect.fk_socpeople = ".$search_task_user;
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
-if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked']))
-{
+if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked'])) {
 	$sql .= " GROUP BY p.rowid, p.ref, p.title, p.fk_statut, p.datee, p.fk_opp_status, p.public, p.fk_user_creat,";
 	$sql .= " s.nom, s.rowid,";
 	$sql .= " t.datec, t.dateo, t.datee, t.tms,";
 	$sql .= " t.rowid, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut";
-	if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_project";
+	if ($search_categ) {
+		$sql .= ", cs.fk_categorie, cs.fk_project";
+	}
 	// Add fields from extrafields
 	if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+			$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
+		}
 	}
 }
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -356,8 +432,7 @@ $sql .= $db->plimit($limit + 1, $offset);
 dol_syslog("list allowed project", LOG_DEBUG);
 
 $resql = $db->query($sql);
-if (!$resql)
-{
+if (!$resql) {
 	dol_print_error($db);
 	exit;
 }
@@ -366,8 +441,7 @@ $num = $db->num_rows($resql);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->id;
 	header("Location: ".DOL_URL_ROOT.'/projet/tasks/task.php?id='.$id.'&withproject=1');
@@ -378,30 +452,78 @@ $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 llxHeader("", $title, $help_url);
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($search_sday)                 		$param .= '&search_sday='.urlencode($search_sday);
-if ($search_smonth)              		$param .= '&search_smonth='.urlencode($search_smonth);
-if ($search_syear)               		$param .= '&search_syear='.urlencode($search_syear);
-if ($search_eday)               		$param .= '&search_eday='.urlencode($search_eday);
-if ($search_emonth)              		$param .= '&search_emonth='.urlencode($search_emonth);
-if ($search_eyear)               		$param .= '&search_eyear='.urlencode($search_eyear);
-if ($socid)				        $param .= '&socid='.urlencode($socid);
-if ($search_all != '') 			$param .= '&search_all='.urlencode($search_all);
-if ($search_project_ref != '') 			$param .= '&search_project_ref='.urlencode($search_project_ref);
-if ($search_project_title != '') 		$param .= '&search_project_title='.urlencode($search_project_title);
-if ($search_task_ref != '') 			$param .= '&search_task_ref='.urlencode($search_ref);
-if ($search_task_label != '') 		$param .= '&search_task_label='.urlencode($search_label);
-if ($search_task_description != '') 		$param .= '&search_task_description='.urlencode($search_description);
-if ($search_task_ref_parent != '') 		$param .= '&search_task_ref_parent='.urlencode($search_task_ref_parent);
-if ($search_task_progress != '') 			$param .= '&search_task_progress='.urlencode($search_task_progress);
-if ($search_societe != '') 		$param .= '&search_societe='.urlencode($search_societe);
-if ($search_projectstatus != '') $param .= '&search_projectstatus='.urlencode($search_projectstatus);
-if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all', 'none'))) 	$param .= '&search_opp_status='.urlencode($search_opp_status);
-if ($search_public != '') 		$param .= '&search_public='.urlencode($search_public);
-if ($search_project_user != '')   $param .= '&search_project_user='.urlencode($search_project_user);
-if ($search_task_user > 0)    	$param .= '&search_task_user='.urlencode($search_task_user);
-if ($optioncss != '')           $param .= '&optioncss='.urlencode($optioncss);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($search_sday) {
+	$param .= '&search_sday='.urlencode($search_sday);
+}
+if ($search_smonth) {
+	$param .= '&search_smonth='.urlencode($search_smonth);
+}
+if ($search_syear) {
+	$param .= '&search_syear='.urlencode($search_syear);
+}
+if ($search_eday) {
+	$param .= '&search_eday='.urlencode($search_eday);
+}
+if ($search_emonth) {
+	$param .= '&search_emonth='.urlencode($search_emonth);
+}
+if ($search_eyear) {
+	$param .= '&search_eyear='.urlencode($search_eyear);
+}
+if ($socid) {
+	$param .= '&socid='.urlencode($socid);
+}
+if ($search_all != '') {
+	$param .= '&search_all='.urlencode($search_all);
+}
+if ($search_project_ref != '') {
+	$param .= '&search_project_ref='.urlencode($search_project_ref);
+}
+if ($search_project_title != '') {
+	$param .= '&search_project_title='.urlencode($search_project_title);
+}
+if ($search_task_ref != '') {
+	$param .= '&search_task_ref='.urlencode($search_ref);
+}
+if ($search_task_label != '') {
+	$param .= '&search_task_label='.urlencode($search_label);
+}
+if ($search_task_description != '') {
+	$param .= '&search_task_description='.urlencode($search_description);
+}
+if ($search_task_ref_parent != '') {
+	$param .= '&search_task_ref_parent='.urlencode($search_task_ref_parent);
+}
+if ($search_task_progress != '') {
+	$param .= '&search_task_progress='.urlencode($search_task_progress);
+}
+if ($search_societe != '') {
+	$param .= '&search_societe='.urlencode($search_societe);
+}
+if ($search_projectstatus != '') {
+	$param .= '&search_projectstatus='.urlencode($search_projectstatus);
+}
+if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all', 'none'))) {
+	$param .= '&search_opp_status='.urlencode($search_opp_status);
+}
+if ($search_public != '') {
+	$param .= '&search_public='.urlencode($search_public);
+}
+if ($search_project_user != '') {
+	$param .= '&search_project_user='.urlencode($search_project_user);
+}
+if ($search_task_user > 0) {
+	$param .= '&search_task_user='.urlencode($search_task_user);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -411,14 +533,20 @@ $arrayofmassactions = array(
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($user->rights->societe->supprimer) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if (in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = dolGetButtonTitle($langs->trans('NewTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create', '', $user->rights->projet->creer);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -429,10 +557,14 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 // Show description of content
 $texthelp = '';
-if ($search_task_user == $user->id) $texthelp .= $langs->trans("MyTasksDesc");
-else {
-	if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("TasksOnProjectsDesc");
-	else $texthelp .= $langs->trans("TasksOnProjectsPublicDesc");
+if ($search_task_user == $user->id) {
+	$texthelp .= $langs->trans("MyTasksDesc");
+} else {
+	if ($user->rights->projet->all->lire && !$socid) {
+		$texthelp .= $langs->trans("TasksOnProjectsDesc");
+	} else {
+		$texthelp .= $langs->trans("TasksOnProjectsPublicDesc");
+	}
 }
 
 print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'projecttask', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -443,17 +575,17 @@ $objecttmp = new Task($db);
 $trackid = 'tas'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($search_all)
-{
-	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
 $morehtmlfilter = '';
 
 // Filter on categories
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
-{
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('ProjectCategories').': ';
@@ -465,7 +597,9 @@ if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('ProjectsWithThisUserAsContact').' ';
 $includeonly = '';
-if (empty($user->rights->user->user->lire)) $includeonly = array($user->id);
+if (empty($user->rights->user->user->lire)) {
+	$includeonly = array($user->id);
+}
 $moreforfilter .= $form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
@@ -473,12 +607,13 @@ $moreforfilter .= '</div>';
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('TasksWithThisUserAsContact').': ';
 $includeonly = '';
-if (empty($user->rights->user->user->lire)) $includeonly = array($user->id);
+if (empty($user->rights->user->user->lire)) {
+	$includeonly = array($user->id);
+}
 $moreforfilter .= $form->select_dolusers($search_task_user, 'search_task_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
-if (!empty($moreforfilter))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	$parameters = array();
@@ -487,109 +622,116 @@ if (!empty($moreforfilter))
 	print '</div>';
 }
 
-if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+if ($massactionbutton) {
+	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+}
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
-if (!empty($arrayfields['t.fk_task_parent']['checked']))
-{
+if (!empty($arrayfields['t.fk_task_parent']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_task_ref_parent" value="'.dol_escape_htmltag($search_task_ref_parent).'" size="4">';
 	print '</td>';
 }
-if (!empty($arrayfields['t.ref']['checked']))
-{
+if (!empty($arrayfields['t.ref']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'" size="4">';
 	print '</td>';
 }
-if (!empty($arrayfields['t.label']['checked']))
-{
+if (!empty($arrayfields['t.label']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'" size="8">';
 	print '</td>';
 }
 // Task Description
-if (!empty($arrayfields['t.description']['checked']))
-{
+if (!empty($arrayfields['t.description']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_task_description" value="'.dol_escape_htmltag($search_task_description).'" size="8">';
 	print '</td>';
 }
 // Start date
-if (!empty($arrayfields['t.dateo']['checked']))
-{
+if (!empty($arrayfields['t.dateo']['checked'])) {
 	print '<td class="liste_titre center minwidth150">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_sday" value="'.$search_sday.'">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat" type="text" size="1" maxlength="2" name="search_sday" value="'.$search_sday.'">';
+	}
 	print '<input class="flat" type="text" size="1" maxlength="2" name="search_smonth" value="'.$search_smonth.'">';
 	$formother->select_year($search_syear ? $search_syear : -1, 'search_syear', 1, 20, 5);
 	print '</td>';
 }
 // End date
-if (!empty($arrayfields['t.datee']['checked']))
-{
+if (!empty($arrayfields['t.datee']['checked'])) {
 	print '<td class="liste_titre center minwidth150">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="search_eday" value="'.$search_eday.'">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat" type="text" size="1" maxlength="2" name="search_eday" value="'.$search_eday.'">';
+	}
 	print '<input class="flat" type="text" size="1" maxlength="2" name="search_emonth" value="'.$search_emonth.'">';
 	$formother->select_year($search_eyear ? $search_eyear : -1, 'search_eyear', 1, 20, 5);
 	print '</td>';
 }
-if (!empty($arrayfields['p.ref']['checked']))
-{
+if (!empty($arrayfields['p.ref']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_project_ref" value="'.$search_project_ref.'" size="4">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.title']['checked']))
-{
+if (!empty($arrayfields['p.title']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_project_title" value="'.$search_project_title.'" size="6">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.nom']['checked']))
-{
+if (!empty($arrayfields['s.nom']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_societe" value="'.dol_escape_htmltag($search_societe).'" size="4">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.fk_statut']['checked']))
-{
+if (!empty($arrayfields['p.fk_statut']['checked'])) {
 	print '<td class="liste_titre center">';
 	$arrayofstatus = array();
-	foreach ($projectstatic->statuts_short as $key => $val) $arrayofstatus[$key] = $langs->trans($val);
+	foreach ($projectstatic->statuts_short as $key => $val) {
+		$arrayofstatus[$key] = $langs->trans($val);
+	}
 	$arrayofstatus['99'] = $langs->trans("NotClosed").' ('.$langs->trans('Draft').'+'.$langs->trans('Opened').')';
 	print $form->selectarray('search_projectstatus', $arrayofstatus, $search_projectstatus, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
 	print '</td>';
 }
-if (!empty($arrayfields['t.planned_workload']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['t.duration_effective']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['t.progress_calculated']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['t.progress']['checked']))
-{
+if (!empty($arrayfields['t.planned_workload']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['t.duration_effective']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['t.progress_calculated']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['t.progress']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<input type="text" class="flat" name="search_task_progress" value="'.$search_task_progress.'" size="4">';
 	print '</td>';
 }
 
-if (!empty($arrayfields['t.progress_summary']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['t.tobill']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['t.billed']['checked'])) print '<td class="liste_titre"></td>';
+if (!empty($arrayfields['t.progress_summary']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['t.tobill']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+if (!empty($arrayfields['t.billed']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (!empty($arrayfields['t.datec']['checked']))
-{
+if (!empty($arrayfields['t.datec']['checked'])) {
 	// Date creation
 	print '<td class="liste_titre">';
 	print '</td>';
 }
-if (!empty($arrayfields['t.tms']['checked']))
-{
+if (!empty($arrayfields['t.tms']['checked'])) {
 	// Date modification
 	print '<td class="liste_titre">';
 	print '</td>';
@@ -602,44 +744,85 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['t.fk_task_parent']['checked']))        print_liste_field_titre($arrayfields['t.fk_task_parent']['label'], $_SERVER["PHP_SELF"], "t.fk_task_parent", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.ref']['checked']))           print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.label']['checked']))         print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER["PHP_SELF"], "t.label", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.description']['checked']))   print_liste_field_titre($arrayfields['t.description']['label'], $_SERVER["PHP_SELF"], "t.description", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.dateo']['checked']))         print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "t.dateo", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.datee']['checked']))         print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['p.ref']['checked']))           print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['p.title']['checked']))         print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['p.fk_statut']['checked']))     print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.planned_workload']['checked']))      print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "t.planned_workload", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.duration_effective']['checked']))    print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "t.duration_effective", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.progress_calculated']['checked']))   print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', '', '', 'center ');
-if (!empty($arrayfields['t.progress']['checked']))      print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.progress_summary']['checked']))      print_liste_field_titre($arrayfields['t.progress_summary']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.tobill']['checked']))        print_liste_field_titre($arrayfields['t.tobill']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.billed']['checked']))        print_liste_field_titre($arrayfields['t.billed']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.fk_task_parent']['checked'])) {
+	print_liste_field_titre($arrayfields['t.fk_task_parent']['label'], $_SERVER["PHP_SELF"], "t.fk_task_parent", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.label']['checked'])) {
+	print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER["PHP_SELF"], "t.label", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.description']['checked'])) {
+	print_liste_field_titre($arrayfields['t.description']['label'], $_SERVER["PHP_SELF"], "t.description", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.dateo']['checked'])) {
+	print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "t.dateo", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.datee']['checked'])) {
+	print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.title']['checked'])) {
+	print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.fk_statut']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.planned_workload']['checked'])) {
+	print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "t.planned_workload", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.duration_effective']['checked'])) {
+	print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "t.duration_effective", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.progress_calculated']['checked'])) {
+	print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', '', '', 'center ');
+}
+if (!empty($arrayfields['t.progress']['checked'])) {
+	print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.progress_summary']['checked'])) {
+	print_liste_field_titre($arrayfields['t.progress_summary']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.tobill']['checked'])) {
+	print_liste_field_titre($arrayfields['t.tobill']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.billed']['checked'])) {
+	print_liste_field_titre($arrayfields['t.billed']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (!empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (!empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER["PHP_SELF"], "t.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+if (!empty($arrayfields['t.datec']['checked'])) {
+	print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['t.tms']['checked'])) {
+	print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER["PHP_SELF"], "t.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
 
 
 $plannedworkloadoutputformat = 'allhourmin';
 $timespentoutputformat = 'allhourmin';
-if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
+if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) {
+	$plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+}
+if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) {
+	$timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
+}
 
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
 	$object->id = $obj->id;
@@ -663,8 +846,7 @@ while ($i < min($num, $limit))
 	$projectstatic->datee = $db->jdate($obj->projectdatee);
 
 	$userAccess = $projectstatic->restrictedProjectArea($user); // why this ?
-	if ($userAccess >= 0)
-	{
+	if ($userAccess >= 0) {
 		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 
 		// Ref Parent
@@ -677,77 +859,89 @@ while ($i < min($num, $limit))
 					setEventMessage($object_parent->error, 'errors');
 				} else {
 					print $object_parent->getNomUrl(1, 'withproject');
-					if ($object_parent->hasDelay())
+					if ($object_parent->hasDelay()) {
 						print img_warning("Late");
+					}
 				}
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Ref
-		if (!empty($arrayfields['t.ref']['checked']))
-		{
+		if (!empty($arrayfields['t.ref']['checked'])) {
 			print '<td class="nowraponall">';
 			print $object->getNomUrl(1, 'withproject');
-			if ($object->hasDelay()) print img_warning("Late");
+			if ($object->hasDelay()) {
+				print img_warning("Late");
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Label
-		if (!empty($arrayfields['t.label']['checked']))
-		{
+		if (!empty($arrayfields['t.label']['checked'])) {
 			print '<td>';
 			print $object->label;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Description
-		if (!empty($arrayfields['t.description']['checked']))
-		{
+		if (!empty($arrayfields['t.description']['checked'])) {
 			print '<td>';
 			print $object->description;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Date start
-		if (!empty($arrayfields['t.dateo']['checked']))
-		{
+		if (!empty($arrayfields['t.dateo']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_start), 'day');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Date end
-		if (!empty($arrayfields['t.datee']['checked']))
-		{
+		if (!empty($arrayfields['t.datee']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_end), 'day');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Project ref
-		if (!empty($arrayfields['p.ref']['checked']))
-		{
+		if (!empty($arrayfields['p.ref']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax150">';
 			print $projectstatic->getNomUrl(1, 'task');
-			if ($projectstatic->hasDelay()) print img_warning("Late");
+			if ($projectstatic->hasDelay()) {
+				print img_warning("Late");
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Project title
-		if (!empty($arrayfields['p.title']['checked']))
-		{
+		if (!empty($arrayfields['p.title']['checked'])) {
 			print '<td>';
 			print dol_trunc($obj->projecttitle, 80);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Third party
-		if (!empty($arrayfields['s.nom']['checked']))
-		{
+		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td>';
-			if ($obj->socid)
-			{
+			if ($obj->socid) {
 				$socstatic->id = $obj->socid;
 				$socstatic->name = $obj->name;
 				print $socstatic->getNomUrl(1);
@@ -755,100 +949,131 @@ while ($i < min($num, $limit))
 				print '&nbsp;';
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Project status
-		if (!empty($arrayfields['p.fk_statut']['checked']))
-		{
+		if (!empty($arrayfields['p.fk_statut']['checked'])) {
 			print '<td class="center">';
 			print $projectstatic->getLibStatut(1);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Planned workload
-		if (!empty($arrayfields['t.planned_workload']['checked']))
-		{
+		if (!empty($arrayfields['t.planned_workload']['checked'])) {
 			print '<td class="center">';
 			$fullhour = convertSecondToTime($obj->planned_workload, $plannedworkloadoutputformat);
 			$workingdelay = convertSecondToTime($obj->planned_workload, 'all', 86400, 7); // TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
-			if ($obj->planned_workload != '')
-			{
+			if ($obj->planned_workload != '') {
 				print $fullhour;
 				// TODO Add delay taking account of working hours per day and working day per week
 				//if ($workingdelay != $fullhour) print '<br>('.$workingdelay.')';
 			}
 			//else print '--:--';
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.planned_workload';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 't.planned_workload';
+			}
 			$totalarray['val']['t.planned_workload'] += $obj->planned_workload;
-			if (!$i) $totalarray['totalplannedworkloadfield'] = $totalarray['nbfield'];
+			if (!$i) {
+				$totalarray['totalplannedworkloadfield'] = $totalarray['nbfield'];
+			}
 			$totalarray['totalplannedworkload'] += $obj->planned_workload;
 		}
 		// Time spent
-		if (!empty($arrayfields['t.duration_effective']['checked']))
-		{
+		if (!empty($arrayfields['t.duration_effective']['checked'])) {
 			$showlineingray = 0; $showproject = 1;
 			print '<td class="center">';
-			if ($showlineingray) print '<i>';
-			else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.($showproject ? '' : '&withproject=1').'">';
-			if ($obj->duration_effective) print convertSecondToTime($obj->duration_effective, $timespentoutputformat);
-			else print '--:--';
-			if ($showlineingray) print '</i>';
-			else print '</a>';
+			if ($showlineingray) {
+				print '<i>';
+			} else {
+				print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.($showproject ? '' : '&withproject=1').'">';
+			}
+			if ($obj->duration_effective) {
+				print convertSecondToTime($obj->duration_effective, $timespentoutputformat);
+			} else {
+				print '--:--';
+			}
+			if ($showlineingray) {
+				print '</i>';
+			} else {
+				print '</a>';
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.duration_effective';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 't.duration_effective';
+			}
 			$totalarray['val']['t.duration_effective'] += $obj->duration_effective;
-			if (!$i) $totalarray['totaldurationeffectivefield'] = $totalarray['nbfield'];
+			if (!$i) {
+				$totalarray['totaldurationeffectivefield'] = $totalarray['nbfield'];
+			}
 			$totalarray['totaldurationeffective'] += $obj->duration_effective;
 		}
 		// Calculated progress
-		if (!empty($arrayfields['t.progress_calculated']['checked']))
-		{
+		if (!empty($arrayfields['t.progress_calculated']['checked'])) {
 			print '<td class="center">';
-			if ($obj->planned_workload || $obj->duration_effective)
-			{
-				if ($obj->planned_workload) print round(100 * $obj->duration_effective / $obj->planned_workload, 2).' %';
-				else print $form->textwithpicto('', $langs->trans('WorkloadNotDefined'), 1, 'help');
+			if ($obj->planned_workload || $obj->duration_effective) {
+				if ($obj->planned_workload) {
+					print round(100 * $obj->duration_effective / $obj->planned_workload, 2).' %';
+				} else {
+					print $form->textwithpicto('', $langs->trans('WorkloadNotDefined'), 1, 'help');
+				}
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['totalprogress_calculatedfield'] = $totalarray['nbfield'];
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['totalprogress_calculatedfield'] = $totalarray['nbfield'];
+			}
 		}
 		// Declared progress
-		if (!empty($arrayfields['t.progress']['checked']))
-		{
+		if (!empty($arrayfields['t.progress']['checked'])) {
 			print '<td class="center">';
-			if ($obj->progress != '')
-			{
+			if ($obj->progress != '') {
 				print getTaskProgressBadge($object);
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.progress';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 't.progress';
+			}
 			$totalarray['val']['t.progress'] += ($obj->planned_workload * $obj->progress / 100);
-			if (!$i) $totalarray['totalprogress_declaredfield'] = $totalarray['nbfield'];
+			if (!$i) {
+				$totalarray['totalprogress_declaredfield'] = $totalarray['nbfield'];
+			}
 			$totalarray['totaldurationdeclared'] += $obj->planned_workload * $obj->progress / 100;
 		}
 		// Progress summary
-		if (!empty($arrayfields['t.progress_summary']['checked']))
-		{
+		if (!empty($arrayfields['t.progress_summary']['checked'])) {
 			print '<td class="center">';
 			if ($obj->progress != '' && $obj->duration_effective) {
 				print getTaskProgressView($object, false, false);
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['totalprogress_summary'] = $totalarray['nbfield'];
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['totalprogress_summary'] = $totalarray['nbfield'];
+			}
 		}
 		// Time not billed
-		if (!empty($arrayfields['t.tobill']['checked']))
-		{
+		if (!empty($arrayfields['t.tobill']['checked'])) {
 			print '<td class="center">';
-			if ($obj->usage_bill_time)
-			{
+			if ($obj->usage_bill_time) {
 				print convertSecondToTime($obj->tobill, 'allhourmin');
 				$totalarray['val']['t.tobill'] += $obj->tobill;
 				$totalarray['totaltobill'] += $obj->tobill;
@@ -856,16 +1081,20 @@ while ($i < min($num, $limit))
 				print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.tobill';
-			if (!$i) $totalarray['totaltobillfield'] = $totalarray['nbfield'];
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 't.tobill';
+			}
+			if (!$i) {
+				$totalarray['totaltobillfield'] = $totalarray['nbfield'];
+			}
 		}
 		// Time billed
-		if (!empty($arrayfields['t.billed']['checked']))
-		{
+		if (!empty($arrayfields['t.billed']['checked'])) {
 			print '<td class="center">';
-			if ($obj->usage_bill_time)
-			{
+			if ($obj->usage_bill_time) {
 				print convertSecondToTime($obj->billed, 'allhourmin');
 				$totalarray['val']['t.billed'] += $obj->billed;
 				$totalarray['totalbilled'] += $obj->billed;
@@ -873,9 +1102,15 @@ while ($i < min($num, $limit))
 				print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.billed';
-			if (!$i) $totalarray['totalbilledfield'] = $totalarray['nbfield'];
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 't.billed';
+			}
+			if (!$i) {
+				$totalarray['totalbilledfield'] = $totalarray['nbfield'];
+			}
 		}
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
@@ -884,37 +1119,42 @@ while ($i < min($num, $limit))
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
-		if (!empty($arrayfields['t.datec']['checked']))
-		{
+		if (!empty($arrayfields['t.datec']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Date modification
-		if (!empty($arrayfields['t.tms']['checked']))
-		{
+		if (!empty($arrayfields['t.tms']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Status
 		/*if (! empty($arrayfields['p.fk_statut']['checked']))
 		{
-    		$projectstatic->statut = $obj->fk_statut;
-    		print '<td class="right">'.$projectstatic->getLibStatut(5).'</td>';
+			$projectstatic->statut = $obj->fk_statut;
+			print '<td class="right">'.$projectstatic->getLibStatut(5).'</td>';
 		}*/
 		// Action column
 		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		{
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			$selected = 0;
-			if (in_array($obj->id, $arrayofselected)) $selected = 1;
+			if (in_array($obj->id, $arrayofselected)) {
+				$selected = 1;
+			}
 			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		print "</tr>\n";
 	}
@@ -923,24 +1163,32 @@ while ($i < min($num, $limit))
 }
 // Show total line
 if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['totalplannedworkloadfield']) || isset($totalarray['totalprogress_calculatedfield'])
-	|| isset($totalarray['totaltobill']) || isset($totalarray['totalbilled']))
-{
+	|| isset($totalarray['totaltobill']) || isset($totalarray['totalbilled'])) {
 	print '<tr class="liste_total">';
 	$i = 0;
-	while ($i < $totalarray['nbfield'])
-	{
+	while ($i < $totalarray['nbfield']) {
 		$i++;
-		if ($i == 1)
-		{
-			if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
-			else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-		} elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).'</td>';
-		elseif ($totalarray['totaldurationeffectivefield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totaldurationeffective'], $timespentoutputformat).'</td>';
-		elseif ($totalarray['totalprogress_calculatedfield'] == $i) print '<td class="center">'.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
-		elseif ($totalarray['totalprogress_declaredfield'] == $i) print '<td class="center">'.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationdeclared'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
-		elseif ($totalarray['totaltobillfield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totaltobill'], $plannedworkloadoutputformat).'</td>';
-		elseif ($totalarray['totalbilledfield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totalbilled'], $plannedworkloadoutputformat).'</td>';
-		else print '<td></td>';
+		if ($i == 1) {
+			if ($num < $limit && empty($offset)) {
+				print '<td class="left">'.$langs->trans("Total").'</td>';
+			} else {
+				print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
+			}
+		} elseif ($totalarray['totalplannedworkloadfield'] == $i) {
+			print '<td class="center">'.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).'</td>';
+		} elseif ($totalarray['totaldurationeffectivefield'] == $i) {
+			print '<td class="center">'.convertSecondToTime($totalarray['totaldurationeffective'], $timespentoutputformat).'</td>';
+		} elseif ($totalarray['totalprogress_calculatedfield'] == $i) {
+			print '<td class="center">'.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
+		} elseif ($totalarray['totalprogress_declaredfield'] == $i) {
+			print '<td class="center">'.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationdeclared'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
+		} elseif ($totalarray['totaltobillfield'] == $i) {
+			print '<td class="center">'.convertSecondToTime($totalarray['totaltobill'], $plannedworkloadoutputformat).'</td>';
+		} elseif ($totalarray['totalbilledfield'] == $i) {
+			print '<td class="center">'.convertSecondToTime($totalarray['totalbilled'], $plannedworkloadoutputformat).'</td>';
+		} else {
+			print '<td></td>';
+		}
 	}
 	print '</tr>';
 }
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index af5709c7322..e23b5e3d70b 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -41,20 +41,26 @@ $project_ref = GETPOST('project_ref', 'alpha');
 // Security check
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 //$result = restrictedArea($user, 'projet', $id, '', 'task'); // TODO ameliorer la verification
 
 $object = new Task($db);
 $projectstatic = new Project($db);
 
-if ($id > 0 || !empty($ref))
-{
-	if ($object->fetch($id, $ref) > 0)
-	{
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref) > 0) {
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+			$object->fetchComments();
+		}
 		$projectstatic->fetch($object->fk_project);
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) $projectstatic->fetchComments();
-		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+			$projectstatic->fetchComments();
+		}
+		if (!empty($projectstatic->socid)) {
+			$projectstatic->fetch_thirdparty();
+		}
 
 		$object->project = clone $projectstatic;
 	} else {
@@ -64,13 +70,10 @@ if ($id > 0 || !empty($ref))
 
 
 // Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
-if (!empty($project_ref) && !empty($withproject))
-{
-	if ($projectstatic->fetch(0, $project_ref) > 0)
-	{
+if (!empty($project_ref) && !empty($withproject)) {
+	if ($projectstatic->fetch(0, $project_ref) > 0) {
 		$tasksarray = $object->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
-		if (count($tasksarray) > 0)
-		{
+		if (count($tasksarray) > 0) {
 			$id = $tasksarray[0]->id;
 			$object->fetch($id);
 		} else {
@@ -100,12 +103,10 @@ $userstatic = new User($db);
 
 $now = dol_now();
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
 
-	if (!empty($withproject))
-	{
+	if (!empty($withproject)) {
 		// Tabs for project
 		$tab = 'tasks';
 		$head = project_prepare_head($projectstatic);
@@ -120,15 +121,13 @@ if ($object->id > 0)
 		// Title
 		$morehtmlref .= $projectstatic->title;
 		// Thirdparty
-		if ($projectstatic->thirdparty->id > 0)
-		{
+		if ($projectstatic->thirdparty->id > 0) {
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
 		}
 		$morehtmlref .= '</div>';
 
 		// Define a complementary filter for search of next/prev ref.
-		if (!$user->rights->projet->all->lire)
-		{
+		if (!$user->rights->projet->all->lire) {
 			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 			$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 		}
@@ -146,22 +145,19 @@ if ($object->id > 0)
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS))
-		{
+		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowTasks");
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-		{
+		if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -171,8 +167,11 @@ if ($object->id > 0)
 
 		// Visibility
 		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-		if ($projectstatic->public) print $langs->trans('SharedProject');
-		else print $langs->trans('PrivateProject');
+		if ($projectstatic->public) {
+			print $langs->trans('SharedProject');
+		} else {
+			print $langs->trans('PrivateProject');
+		}
 		print '</td></tr>';
 
 		// Date start - end
@@ -182,12 +181,16 @@ if ($object->id > 0)
 		$end = dol_print_date($projectstatic->date_end, 'day');
 		print ' - ';
 		print ($end ? $end : '?');
-		if ($projectstatic->hasDelay()) print img_warning("Late");
+		if ($projectstatic->hasDelay()) {
+			print img_warning("Late");
+		}
 		print '</td></tr>';
 
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-		if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+		if (strcmp($projectstatic->budget_amount, '')) {
+			print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+		}
 		print '</td></tr>';
 
 		// Other attributes
@@ -235,17 +238,17 @@ if ($object->id > 0)
 	$param = (GETPOST('withproject') ? '&withproject=1' : '');
 	$linkback = GETPOST('withproject') ? '<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>' : '';
 
-	if (!GETPOST('withproject') || empty($projectstatic->id))
-	{
+	if (!GETPOST('withproject') || empty($projectstatic->id)) {
 		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 		$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-	} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+	} else {
+		$object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+	}
 
 	$morehtmlref = '';
 
 	// Project
-	if (empty($withproject))
-	{
+	if (empty($withproject)) {
 		$morehtmlref .= '<div class="refidno">';
 		$morehtmlref .= $langs->trans("Project").': ';
 		$morehtmlref .= $projectstatic->getNomUrl(1);
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index 571560518ab..81c05fde59d 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -28,8 +28,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/taskstats.class.php';
 
 // Security check
-if (!$user->rights->projet->lire)
+if (!$user->rights->projet->lire) {
 	accessforbidden();
+}
 
 
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
@@ -38,8 +39,7 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -73,9 +73,15 @@ dol_mkdir($dir);
 
 
 $stats_tasks = new TaskStats($db);
-if (!empty($userid) && $userid != -1) $stats_tasks->userid = $userid;
-if (!empty($socid) && $socid != -1) $stats_tasks->socid = $socid;
-if (!empty($year)) $stats_tasks->year = $year;
+if (!empty($userid) && $userid != -1) {
+	$stats_tasks->userid = $userid;
+}
+if (!empty($socid) && $socid != -1) {
+	$stats_tasks->socid = $socid;
+}
+if (!empty($year)) {
+	$stats_tasks->year = $year;
+}
 
 
 
@@ -89,12 +95,10 @@ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=taskstats&amp;file=tasknbpr
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -116,12 +120,16 @@ if (!$mesg)
 $stats_tasks->year = 0;
 $data_all_year = $stats_tasks->getAllByYear();
 
-if (!empty($year)) $stats_tasks->year = $year;
+if (!empty($year)) {
+	$stats_tasks->year = $year;
+}
 $arrayyears = array();
 foreach ($data_all_year as $val) {
 	$arrayyears[$val['year']] = $val['year'];
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 
 $h = 0;
@@ -154,8 +162,12 @@ print $form->select_dolusers($userid, 'userid', 1, array(),0,$includeuserlist);
 print '</td></tr>';*/
 // Year
 print '<tr><td>'.$langs->trans("Year").'</td><td>';
-if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!in_array($year, $arrayyears)) {
+	$arrayyears[$year] = $year;
+}
+if (!in_array($nowyear, $arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
@@ -173,11 +185,9 @@ print '<td class="right">'.$langs->trans("NbOfTasks").'</td>';
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data_all_year as $val)
-{
+foreach ($data_all_year as $val) {
 	$year = $val['year'];
-	while ($year && $oldyear > $year + 1)
-	{	// If we have empty year
+	while ($year && $oldyear > $year + 1) {	// If we have empty year
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
@@ -199,7 +209,9 @@ print '</div>';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 $stringtoshow .= '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; } else {
+if ($mesg) {
+	print $mesg;
+} else {
 	$stringtoshow .= $px1->show();
 	$stringtoshow .= "<br>\n";
 }
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index cd10b43f0c0..7895838e18e 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -49,7 +49,9 @@ $planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('p
 // Security check
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcard', 'globalcard'));
@@ -63,34 +65,34 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $parameters = array('id'=>$id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 /*
  * Actions
  */
 
-if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
-{
+if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer) {
 	$error = 0;
 
-	if (empty($taskref))
-	{
+	if (empty($taskref)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 	}
-	if (empty($_POST["label"]))
-	{
+	if (empty($_POST["label"])) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		$object->fetch($id, $ref);
 		$object->oldcopy = clone $object;
 
 		$tmparray = explode('_', $_POST['task_parent']);
 		$task_parent = $tmparray[1];
-		if (empty($task_parent)) $task_parent = 0; // If task_parent is ''
+		if (empty($task_parent)) {
+			$task_parent = 0; // If task_parent is ''
+		}
 
 		$object->ref = $taskref ? $taskref : GETPOST("ref", 'alpha', 2);
 		$object->label = GETPOST("label", "alphanohtml");
@@ -103,13 +105,13 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $object->update($user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -118,15 +120,12 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->supprimer)
-{
-	if ($object->fetch($id, $ref) >= 0)
-	{
+if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->supprimer) {
+	if ($object->fetch($id, $ref) >= 0) {
 		$result = $projectstatic->fetch($object->fk_project);
 		$projectstatic->fetch_thirdparty();
 
-		if ($object->delete($user) > 0)
-		{
+		if ($object->delete($user) > 0) {
 			header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject ? '&withproject=1' : ''));
 			exit;
 		} else {
@@ -137,13 +136,10 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
 }
 
 // Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
-if (!empty($project_ref) && !empty($withproject))
-{
-	if ($projectstatic->fetch('', $project_ref) > 0)
-	{
+if (!empty($project_ref) && !empty($withproject)) {
+	if ($projectstatic->fetch('', $project_ref) > 0) {
 		$tasksarray = $object->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
-		if (count($tasksarray) > 0)
-		{
+		if (count($tasksarray) > 0) {
 			$id = $tasksarray[0]->id;
 		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
@@ -152,41 +148,41 @@ if (!empty($project_ref) && !empty($withproject))
 }
 
 // Build doc
-if ($action == 'builddoc' && $user->rights->projet->creer)
-{
+if ($action == 'builddoc' && $user->rights->projet->creer) {
 	$object->fetch($id, $ref);
 
 	// Save last template used to generate document
-	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model', 'alpha'));
+	if (GETPOST('model')) {
+		$object->setDocModel($user, GETPOST('model', 'alpha'));
+	}
 
 	$outputlangs = $langs;
-	if (GETPOST('lang_id', 'aZ09'))
-	{
+	if (GETPOST('lang_id', 'aZ09')) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
 	}
 	$result = $object->generateDocument($object->model_pdf, $outputlangs);
-	if ($result <= 0)
-	{
+	if ($result <= 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = '';
 	}
 }
 
 // Delete file in doc form
-if ($action == 'remove_file' && $user->rights->projet->creer)
-{
+if ($action == 'remove_file' && $user->rights->projet->creer) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	if ($object->fetch($id, $ref) >= 0)
-	{
+	if ($object->fetch($id, $ref) >= 0) {
 		$langs->load("other");
 		$upload_dir = $conf->projet->dir_output;
 		$file = $upload_dir.'/'.dol_sanitizeFileName(GETPOST('file'));
 
 		$ret = dol_delete_file($file);
-		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		if ($ret) {
+			setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		}
 	}
 }
 
@@ -201,23 +197,26 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
 
-if ($id > 0 || !empty($ref))
-{
-	if ($object->fetch($id, $ref) > 0)
-	{
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref) > 0) {
 		$res = $object->fetch_optionals();
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+			$object->fetchComments();
+		}
 
 		$result = $projectstatic->fetch($object->fk_project);
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) $projectstatic->fetchComments();
-		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+			$projectstatic->fetchComments();
+		}
+		if (!empty($projectstatic->socid)) {
+			$projectstatic->fetch_thirdparty();
+		}
 
 		$object->project = clone $projectstatic;
 
 		//$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
 
-		if (!empty($withproject))
-		{
+		if (!empty($withproject)) {
 			// Tabs for project
 			$tab = 'tasks';
 			$head = project_prepare_head($projectstatic);
@@ -233,15 +232,13 @@ if ($id > 0 || !empty($ref))
 			// Title
 			$morehtmlref .= $projectstatic->title;
 			// Thirdparty
-			if ($projectstatic->thirdparty->id > 0)
-			{
+			if ($projectstatic->thirdparty->id > 0) {
 				$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
 			}
 			$morehtmlref .= '</div>';
 
 			// Define a complementary filter for search of next/prev ref.
-			if (!$user->rights->projet->all->lire)
-			{
+			if (!$user->rights->projet->all->lire) {
 				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 				$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 			}
@@ -259,22 +256,19 @@ if ($id > 0 || !empty($ref))
 			print $langs->trans("Usage");
 			print '</td>';
 			print '<td>';
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-			{
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("ProjectFollowOpportunity");
 				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 				print '<br>';
 			}
-			if (empty($conf->global->PROJECT_HIDE_TASKS))
-			{
+			if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("ProjectFollowTasks");
 				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 				print '<br>';
 			}
-			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-			{
+			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("ProjectBillTimeDescription");
 				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -284,8 +278,11 @@ if ($id > 0 || !empty($ref))
 
 			// Visibility
 			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-			if ($projectstatic->public) print $langs->trans('SharedProject');
-			else print $langs->trans('PrivateProject');
+			if ($projectstatic->public) {
+				print $langs->trans('SharedProject');
+			} else {
+				print $langs->trans('PrivateProject');
+			}
 			print '</td></tr>';
 
 			// Date start - end
@@ -295,12 +292,16 @@ if ($id > 0 || !empty($ref))
 			$end = dol_print_date($projectstatic->date_end, 'day');
 			print ' - ';
 			print ($end ? $end : '?');
-			if ($projectstatic->hasDelay()) print img_warning("Late");
+			if ($projectstatic->hasDelay()) {
+				print img_warning("Late");
+			}
 			print '</td></tr>';
 
 			// Budget
 			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-			if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			if (strcmp($projectstatic->budget_amount, '')) {
+				print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			}
 			print '</td></tr>';
 
 			// Other attributes
@@ -372,8 +373,7 @@ if ($id > 0 || !empty($ref))
 
 		$head = task_prepare_head($object);
 
-		if ($action == 'edit' && $user->rights->projet->creer)
-		{
+		if ($action == 'edit' && $user->rights->projet->creer) {
 			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="update">';
@@ -393,16 +393,18 @@ if ($id > 0 || !empty($ref))
 			print '<td><input class="minwidth500" name="label" value="'.$object->label.'"></td></tr>';
 
 			// Project
-			if (empty($withproject))
-			{
+			if (empty($withproject)) {
 				print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
 				print $projectstatic->getNomUrl(1);
 				print '</td></tr>';
 
 				// Third party
 				print '<td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-				if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
-				else print '&nbsp;';
+				if ($projectstatic->societe->id) {
+					print $projectstatic->societe->getNomUrl(1);
+				} else {
+					print '&nbsp;';
+				}
 				print '</td></tr>';
 			}
 
@@ -441,8 +443,7 @@ if ($id > 0 || !empty($ref))
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
-			if (empty($reshook))
-			{
+			if (empty($reshook)) {
 				print $object->showOptionals($extrafields, 'edit');
 			}
 
@@ -465,22 +466,21 @@ if ($id > 0 || !empty($ref))
 
 			print dol_get_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
-			if ($action == 'delete')
-			{
+			if ($action == 'delete') {
 				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&withproject='.$withproject, $langs->trans("DeleteATask"), $langs->trans("ConfirmDeleteATask"), "confirm_delete");
 			}
 
-			if (!GETPOST('withproject') || empty($projectstatic->id))
-			{
+			if (!GETPOST('withproject') || empty($projectstatic->id)) {
 				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 				$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-			} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+			} else {
+				$object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+			}
 
 			$morehtmlref = '';
 
 			// Project
-			if (empty($withproject))
-			{
+			if (empty($withproject)) {
 				$morehtmlref .= '<div class="refidno">';
 				$morehtmlref .= $langs->trans("Project").': ';
 				$morehtmlref .= $projectstatic->getNomUrl(1);
@@ -504,8 +504,7 @@ if ($id > 0 || !empty($ref))
 
 			// Task parent
 			print '<tr><td>'.$langs->trans("ChildOfTask").'</td><td>';
-			if ($object->fk_task_parent > 0)
-			{
+			if ($object->fk_task_parent > 0) {
 				$tasktmp = new Task($db);
 				$tasktmp->fetch($object->fk_task_parent);
 				print $tasktmp->getNomUrl(1);
@@ -519,13 +518,14 @@ if ($id > 0 || !empty($ref))
 			$end = dol_print_date($object->date_end, 'dayhour');
 			print ' - ';
 			print ($end ? $end : '?');
-			if ($object->hasDelay()) print img_warning("Late");
+			if ($object->hasDelay()) {
+				print img_warning("Late");
+			}
 			print '</td></tr>';
 
 			// Planned workload
 			print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">';
-			if ($object->planned_workload != '')
-			{
+			if ($object->planned_workload != '') {
 				print convertSecondToTime($object->planned_workload, 'allhourmin');
 			}
 			print '</td></tr>';
@@ -545,20 +545,23 @@ if ($id > 0 || !empty($ref))
 
 			// Progress declared
 			print '<tr><td class="titlefield">'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
-			if ($object->progress != '')
-			{
+			if ($object->progress != '') {
 				print $object->progress.' %';
 			}
 			print '</td></tr>';
 
 			// Progress calculated
 			print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td colspan="3">';
-			if ($object->planned_workload != '')
-			{
+			if ($object->planned_workload != '') {
 				$tmparray = $object->getSummaryOfTimeSpent();
-				if ($tmparray['total_duration'] > 0 && !empty($object->planned_workload)) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
-				else print '0 %';
-			} else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
+				if ($tmparray['total_duration'] > 0 && !empty($object->planned_workload)) {
+					print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
+				} else {
+					print '0 %';
+				}
+			} else {
+				print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
+			}
 			print '</td></tr>';
 
 			// Other attributes
@@ -578,32 +581,27 @@ if ($id > 0 || !empty($ref))
 		}
 
 
-		if ($action != 'edit')
-		{
+		if ($action != 'edit') {
 			/*
 			 * Actions
- 			 */
+			  */
 
 			print '<div class="tabsAction">';
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 			// modified by hook
-			if (empty($reshook))
-			{
+			if (empty($reshook)) {
 				// Modify
-				if ($user->rights->projet->creer)
-				{
+				if ($user->rights->projet->creer) {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit&amp;withproject='.$withproject.'">'.$langs->trans('Modify').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Modify').'</a>';
 				}
 
 				// Delete
-				if ($user->rights->projet->supprimer)
-				{
-					if (!$object->hasChildren() && !$object->hasTimeSpent())
-					{
+				if ($user->rights->projet->supprimer) {
+					if (!$object->hasChildren() && !$object->hasTimeSpent()) {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
 					} else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 5cca624d11f..d95fba9d48f 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -71,18 +71,26 @@ $search_valuebilled = GETPOST('search_valuebilled', 'int');
 // Security check
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;	  // For external user, no check is done on company because readability is managed by public status of project and assignement.
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }		// If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}		// If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 't.task_date,t.task_datehour,t.rowid';
-if (!$sortorder) $sortorder = 'DESC,DESC,DESC';
+if (!$sortfield) {
+	$sortfield = 't.task_date,t.task_datehour,t.rowid';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC,DESC';
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 //$object = new TaskTime($db);
@@ -99,18 +107,23 @@ $extrafields->fetch_name_optionals_label($object->table_element);
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_generateinvoice') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_generateinvoice') {
+	$massaction = '';
+}
 
 $parameters = array('socid'=>$socid, 'projectid'=>$projectid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 	$search_day = '';
 	$search_month = '';
 	$search_year = '';
@@ -131,32 +144,26 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$action = '';
 }
 
-if ($action == 'addtimespent' && $user->rights->projet->lire)
-{
+if ($action == 'addtimespent' && $user->rights->projet->lire) {
 	$error = 0;
 
 	$timespent_durationhour = GETPOST('timespent_durationhour', 'int');
 	$timespent_durationmin = GETPOST('timespent_durationmin', 'int');
-	if (empty($timespent_durationhour) && empty($timespent_durationmin))
-	{
+	if (empty($timespent_durationhour) && empty($timespent_durationmin)) {
 		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Duration")), null, 'errors');
 		$error++;
 	}
-	if (empty($_POST["userid"]))
-	{
+	if (empty($_POST["userid"])) {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorUserNotAssignedToTask'), null, 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
-		if ($id || $ref)
-		{
+	if (!$error) {
+		if ($id || $ref) {
 			$object->fetch($id, $ref);
 		} else {
-			if (!GETPOST('taskid', 'int') || GETPOST('taskid', 'int') < 0)
-			{
+			if (!GETPOST('taskid', 'int') || GETPOST('taskid', 'int') < 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), null, 'errors');
 				$action = 'createtime';
 				$error++;
@@ -165,22 +172,21 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$object->fetch_projet();
 
-			if (empty($object->project->statut))
-			{
+			if (empty($object->project->statut)) {
 				setEventMessages($langs->trans("ProjectMustBeValidatedFirst"), null, 'errors');
 				$action = 'createtime';
 				$error++;
 			} else {
 				$object->timespent_note = $_POST["timespent_note"];
-				if (GETPOST('progress', 'int') > 0) $object->progress = GETPOST('progress', 'int'); // If progress is -1 (not defined), we do not change value
+				if (GETPOST('progress', 'int') > 0) {
+					$object->progress = GETPOST('progress', 'int'); // If progress is -1 (not defined), we do not change value
+				}
 				$object->timespent_duration = $_POST["timespent_durationhour"] * 60 * 60; // We store duration in seconds
 				$object->timespent_duration += ($_POST["timespent_durationmin"] ? $_POST["timespent_durationmin"] : 0) * 60; // We store duration in seconds
-				if (GETPOST("timehour") != '' && GETPOST("timehour") >= 0)	// If hour was entered
-				{
+				if (GETPOST("timehour") != '' && GETPOST("timehour") >= 0) {	// If hour was entered
 					$object->timespent_date = dol_mktime(GETPOST("timehour"), GETPOST("timemin"), 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
 					$object->timespent_withhour = 1;
 				} else {
@@ -188,8 +194,7 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 				}
 				$object->timespent_fk_user = $_POST["userid"];
 				$result = $object->addTimeSpent($user);
-				if ($result >= 0)
-				{
+				if ($result >= 0) {
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 				} else {
 					setEventMessages($langs->trans($object->error), null, 'errors');
@@ -198,25 +203,24 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 			}
 		}
 	} else {
-		if (empty($id)) $action = 'createtime';
-		else $action = 'createtime';
+		if (empty($id)) {
+			$action = 'createtime';
+		} else {
+			$action = 'createtime';
+		}
 	}
 }
 
-if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $user->rights->projet->lire)
-{
+if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $user->rights->projet->lire) {
 	$error = 0;
 
-	if (!GETPOST("new_durationhour") && !GETPOST("new_durationmin"))
-	{
+	if (!GETPOST("new_durationhour") && !GETPOST("new_durationmin")) {
 		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Duration")), null, 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
-		if (GETPOST('taskid', 'int') != $id)		// GETPOST('taskid') is id of new task
-		{
+	if (!$error) {
+		if (GETPOST('taskid', 'int') != $id) {		// GETPOST('taskid') is id of new task
 			$id = GETPOST('taskid', 'int');
 
 			$object->fetchTimeSpent(GETPOST('lineid', 'int'));
@@ -228,8 +232,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			$object->timespent_old_duration = $_POST["old_duration"];
 			$object->timespent_duration = $_POST["new_durationhour"] * 60 * 60; // We store duration in seconds
 			$object->timespent_duration += ($_POST["new_durationmin"] ? $_POST["new_durationmin"] : 0) * 60; // We store duration in seconds
-			if (GETPOST("timelinehour") != '' && GETPOST("timelinehour") >= 0)	// If hour was entered
-			{
+			if (GETPOST("timelinehour") != '' && GETPOST("timelinehour") >= 0) {	// If hour was entered
 				$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 				$object->timespent_withhour = 1;
 			} else {
@@ -237,8 +240,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			}
 			$object->timespent_fk_user = $_POST["userid_line"];
 			$result = $object->addTimeSpent($user);
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			} else {
 				setEventMessages($langs->trans($object->error), null, 'errors');
@@ -253,8 +255,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			$object->timespent_old_duration = $_POST["old_duration"];
 			$object->timespent_duration = $_POST["new_durationhour"] * 60 * 60; // We store duration in seconds
 			$object->timespent_duration += ($_POST["new_durationmin"] ? $_POST["new_durationmin"] : 0) * 60; // We store duration in seconds
-			if (GETPOST("timelinehour") != '' && GETPOST("timelinehour") >= 0)	// If hour was entered
-			{
+			if (GETPOST("timelinehour") != '' && GETPOST("timelinehour") >= 0) {	// If hour was entered
 				$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 				$object->timespent_withhour = 1;
 			} else {
@@ -263,8 +264,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			$object->timespent_fk_user = $_POST["userid_line"];
 
 			$result = $object->updateTimeSpent($user);
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			} else {
 				setEventMessages($langs->trans($object->error), null, 'errors');
@@ -276,14 +276,12 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->lire)
-{
+if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->lire) {
 	$object->fetchTimeSpent(GETPOST('lineid', 'int'));
 	// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
 	$result = $object->delTimeSpent($user);
 
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		$langs->load("errors");
 		setEventMessages($langs->trans($object->error), null, 'errors');
 		$error++;
@@ -294,13 +292,10 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->l
 }
 
 // Retrieve First Task ID of Project if withprojet is on to allow project prev next to work
-if (!empty($project_ref) && !empty($withproject))
-{
-	if ($projectstatic->fetch(0, $project_ref) > 0)
-	{
+if (!empty($project_ref) && !empty($withproject)) {
+	if ($projectstatic->fetch(0, $project_ref) > 0) {
 		$tasksarray = $object->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
-		if (count($tasksarray) > 0)
-		{
+		if (count($tasksarray) > 0) {
 			$id = $tasksarray[0]->id;
 		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
@@ -311,27 +306,27 @@ if (!empty($project_ref) && !empty($withproject))
 
 // To show all time lines for project
 $projectidforalltimes = 0;
-if (GETPOST('projectid', 'int') > 0)
-{
+if (GETPOST('projectid', 'int') > 0) {
 	$projectidforalltimes = GETPOST('projectid', 'int');
 
 	$result = $projectstatic->fetch($projectidforalltimes);
-	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+	if (!empty($projectstatic->socid)) {
+		$projectstatic->fetch_thirdparty();
+	}
 	$res = $projectstatic->fetch_optionals();
-} elseif (GETPOST('project_ref', 'alpha'))
-{
+} elseif (GETPOST('project_ref', 'alpha')) {
 	$projectstatic->fetch(0, GETPOST('project_ref', 'alpha'));
 	$projectidforalltimes = $projectstatic->id;
 	$withproject = 1;
-} elseif ($id > 0)
-{
+} elseif ($id > 0) {
 	$object->fetch($id);
 	$result = $projectstatic->fetch($object->fk_project);
 }
 
-if ($action == 'confirm_generateinvoice')
-{
-	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+if ($action == 'confirm_generateinvoice') {
+	if (!empty($projectstatic->socid)) {
+		$projectstatic->fetch_thirdparty();
+	}
 
 	if (!($projectstatic->thirdparty->id > 0)) {
 		setEventMessages($langs->trans("ThirdPartyRequiredToGenerateInvoice"), null, 'errors');
@@ -351,21 +346,26 @@ if ($action == 'confirm_generateinvoice')
 		$invoiceToUse = GETPOST('invoiceid', 'int');
 
 		$prodDurationHours = 1.0;
-		if ($idprod > 0)
-		{
+		if ($idprod > 0) {
 			$tmpproduct->fetch($idprod);
-			if ($tmpproduct->duration_unit == 'i')
+			if ($tmpproduct->duration_unit == 'i') {
 				$prodDurationHours = 1. / 60;
-			if ($tmpproduct->duration_unit == 'h')
+			}
+			if ($tmpproduct->duration_unit == 'h') {
 				$prodDurationHours = 1.;
-			if ($tmpproduct->duration_unit == 'd')
+			}
+			if ($tmpproduct->duration_unit == 'd') {
 				$prodDurationHours = 24.;
-			if ($tmpproduct->duration_unit == 'w')
+			}
+			if ($tmpproduct->duration_unit == 'w') {
 				$prodDurationHours = 24. * 7;
-			if ($tmpproduct->duration_unit == 'm')
+			}
+			if ($tmpproduct->duration_unit == 'm') {
 				$prodDurationHours = 24. * 30;
-			if ($tmpproduct->duration_unit == 'y')
+			}
+			if ($tmpproduct->duration_unit == 'y') {
 				$prodDurationHours = 24. * 365;
+			}
 			$prodDurationHours *= $tmpproduct->duration_value;
 
 			$dataforprice = $tmpproduct->getSellPrice($mysoc, $projectstatic->thirdparty, 0);
@@ -389,27 +389,23 @@ if ($action == 'confirm_generateinvoice')
 			$tmpinvoice->fetch($invoiceToUse);
 		} else {
 			$result = $tmpinvoice->create($user);
-			if ($result <= 0)
-			{
+			if ($result <= 0) {
 				$error++;
 				setEventMessages($tmpinvoice->error, $tmpinvoice->errors, 'errors');
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			if ($generateinvoicemode == 'onelineperuser') {
 					$arrayoftasks = array();
-				foreach ($toselect as $key => $value)
-					{
+				foreach ($toselect as $key => $value) {
 					// Get userid, timepent
 					$object->fetchTimeSpent($value);
 					$arrayoftasks[$object->timespent_fk_user]['timespent'] += $object->timespent_duration;
 					$arrayoftasks[$object->timespent_fk_user]['totalvaluetodivideby3600'] += ($object->timespent_duration * $object->timespent_thm);
 				}
 
-				foreach ($arrayoftasks as $userid => $value)
-				{
+				foreach ($arrayoftasks as $userid => $value) {
 					$fuser->fetch($userid);
 					//$pu_ht = $value['timespent'] * $fuser->thm;
 					$username = $fuser->getFullName($langs);
@@ -419,8 +415,7 @@ if ($action == 'confirm_generateinvoice')
 					$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
 
 					// If no unit price known
-					if (empty($pu_ht))
-					{
+					if (empty($pu_ht)) {
 						$pu_ht = price2num($value['totalvaluetodivideby3600'] / 3600, 'MU');
 					}
 
@@ -431,8 +426,7 @@ if ($action == 'confirm_generateinvoice')
 					$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id;
 					$sql .= ' WHERE rowid in ('.join(',', $toselect).') AND fk_user = '.$userid;
 					$result = $db->query($sql);
-					if (!$result)
-					{
+					if (!$result) {
 						$error++;
 						setEventMessages($db->lasterror(), null, 'errors');
 						break;
@@ -440,8 +434,7 @@ if ($action == 'confirm_generateinvoice')
 				}
 			} elseif ($generateinvoicemode == 'onelineperperiod') {
 					$arrayoftasks = array();
-				foreach ($toselect as $key => $value)
-					{
+				foreach ($toselect as $key => $value) {
 					// Get userid, timepent
 					$object->fetchTimeSpent($value);
 					$arrayoftasks[$object->timespent_id]['timespent'] = $object->timespent_duration;
@@ -450,8 +443,7 @@ if ($action == 'confirm_generateinvoice')
 					$arrayoftasks[$object->timespent_id]['user'] = $object->timespent_fk_user;
 				}
 
-				foreach ($arrayoftasks as $timespent_id => $value)
-				{
+				foreach ($arrayoftasks as $timespent_id => $value) {
 					$userid = $value['user'];
 					$fuser->fetch($userid);
 					//$pu_ht = $value['timespent'] * $fuser->thm;
@@ -462,8 +454,7 @@ if ($action == 'confirm_generateinvoice')
 					$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
 
 					// If no unit price known
-					if (empty($pu_ht))
-					{
+					if (empty($pu_ht)) {
 						$pu_ht = price2num($value['totalvaluetodivideby3600'] / 3600, 'MU');
 					}
 
@@ -474,8 +465,7 @@ if ($action == 'confirm_generateinvoice')
 					$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id;
 					$sql .= ' WHERE rowid in ('.join(',', $toselect).') AND fk_user = '.$userid;
 					$result = $db->query($sql);
-					if (!$result)
-					{
+					if (!$result) {
 						$error++;
 						setEventMessages($db->lasterror(), null, 'errors');
 						break;
@@ -483,8 +473,7 @@ if ($action == 'confirm_generateinvoice')
 				}
 			} elseif ($generateinvoicemode == 'onelinepertask') {
 					$arrayoftasks = array();
-				foreach ($toselect as $key => $value)
-					{
+				foreach ($toselect as $key => $value) {
 					// Get userid, timepent
 					$object->fetchTimeSpent($value);
 					// $object->id is the task id
@@ -492,8 +481,7 @@ if ($action == 'confirm_generateinvoice')
 					$arrayoftasks[$object->id]['totalvaluetodivideby3600'] += $object->timespent_duration * $object->timespent_thm;
 				}
 
-				foreach ($arrayoftasks as $task_id => $value)
-				{
+				foreach ($arrayoftasks as $task_id => $value) {
 					$ftask = new Task($db);
 					$ftask->fetch($task_id);
 					// Define qty per hour
@@ -501,8 +489,7 @@ if ($action == 'confirm_generateinvoice')
 					$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
 
 					// If no unit price known
-					if (empty($pu_ht))
-					{
+					if (empty($pu_ht)) {
 						$pu_ht = price2num($value['totalvaluetodivideby3600'] / 3600, 'MU');
 					}
 
@@ -514,8 +501,7 @@ if ($action == 'confirm_generateinvoice')
 					$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.$lineid.', invoice_id = '.$tmpinvoice->id;
 					$sql .= ' WHERE rowid in ('.join(',', $toselect).')';
 					$result = $db->query($sql);
-					if (!$result)
-					{
+					if (!$result) {
 						$error++;
 						setEventMessages($db->lasterror(), null, 'errors');
 						break;
@@ -524,8 +510,7 @@ if ($action == 'confirm_generateinvoice')
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$urltoinvoice = $tmpinvoice->getNomUrl(0);
 			setEventMessages($langs->trans("InvoiceGeneratedFromTimeSpent", $urltoinvoice), null, 'mesgs');
 			//var_dump($tmpinvoice);
@@ -551,22 +536,27 @@ $formother = new FormOther($db);
 $formproject = new FormProjets($db);
 $userstatic = new User($db);
 
-if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
-{
+if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) {
 	/*
 	 * Fiche projet en mode visu
 	 */
-	if ($projectidforalltimes > 0)
-	{
+	if ($projectidforalltimes > 0) {
 		$result = $projectstatic->fetch($projectidforalltimes);
-		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+		if (!empty($projectstatic->socid)) {
+			$projectstatic->fetch_thirdparty();
+		}
 		$res = $projectstatic->fetch_optionals();
-	} elseif ($object->fetch($id, $ref) >= 0)
-	{
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+	} elseif ($object->fetch($id, $ref) >= 0) {
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+			$object->fetchComments();
+		}
 		$result = $projectstatic->fetch($object->fk_project);
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) $projectstatic->fetchComments();
-		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+			$projectstatic->fetchComments();
+		}
+		if (!empty($projectstatic->socid)) {
+			$projectstatic->fetch_thirdparty();
+		}
 		$res = $projectstatic->fetch_optionals();
 
 		$object->project = clone $projectstatic;
@@ -575,13 +565,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 	$userRead = $projectstatic->restrictedProjectArea($user, 'read');
 	$linktocreatetime = '';
 
-	if ($projectstatic->id > 0)
-	{
-		if ($withproject)
-		{
+	if ($projectstatic->id > 0) {
+		if ($withproject) {
 			// Tabs for project
-			if (empty($id) || $tab == 'timespent') $tab = 'timespent';
-			else $tab = 'tasks';
+			if (empty($id) || $tab == 'timespent') {
+				$tab = 'timespent';
+			} else {
+				$tab = 'tasks';
+			}
 
 			$head = project_prepare_head($projectstatic);
 			print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'));
@@ -596,15 +587,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			// Title
 			$morehtmlref .= $projectstatic->title;
 			// Thirdparty
-			if ($projectstatic->thirdparty->id > 0)
-			{
+			if ($projectstatic->thirdparty->id > 0) {
 				$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
 			}
 			$morehtmlref .= '</div>';
 
 			// Define a complementary filter for search of next/prev ref.
-			if (!$user->rights->projet->all->lire)
-			{
+			if (!$user->rights->projet->all->lire) {
 				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
 				$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 			}
@@ -622,22 +611,19 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			print $langs->trans("Usage");
 			print '</td>';
 			print '<td>';
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-			{
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("ProjectFollowOpportunity");
 				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 				print '<br>';
 			}
-			if (empty($conf->global->PROJECT_HIDE_TASKS))
-			{
+			if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("ProjectFollowTasks");
 				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 				print '<br>';
 			}
-			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-			{
+			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("ProjectBillTimeDescription");
 				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -647,8 +633,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 			// Visibility
 			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-			if ($projectstatic->public) print $langs->trans('SharedProject');
-			else print $langs->trans('PrivateProject');
+			if ($projectstatic->public) {
+				print $langs->trans('SharedProject');
+			} else {
+				print $langs->trans('PrivateProject');
+			}
 			print '</td></tr>';
 
 			// Date start - end
@@ -658,12 +647,16 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			$end = dol_print_date($projectstatic->date_end, 'day');
 			print ' - ';
 			print ($end ? $end : '?');
-			if ($projectstatic->hasDelay()) print img_warning("Late");
+			if ($projectstatic->hasDelay()) {
+				print img_warning("Late");
+			}
 			print '</td></tr>';
 
 			// Budget
 			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-			if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			if (strcmp($projectstatic->budget_amount, '')) {
+				print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			}
 			print '</td></tr>';
 
 			// Other attributes
@@ -708,14 +701,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$linktocreatetimeBtnStatus = 0;
 		$linktocreatetimeUrl = '';
 		$linktocreatetimeHelpText = '';
-		if ($user->rights->projet->all->lire || $user->rights->projet->lire)	// To enter time, read permission is enough
-		{
-			if ($projectstatic->public || $userRead > 0)
-			{
+		if ($user->rights->projet->all->lire || $user->rights->projet->lire) {	// To enter time, read permission is enough
+			if ($projectstatic->public || $userRead > 0) {
 				$linktocreatetimeBtnStatus = 1;
 
-				if (!empty($projectidforalltimes))		// We are on tab 'Time Spent' of project
-				{
+				if (!empty($projectidforalltimes)) {		// We are on tab 'Time Spent' of project
 					$backtourl = $_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.($withproject ? '&withproject=1' : '');
 					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').'&projectid='.$projectstatic->id.'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
 				} else // We are on tab 'Time Spent' of task
@@ -733,42 +723,41 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 	}
 
 	$massactionbutton = '';
-	if ($projectstatic->usage_bill_time)
-	{
+	if ($projectstatic->usage_bill_time) {
 		$arrayofmassactions = array(
 			'generateinvoice'=>$langs->trans("GenerateBill"),
 			//'builddoc'=>$langs->trans("PDFMerge"),
 		);
 		//if ($user->rights->projet->creer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-		if (in_array($massaction, array('presend', 'predelete', 'generateinvoice'))) $arrayofmassactions = array();
+		if (in_array($massaction, array('presend', 'predelete', 'generateinvoice'))) {
+			$arrayofmassactions = array();
+		}
 		$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 	}
 
 	// Show section with information of task. If id of task is not defined and project id defined, then $projectidforalltimes is not empty.
-	if (empty($projectidforalltimes))
-	{
+	if (empty($projectidforalltimes)) {
 		$head = task_prepare_head($object);
 		print dol_get_fiche_head($head, 'task_time', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
-		if ($action == 'deleteline')
-		{
+		if ($action == 'deleteline') {
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST("lineid", 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_delete", '', '', 1);
 		}
 
 		$param = ($withproject ? '&withproject=1' : '');
 		$linkback = $withproject ? '<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>' : '';
 
-		if (!GETPOST('withproject') || empty($projectstatic->id))
-		{
+		if (!GETPOST('withproject') || empty($projectstatic->id)) {
 			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 			$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		} else {
+			$object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		}
 
 		$morehtmlref = '';
 
 		// Project
-		if (empty($withproject))
-		{
+		if (empty($withproject)) {
 			$morehtmlref .= '<div class="refidno">';
 			$morehtmlref .= $langs->trans("Project").': ';
 			$morehtmlref .= $projectstatic->getNomUrl(1);
@@ -797,13 +786,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$end = dol_print_date($object->date_end, 'dayhour');
 		print ' - ';
 		print ($end ? $end : '?');
-		if ($object->hasDelay()) print img_warning("Late");
+		if ($object->hasDelay()) {
+			print img_warning("Late");
+		}
 		print '</td></tr>';
 
 		// Planned workload
 		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
-		if ($object->planned_workload)
-		{
+		if ($object->planned_workload) {
 			print convertSecondToTime($object->planned_workload, 'allhourmin');
 		}
 		print '</td></tr>';
@@ -823,12 +813,16 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 		// Progress calculated
 		print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td>';
-		if ($object->planned_workload)
-		{
+		if ($object->planned_workload) {
 			$tmparray = $object->getSummaryOfTimeSpent();
-			if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
-			else print '0 %';
-		} else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
+			if ($tmparray['total_duration'] > 0) {
+				print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
+			} else {
+				print '0 %';
+			}
+		} else {
+			print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
+		}
 		print '</td>';
 
 		print '</tr>';
@@ -845,10 +839,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 	}
 
 
-	if ($projectstatic->id > 0)
-	{
-		if ($action == 'deleteline' && !empty($projectidforalltimes))
-		{
+	if ($projectstatic->id > 0) {
+		if ($action == 'deleteline' && !empty($projectidforalltimes)) {
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST('lineid', 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_delete", '', '', 1);
 		}
 
@@ -858,8 +850,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		// Definition of fields for list
 		$arrayfields = array();
 		$arrayfields['t.task_date'] = array('label'=>$langs->trans("Date"), 'checked'=>1);
-		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
-		{
+		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
 			$arrayfields['t.task_ref'] = array('label'=>$langs->trans("RefTask"), 'checked'=>1);
 			$arrayfields['t.task_label'] = array('label'=>$langs->trans("LabelTask"), 'checked'=>1);
 		}
@@ -874,33 +865,67 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$arrayfields = dol_sort_array($arrayfields, 'position');
 
 		$param = '';
-		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-		if ($search_month > 0) $param .= '&search_month='.urlencode($search_month);
-		if ($search_year > 0) $param .= '&search_year='.urlencode($search_year);
-		if ($search_user > 0) $param .= '&search_user='.urlencode($search_user);
-		if ($search_task_ref != '') $param .= '&search_task_ref='.urlencode($search_task_ref);
-		if ($search_task_label != '') $param .= '&search_task_label='.urlencode($search_task_label);
-		if ($search_note != '') $param .= '&search_note='.urlencode($search_note);
-		if ($search_duration != '') $param .= '&amp;search_field2='.urlencode($search_duration);
-		if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+			$param .= '&contextpage='.urlencode($contextpage);
+		}
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param .= '&limit='.urlencode($limit);
+		}
+		if ($search_month > 0) {
+			$param .= '&search_month='.urlencode($search_month);
+		}
+		if ($search_year > 0) {
+			$param .= '&search_year='.urlencode($search_year);
+		}
+		if ($search_user > 0) {
+			$param .= '&search_user='.urlencode($search_user);
+		}
+		if ($search_task_ref != '') {
+			$param .= '&search_task_ref='.urlencode($search_task_ref);
+		}
+		if ($search_task_label != '') {
+			$param .= '&search_task_label='.urlencode($search_task_label);
+		}
+		if ($search_note != '') {
+			$param .= '&search_note='.urlencode($search_note);
+		}
+		if ($search_duration != '') {
+			$param .= '&amp;search_field2='.urlencode($search_duration);
+		}
+		if ($optioncss != '') {
+			$param .= '&optioncss='.urlencode($optioncss);
+		}
 		/*
 		 // Add $param from extra fields
 		 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 		 */
-		if ($id) $param .= '&id='.urlencode($id);
-		if ($projectid) $param .= '&projectid='.urlencode($projectid);
-		if ($withproject) $param .= '&withproject='.urlencode($withproject);
+		if ($id) {
+			$param .= '&id='.urlencode($id);
+		}
+		if ($projectid) {
+			$param .= '&projectid='.urlencode($projectid);
+		}
+		if ($withproject) {
+			$param .= '&withproject='.urlencode($withproject);
+		}
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+		if ($optioncss != '') {
+			print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+		}
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-		if ($action == 'editline') print '<input type="hidden" name="action" value="updateline">';
-		elseif ($action == 'splitline') print '<input type="hidden" name="action" value="updatesplitline">';
-		elseif ($action == 'createtime' && $user->rights->projet->lire) print '<input type="hidden" name="action" value="addtimespent">';
-		elseif ($massaction == 'generateinvoice' && $user->rights->facture->lire) print '<input type="hidden" name="action" value="confirm_generateinvoice">';
-		else print '<input type="hidden" name="action" value="list">';
+		if ($action == 'editline') {
+			print '<input type="hidden" name="action" value="updateline">';
+		} elseif ($action == 'splitline') {
+			print '<input type="hidden" name="action" value="updatesplitline">';
+		} elseif ($action == 'createtime' && $user->rights->projet->lire) {
+			print '<input type="hidden" name="action" value="addtimespent">';
+		} elseif ($massaction == 'generateinvoice' && $user->rights->facture->lire) {
+			print '<input type="hidden" name="action" value="confirm_generateinvoice">';
+		} else {
+			print '<input type="hidden" name="action" value="list">';
+		}
 		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
@@ -910,8 +935,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		print '<input type="hidden" name="tab" value="'.$tab.'">';
 
 		// Form to convert time spent into invoice
-		if ($massaction == 'generateinvoice')
-		{
+		if ($massaction == 'generateinvoice') {
 			print '<input type="hidden" name="massaction" value="confirm_createbills">';
 
 			if ($projectstatic->thirdparty->id > 0) {
@@ -939,8 +963,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				print '</td>';
 				print '</tr>';
 
-				if ($conf->service->enabled)
-				{
+				if ($conf->service->enabled) {
 					print '<tr>';
 					print '<td>';
 					print $langs->trans('ServiceToUseOnLines');
@@ -998,39 +1021,50 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as inv ON inv.rowid = il.fk_facture,";
 		$sql .= " ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
-		if (empty($projectidforalltimes)) $sql .= " AND t.fk_task =".$object->id;
-		else $sql .= " AND pt.fk_projet IN (".$projectidforalltimes.")";
-		if ($search_note) $sql .= natural_search('t.note', $search_note);
-		if ($search_task_ref) $sql .= natural_search('pt.ref', $search_task_ref);
-		if ($search_task_label) $sql .= natural_search('pt.label', $search_task_label);
-		if ($search_user > 0) $sql .= natural_search('t.fk_user', $search_user);
-		if ($search_valuebilled == '1') $sql .= ' AND t.invoice_id > 0';
-		if ($search_valuebilled == '0') $sql .= ' AND (t.invoice_id = 0 OR t.invoice_id IS NULL)';
+		if (empty($projectidforalltimes)) {
+			$sql .= " AND t.fk_task =".$object->id;
+		} else {
+			$sql .= " AND pt.fk_projet IN (".$projectidforalltimes.")";
+		}
+		if ($search_note) {
+			$sql .= natural_search('t.note', $search_note);
+		}
+		if ($search_task_ref) {
+			$sql .= natural_search('pt.ref', $search_task_ref);
+		}
+		if ($search_task_label) {
+			$sql .= natural_search('pt.label', $search_task_label);
+		}
+		if ($search_user > 0) {
+			$sql .= natural_search('t.fk_user', $search_user);
+		}
+		if ($search_valuebilled == '1') {
+			$sql .= ' AND t.invoice_id > 0';
+		}
+		if ($search_valuebilled == '0') {
+			$sql .= ' AND (t.invoice_id = 0 OR t.invoice_id IS NULL)';
+		}
 		$sql .= dolSqlDateFilter('t.task_datehour', $search_day, $search_month, $search_year);
 		$sql .= $db->order($sortfield, $sortorder);
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
-		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-		{
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 			$resql = $db->query($sql);
 			$nbtotalofrecords = $db->num_rows($resql);
-			if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
-			{
+			if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
 				$page = 0;
 				$offset = 0;
 			}
 		}
 		// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-		if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
-		{
+		if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
 			$num = $nbtotalofrecords;
 		} else {
 			$sql .= $db->plimit($limit + 1, $offset);
 
 			$resql = $db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				dol_print_error($db);
 				exit;
 			}
@@ -1038,10 +1072,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			$num = $db->num_rows($resql);
 		}
 
-		if ($num >= 0)
-		{
-			if (!empty($projectidforalltimes))
-			{
+		if ($num >= 0) {
+			if (!empty($projectidforalltimes)) {
 				print '<!-- List of time spent for project -->'."\n";
 
 				$title = $langs->trans("ListTaskTimeUserProject");
@@ -1056,8 +1088,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			}
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $db->fetch_object($resql);
 				$tasks[$i] = $row;
 				$i++;
@@ -1070,23 +1101,25 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		/*
 		 * Form to add a new line of time spent
 		 */
-		if ($action == 'createtime' && $user->rights->projet->lire)
-		{
+		if ($action == 'createtime' && $user->rights->projet->lire) {
 			print '<!-- table to add time spent -->'."\n";
-			if (!empty($id)) print '<input type="hidden" name="taskid" value="'.$id.'">';
+			if (!empty($id)) {
+				print '<input type="hidden" name="taskid" value="'.$id.'">';
+			}
 
 			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 			print '<table class="noborder nohover centpercent">';
 
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("Date").'</td>';
-			if (empty($id)) print '<td>'.$langs->trans("Task").'</td>';
+			if (empty($id)) {
+				print '<td>'.$langs->trans("Task").'</td>';
+			}
 			print '<td>'.$langs->trans("By").'</td>';
 			print '<td>'.$langs->trans("Note").'</td>';
 			print '<td>'.$langs->trans("NewTimeSpent").'</td>';
 			print '<td>'.$langs->trans("ProgressDeclared").'</td>';
-			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
-			{
+			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 				print '<td></td>';
 			}
 			print '<td></td>';
@@ -1103,8 +1136,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 			// Task
 			$nboftasks = 0;
-			if (empty($id))
-			{
+			if (empty($id)) {
 				print '<td class="maxwidthonsmartphone">';
 				$nboftasks = $formproject->selectTasks(-1, GETPOST('taskid', 'int'), 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
 				print '</td>';
@@ -1113,13 +1145,17 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			// Contributor
 			print '<td class="maxwidthonsmartphone nowraponall">';
 			$contactsofproject = $projectstatic->getListContactId('internal');
-			if (count($contactsofproject) > 0)
-			{
+			if (count($contactsofproject) > 0) {
 				print img_object('', 'user', 'class="hideonsmartphone"');
-				if (in_array($user->id, $contactsofproject)) $userid = $user->id;
-				else $userid = $contactsofproject[0];
+				if (in_array($user->id, $contactsofproject)) {
+					$userid = $user->id;
+				} else {
+					$userid = $contactsofproject[0];
+				}
 
-				if ($projectstatic->public) $contactsofproject = array();
+				if ($projectstatic->public) {
+					$contactsofproject = array();
+				}
 				print $form->select_dolusers((GETPOST('userid', 'int') ? GETPOST('userid', 'int') : $userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth250');
 			} else {
 				if ($nboftasks) {
@@ -1136,8 +1172,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			// Duration - Time spent
 			print '<td>';
 			$durationtouse = ($_POST['timespent_duration'] ? $_POST['timespent_duration'] : '');
-			if (GETPOSTISSET('timespent_durationhour') || GETPOSTISSET('timespent_durationmin'))
-			{
+			if (GETPOSTISSET('timespent_durationhour') || GETPOSTISSET('timespent_durationmin')) {
 				$durationtouse = (GETPOST('timespent_durationhour') * 3600 + GETPOST('timespent_durationmin') * 60);
 			}
 			print $form->select_duration('timespent_duration', $durationtouse, 0, 'text');
@@ -1149,8 +1184,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			print '</td>';
 
 			// Invoiced
-			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
-			{
+			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 				print '<td>';
 				print '</td>';
 			}
@@ -1170,11 +1204,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-		else $moreforfilter = $hookmanager->resPrint;
+		if (empty($reshook)) {
+			$moreforfilter .= $hookmanager->resPrint;
+		} else {
+			$moreforfilter = $hookmanager->resPrint;
+		}
 
-		if (!empty($moreforfilter))
-		{
+		if (!empty($moreforfilter)) {
 			print '<div class="liste_titre liste_titre_bydiv centpercent">';
 			print $moreforfilter;
 			print '</div>';
@@ -1190,29 +1226,43 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		// Fields title search
 		print '<tr class="liste_titre_filter">';
 		// Date
-		if (!empty($arrayfields['t.task_date']['checked']))
-		{
+		if (!empty($arrayfields['t.task_date']['checked'])) {
 			print '<td class="liste_titre">';
-			if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+			if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+				print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+			}
 			print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
 			$formother->select_year($search_year, 'search_year', 1, 20, 5);
 			print '</td>';
 		}
-		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
-		{
-			if (!empty($arrayfields['t.task_ref']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
-			if (!empty($arrayfields['t.task_label']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
+		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
+			if (!empty($arrayfields['t.task_ref']['checked'])) {
+				print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_ref" value="'.dol_escape_htmltag($search_task_ref).'"></td>';
+			}
+			if (!empty($arrayfields['t.task_label']['checked'])) {
+				print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
+			}
 		}
 		// Author
-		if (!empty($arrayfields['author']['checked'])) print '<td class="liste_titre">'.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250').'</td>';
+		if (!empty($arrayfields['author']['checked'])) {
+			print '<td class="liste_titre">'.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250').'</td>';
+		}
 		// Note
-		if (!empty($arrayfields['t.note']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_note" value="'.dol_escape_htmltag($search_note).'"></td>';
+		if (!empty($arrayfields['t.note']['checked'])) {
+			print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_note" value="'.dol_escape_htmltag($search_note).'"></td>';
+		}
 		// Duration
-		if (!empty($arrayfields['t.task_duration']['checked'])) print '<td class="liste_titre right"></td>';
+		if (!empty($arrayfields['t.task_duration']['checked'])) {
+			print '<td class="liste_titre right"></td>';
+		}
 		// Value in main currency
-		if (!empty($arrayfields['value']['checked'])) print '<td class="liste_titre"></td>';
+		if (!empty($arrayfields['value']['checked'])) {
+			print '<td class="liste_titre"></td>';
+		}
 		// Value billed
-		if (!empty($arrayfields['valuebilled']['checked'])) print '<td class="liste_titre center">'.$form->selectyesno('search_valuebilled', $search_valuebilled, 1, false, 1).'</td>';
+		if (!empty($arrayfields['valuebilled']['checked'])) {
+			print '<td class="liste_titre center">'.$form->selectyesno('search_valuebilled', $search_valuebilled, 1, false, 1).'</td>';
+		}
 
 		/*
 		// Extra fields
@@ -1230,17 +1280,32 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		print '</tr>'."\n";
 
 		print '<tr class="liste_titre">';
-		if (!empty($arrayfields['t.task_date']['checked']))		 print_liste_field_titre($arrayfields['t.task_date']['label'], $_SERVER['PHP_SELF'], 't.task_date,t.task_datehour,t.rowid', '', $param, '', $sortfield, $sortorder);
-		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
-		{
-			if (!empty($arrayfields['t.task_ref']['checked']))	 print_liste_field_titre($arrayfields['t.task_ref']['label'], $_SERVER['PHP_SELF'], 'pt.ref', '', $param, '', $sortfield, $sortorder);
-			if (!empty($arrayfields['t.task_label']['checked'])) print_liste_field_titre($arrayfields['t.task_label']['label'], $_SERVER['PHP_SELF'], 'pt.label', '', $param, '', $sortfield, $sortorder);
+		if (!empty($arrayfields['t.task_date']['checked'])) {
+			print_liste_field_titre($arrayfields['t.task_date']['label'], $_SERVER['PHP_SELF'], 't.task_date,t.task_datehour,t.rowid', '', $param, '', $sortfield, $sortorder);
+		}
+		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
+			if (!empty($arrayfields['t.task_ref']['checked'])) {
+				print_liste_field_titre($arrayfields['t.task_ref']['label'], $_SERVER['PHP_SELF'], 'pt.ref', '', $param, '', $sortfield, $sortorder);
+			}
+			if (!empty($arrayfields['t.task_label']['checked'])) {
+				print_liste_field_titre($arrayfields['t.task_label']['label'], $_SERVER['PHP_SELF'], 'pt.label', '', $param, '', $sortfield, $sortorder);
+			}
+		}
+		if (!empty($arrayfields['author']['checked'])) {
+			print_liste_field_titre($arrayfields['author']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+		}
+		if (!empty($arrayfields['t.note']['checked'])) {
+			print_liste_field_titre($arrayfields['t.note']['label'], $_SERVER['PHP_SELF'], 't.note', '', $param, '', $sortfield, $sortorder);
+		}
+		if (!empty($arrayfields['t.task_duration']['checked'])) {
+			print_liste_field_titre($arrayfields['t.task_duration']['label'], $_SERVER['PHP_SELF'], 't.task_duration', '', $param, '', $sortfield, $sortorder, 'right ');
+		}
+		if (!empty($arrayfields['value']['checked'])) {
+			print_liste_field_titre($arrayfields['value']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+		}
+		if (!empty($arrayfields['valuebilled']['checked'])) {
+			print_liste_field_titre($arrayfields['valuebilled']['label'], $_SERVER['PHP_SELF'], 'il.total_ht', '', $param, '', $sortfield, $sortorder, 'center ');
 		}
-		if (!empty($arrayfields['author']['checked']))			 print_liste_field_titre($arrayfields['author']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
-		if (!empty($arrayfields['t.note']['checked']))			 print_liste_field_titre($arrayfields['t.note']['label'], $_SERVER['PHP_SELF'], 't.note', '', $param, '', $sortfield, $sortorder);
-		if (!empty($arrayfields['t.task_duration']['checked']))  print_liste_field_titre($arrayfields['t.task_duration']['label'], $_SERVER['PHP_SELF'], 't.task_duration', '', $param, '', $sortfield, $sortorder, 'right ');
-		if (!empty($arrayfields['value']['checked']))			 print_liste_field_titre($arrayfields['value']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-		if (!empty($arrayfields['valuebilled']['checked']))		 print_liste_field_titre($arrayfields['valuebilled']['label'], $_SERVER['PHP_SELF'], 'il.total_ht', '', $param, '', $sortfield, $sortorder, 'center ');
 		/*
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -1262,9 +1327,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$total = 0;
 		$totalvalue = 0;
 		$totalarray = array();
-		foreach ($tasks as $task_time)
-		{
-			if ($i >= $limit) break;
+		foreach ($tasks as $task_time) {
+			if ($i >= $limit) {
+				break;
+			}
 
 			print '<tr class="oddeven">';
 
@@ -1272,30 +1338,28 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			$date2 = $db->jdate($task_time->task_datehour);
 
 			// Date
-			if (!empty($arrayfields['t.task_date']['checked']))
-			{
+			if (!empty($arrayfields['t.task_date']['checked'])) {
 				print '<td class="nowrap">';
-				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
-				{
-					if (empty($task_time->task_date_withhour))
-					{
+				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
+					if (empty($task_time->task_date_withhour)) {
 						print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
-					} else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
+					} else {
+						print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
+					}
 				} else {
 					print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 				}
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Task ref
-			if (!empty($arrayfields['t.task_ref']['checked']))
-			{
-				if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))   // Not a dedicated task
-				{
+			if (!empty($arrayfields['t.task_ref']['checked'])) {
+				if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {   // Not a dedicated task
 					print '<td class="nowrap">';
-					if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
-					{
+					if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
 						$formproject->selectTasks(-1, GETPOST('taskid', 'int') ?GETPOST('taskid', 'int') : $task_time->fk_task, 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
 					} else {
 						$tasktmp->id = $task_time->fk_task;
@@ -1304,31 +1368,33 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						print $tasktmp->getNomUrl(1, 'withproject', 'time');
 					}
 					print '</td>';
-					if (!$i) $totalarray['nbfield']++;
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
 				}
 			} else {
 				print '<input type="hidden" name="taskid" value="'.$id.'">';
 			}
 
 			// Task label
-			if (!empty($arrayfields['t.task_label']['checked']))
-			{
-				if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
-				{
+			if (!empty($arrayfields['t.task_label']['checked'])) {
+				if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
 					print '<td class="nowrap">';
 					print $task_time->label;
 					print '</td>';
-					if (!$i) $totalarray['nbfield']++;
+					if (!$i) {
+						$totalarray['nbfield']++;
+					}
 				}
 			}
 
 			// By User
-			if (!empty($arrayfields['author']['checked']))
-			{
+			if (!empty($arrayfields['author']['checked'])) {
 				print '<td class="nowrap">';
-				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
-				{
-					if (empty($object->id)) $object->fetch($id);
+				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
+					if (empty($object->id)) {
+						$object->fetch($id);
+					}
 					$contactsoftask = $object->getListContactId('internal');
 					if (!in_array($task_time->fk_user, $contactsoftask)) {
 						$contactsoftask[] = $task_time->fk_user;
@@ -1348,72 +1414,77 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					print $userstatic->getNomUrl(-1);
 				}
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Note
-			if (!empty($arrayfields['t.note']['checked']))
-			{
+			if (!empty($arrayfields['t.note']['checked'])) {
 				print '<td class="left">';
-				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
-				{
+				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
 					print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
 				} else {
 					print dol_nl2br($task_time->note);
 				}
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
-			} elseif ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
-			{
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			} elseif ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
 				print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
 			}
 
 			// Time spent
-			if (!empty($arrayfields['t.task_duration']['checked']))
-			{
+			if (!empty($arrayfields['t.task_duration']['checked'])) {
 				print '<td class="right">';
-				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
-				{
+				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
 					print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
 					print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
 				} else {
 					print convertSecondToTime($task_time->task_duration, 'allhourmin');
 				}
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.task_duration';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.task_duration';
+				}
 				$totalarray['val']['t.task_duration'] += $task_time->task_duration;
-				if (!$i) $totalarray['totaldurationfield'] = $totalarray['nbfield'];
+				if (!$i) {
+					$totalarray['totaldurationfield'] = $totalarray['nbfield'];
+				}
 				$totalarray['totalduration'] += $task_time->task_duration;
 			}
 
 			// Value spent
-			if (!empty($arrayfields['value']['checked']))
-			{
+			if (!empty($arrayfields['value']['checked'])) {
 				print '<td class="nowraponall right">';
 				$value = price2num($task_time->thm * $task_time->task_duration / 3600, 'MT', 1);
 				print price($value, 1, $langs, 1, -1, -1, $conf->currency);
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'value';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'value';
+				}
 				$totalarray['val']['value'] += $value;
-				if (!$i) $totalarray['totalvaluefield'] = $totalarray['nbfield'];
+				if (!$i) {
+					$totalarray['totalvaluefield'] = $totalarray['nbfield'];
+				}
 				$totalarray['totalvalue'] += $value;
 			}
 
 			// Invoiced
-			if (!empty($arrayfields['valuebilled']['checked']))
-			{
+			if (!empty($arrayfields['valuebilled']['checked'])) {
 				print '<td class="center">'; // invoice_id and invoice_line_id
-				if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
-				{
-					if ($projectstatic->usage_bill_time)
-					{
-						if ($task_time->invoice_id)
-						{
+				if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+					if ($projectstatic->usage_bill_time) {
+						if ($task_time->invoice_id) {
 							$result = $tmpinvoice->fetch($task_time->invoice_id);
-							if ($result > 0)
-							{
+							if ($result > 0) {
 								print $tmpinvoice->getNomUrl(1);
 							}
 						} else {
@@ -1424,7 +1495,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					}
 				}
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			/*
@@ -1439,18 +1512,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 			// Action column
 			print '<td class="center nowraponall">';
-			if (($action == 'editline' || $action == 'splitline') && $_GET['lineid'] == $task_time->rowid)
-			{
+			if (($action == 'editline' || $action == 'splitline') && $_GET['lineid'] == $task_time->rowid) {
 				print '<input type="hidden" name="lineid" value="'.$_GET['lineid'].'">';
 				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort button-save" name="save" value="'.$langs->trans("Save").'">';
 				print '<br>';
 				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-			} elseif ($user->rights->projet->lire || $user->rights->projet->all->creer)	 // Read project and enter time consumed on assigned tasks
-			{
-				if ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids) || $user->rights->projet->all->creer)
-				{
-					if ($conf->MAIN_FEATURES_LEVEL >= 2)
-					{
+			} elseif ($user->rights->projet->lire || $user->rights->projet->all->creer) {	 // Read project and enter time consumed on assigned tasks
+				if ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids) || $user->rights->projet->all->creer) {
+					if ($conf->MAIN_FEATURES_LEVEL >= 2) {
 						print '&nbsp;';
 						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&amp;action=splitline&amp;lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
 						print img_split();
@@ -1467,37 +1536,38 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					print img_delete('default', 'class="pictodelete paddingleft"');
 					print '</a>';
 
-					if ($massactionbutton || $massaction)	// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					{
+					if ($massactionbutton || $massaction) {	// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 						$selected = 0;
-						if (in_array($task_time->rowid, $arrayofselected)) $selected = 1;
+						if (in_array($task_time->rowid, $arrayofselected)) {
+							$selected = 1;
+						}
 						print '&nbsp;';
 						print '<input id="cb'.$task_time->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$task_time->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 					}
 				}
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 
 			print "</tr>\n";
 
 
 			// Add line to split
 
-			if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-			{
+			if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
 				print '<tr class="oddeven">';
 
 				// Date
-				if (!empty($arrayfields['t.task_date']['checked']))
-				{
+				if (!empty($arrayfields['t.task_date']['checked'])) {
 					print '<td class="nowrap">';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-					{
-						if (empty($task_time->task_date_withhour))
-						{
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
+						if (empty($task_time->task_date_withhour)) {
 							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
-						} else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
+						} else {
+							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
+						}
 					} else {
 						print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 					}
@@ -1505,10 +1575,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 
 				// Task ref
-				if (!empty($arrayfields['t.task_ref']['checked']))
-				{
-					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
-					{
+				if (!empty($arrayfields['t.task_ref']['checked'])) {
+					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
 						print '<td class="nowrap">';
 						$tasktmp->id = $task_time->fk_task;
 						$tasktmp->ref = $task_time->ref;
@@ -1519,10 +1587,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 
 				// Task label
-				if (!empty($arrayfields['t.task_label']['checked']))
-				{
-					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
-					{
+				if (!empty($arrayfields['t.task_label']['checked'])) {
+					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
 						print '<td>';
 						print $task_time->label;
 						print '</td>';
@@ -1530,12 +1596,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 
 				// User
-				if (!empty($arrayfields['author']['checked']))
-				{
+				if (!empty($arrayfields['author']['checked'])) {
 					print '<td>';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-					{
-						if (empty($object->id)) $object->fetch($id);
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
+						if (empty($object->id)) {
+							$object->fetch($id);
+						}
 						$contactsoftask = $object->getListContactId('internal');
 						if (!in_array($task_time->fk_user, $contactsoftask)) {
 							$contactsoftask[] = $task_time->fk_user;
@@ -1558,27 +1624,22 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 
 				// Note
-				if (!empty($arrayfields['t.note']['checked']))
-				{
+				if (!empty($arrayfields['t.note']['checked'])) {
 					print '<td class="left">';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-					{
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
 						print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
 					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
-				} elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-				{
+				} elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
 					print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
 				}
 
 				// Time spent
-				if (!empty($arrayfields['t.task_duration']['checked']))
-				{
+				if (!empty($arrayfields['t.task_duration']['checked'])) {
 					print '<td class="right">';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-					{
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
 						print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
 						print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
 					} else {
@@ -1588,8 +1649,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 
 				// Value spent
-				if (!empty($arrayfields['value']['checked']))
-				{
+				if (!empty($arrayfields['value']['checked'])) {
 					print '<td class="right">';
 					$value = price2num($task_time->thm * $task_time->task_duration / 3600, 'MT', 1);
 					print price($value, 1, $langs, 1, -1, -1, $conf->currency);
@@ -1597,11 +1657,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 
 				// Value billed
-				if (!empty($arrayfields['valuebilled']['checked']))
-				{
+				if (!empty($arrayfields['valuebilled']['checked'])) {
 					print '<td class="right">';
 					$valuebilled = price2num($task_time->total_ht, '', 1);
-					if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
+					if (isset($task_time->total_ht)) {
+						print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
+					}
 					print '</td>';
 				}
 
@@ -1627,15 +1688,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				print '<tr class="oddeven">';
 
 				// Date
-				if (!empty($arrayfields['t.task_date']['checked']))
-				{
+				if (!empty($arrayfields['t.task_date']['checked'])) {
 					print '<td class="nowrap">';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-					{
-						if (empty($task_time->task_date_withhour))
-						{
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
+						if (empty($task_time->task_date_withhour)) {
 							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 3, 3, 2, "timespent_date", 1, 0);
-						} else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 1, 1, 2, "timespent_date", 1, 0);
+						} else {
+							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 1, 1, 2, "timespent_date", 1, 0);
+						}
 					} else {
 						print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 					}
@@ -1643,10 +1703,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 
 				// Task ref
-				if (!empty($arrayfields['t.task_ref']['checked']))
-				{
-					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
-					{
+				if (!empty($arrayfields['t.task_ref']['checked'])) {
+					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
 						print '<td class="nowrap">';
 						$tasktmp->id = $task_time->fk_task;
 						$tasktmp->ref = $task_time->ref;
@@ -1657,10 +1715,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 
 				// Task label
-				if (!empty($arrayfields['t.task_label']['checked']))
-				{
-					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
-					{
+				if (!empty($arrayfields['t.task_label']['checked'])) {
+					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
 						print '<td class="nowrap">';
 						print $task_time->label;
 						print '</td>';
@@ -1668,12 +1724,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 
 				// User
-				if (!empty($arrayfields['author']['checked']))
-				{
+				if (!empty($arrayfields['author']['checked'])) {
 					print '<td>';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-					{
-						if (empty($object->id)) $object->fetch($id);
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
+						if (empty($object->id)) {
+							$object->fetch($id);
+						}
 						$contactsoftask = $object->getListContactId('internal');
 						if (!in_array($task_time->fk_user, $contactsoftask)) {
 							$contactsoftask[] = $task_time->fk_user;
@@ -1696,27 +1752,22 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 
 				// Note
-				if (!empty($arrayfields['t.note']['checked']))
-				{
+				if (!empty($arrayfields['t.note']['checked'])) {
 					print '<td class="left">';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-					{
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
 						print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
 					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
-				} elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-				{
+				} elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
 					print '<input type="hidden" name="timespent_note_line_2" value="'.$task_time->note.'">';
 				}
 
 				// Time spent
-				if (!empty($arrayfields['t.task_duration']['checked']))
-				{
+				if (!empty($arrayfields['t.task_duration']['checked'])) {
 					print '<td class="right">';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
-					{
+					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
 						print '<input type="hidden" name="old_duration_2" value="0">';
 						print $form->select_duration('new_duration_2', 0, 0, 'text');
 					} else {
@@ -1726,8 +1777,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 
 				// Value spent
-				if (!empty($arrayfields['value']['checked']))
-				{
+				if (!empty($arrayfields['value']['checked'])) {
 					print '<td class="right">';
 					$value = 0;
 					print price($value, 1, $langs, 1, -1, -1, $conf->currency);
@@ -1735,11 +1785,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				}
 
 				// Value billed
-				if (!empty($arrayfields['valuebilled']['checked']))
-				{
+				if (!empty($arrayfields['valuebilled']['checked'])) {
 					print '<td class="right">';
 					$valuebilled = price2num($task_time->total_ht, '', 1);
-					if (isset($task_time->total_ht)) print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
+					if (isset($task_time->total_ht)) {
+						print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
+					}
 					print '</td>';
 				}
 
@@ -1765,31 +1816,35 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 		// Show total line
 		//include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-		if (isset($totalarray['totaldurationfield']) || isset($totalarray['totalvaluefield']))
-		{
+		if (isset($totalarray['totaldurationfield']) || isset($totalarray['totalvaluefield'])) {
 			print '<tr class="liste_total">';
 			$i = 0;
-			while ($i < $totalarray['nbfield'])
-			{
+			while ($i < $totalarray['nbfield']) {
 				$i++;
-				if ($i == 1)
-				{
-					if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
-					else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-				} elseif ($totalarray['totaldurationfield'] == $i) print '<td class="right">'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').'</td>';
-				elseif ($totalarray['totalvaluefield'] == $i) print '<td class="right">'.price($totalarray['totalvalue']).'</td>';
-				//elseif ($totalarray['totalvaluebilledfield'] == $i) print '<td class="center">'.price($totalarray['totalvaluebilled']).'</td>';
-				else print '<td></td>';
+				if ($i == 1) {
+					if ($num < $limit && empty($offset)) {
+						print '<td class="left">'.$langs->trans("Total").'</td>';
+					} else {
+						print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
+					}
+				} elseif ($totalarray['totaldurationfield'] == $i) {
+					print '<td class="right">'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').'</td>';
+				} elseif ($totalarray['totalvaluefield'] == $i) {
+					print '<td class="right">'.price($totalarray['totalvalue']).'</td>';
+					//} elseif ($totalarray['totalvaluebilledfield'] == $i) { print '<td class="center">'.price($totalarray['totalvaluebilled']).'</td>';
+				} else {
+					print '<td></td>';
+				}
 			}
 			print '</tr>';
 		}
 
-		if (!count($tasks))
-		{
+		if (!count($tasks)) {
 			$totalnboffields = 1;
-			foreach ($arrayfields as $value)
-			{
-				if ($value['checked']) $totalnboffields++;
+			foreach ($arrayfields as $value) {
+				if ($value['checked']) {
+					$totalnboffields++;
+				}
 			}
 			print '<tr class="oddeven"><td colspan="'.$totalnboffields.'">';
 			print '<span class="opacitymedium">'.$langs->trans("None").'</span>';