diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index aaa8bd0cd8916..76c5239fc1766 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -47,13 +47,6 @@
 $project_ref = GETPOST('project_ref', 'alpha');
 $planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('planned_workloadmin', 'int') != '') ? (GETPOST('planned_workloadhour', 'int') > 0 ?GETPOST('planned_workloadhour', 'int') * 3600 : 0) + (GETPOST('planned_workloadmin', 'int') > 0 ?GETPOST('planned_workloadmin', 'int') * 60 : 0) : '');
 
-// 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();
-}
-
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcommentcard', 'globalcard'));
 
@@ -79,10 +72,21 @@
 	}
 }
 
+
+if ($id > 0 || $ref) {
+	$object->fetch($id, $ref);
+}
+
+// Security check
+$socid = 0;
+
+restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
+
+
+
 /*
  * View
-*/
-
+ */
 
 llxHeader('', $langs->trans("CommentPage"));
 
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 3aa5c3b88305f..1f74d1bbc75a4 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -40,16 +40,17 @@
 $withproject = GETPOST('withproject', 'int');
 $project_ref = GETPOST('project_ref', 'alpha');
 
+$object = new Task($db);
+$projectstatic = new Project($db);
+
+if ($id > 0 || $ref) {
+	$object->fetch($id, $ref);
+}
+
 // 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.
-//$result = restrictedArea($user, 'projet', $id, 'projet_task');
-if (!$user->rights->projet->lire) {
-	accessforbidden();
-}
 
-$object = new Task($db);
-$projectstatic = new Project($db);
+restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
 
 
 /*
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index d9c49001dfc54..3a56a7a018aa8 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -37,21 +37,13 @@
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
+$mine = GETPOST('mode') == 'mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $withproject = GETPOST('withproject', 'int');
 $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.
-//$result=restrictedArea($user,'projet',$id,'');
-if (!$user->rights->projet->lire) {
-	accessforbidden();
-}
-
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -73,6 +65,17 @@
 $object = new Task($db);
 $projectstatic = new Project($db);
 
+if ($id > 0 || $ref) {
+	$object->fetch($id, $ref);
+}
+
+// Security check
+$socid = 0;
+
+restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
+
+
+
 /*
  * Actions
  */
@@ -92,25 +95,21 @@
 }
 
 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_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($projectstatic->socid)) {
+		$projectstatic->fetch_thirdparty();
+	}
 
-		$object->project = clone $projectstatic;
+	$object->project = clone $projectstatic;
 
-		$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
-	} else {
-		dol_print_error($db);
-	}
+	$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
 }
 
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 4d581afc30a42..3ad4aaa3b7b53 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -31,7 +31,7 @@
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
+$mine = GETPOST('mode') == 'mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -82,6 +82,12 @@
 	}
 }
 
+if ($id > 0 || $ref) {
+	$object->fetch($id, $ref);
+}
+
+restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
+
 $permissionnote = ($user->rights->projet->creer || $user->rights->projet->all->creer);
 
 
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 780d387512e59..b31ba6f0e7be8 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -46,13 +46,6 @@
 $project_ref = GETPOST('project_ref', 'alpha');
 $planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('planned_workloadmin', 'int') != '') ? (GETPOST('planned_workloadhour', 'int') > 0 ?GETPOST('planned_workloadhour', 'int') * 3600 : 0) + (GETPOST('planned_workloadmin', 'int') > 0 ?GETPOST('planned_workloadmin', 'int') * 60 : 0) : '');
 
-// 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();
-}
-
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcard', 'globalcard'));
 
@@ -69,6 +62,17 @@
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
+if ($id > 0 || $ref) {
+	$object->fetch($id, $ref);
+}
+
+// Security check
+$socid = 0;
+
+restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
+
+
+
 /*
  * Actions
  */
@@ -85,7 +89,6 @@
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 	}
 	if (!$error) {
-		$object->fetch($id, $ref);
 		$object->oldcopy = clone $object;
 
 		$tmparray = explode('_', $_POST['task_parent']);
@@ -121,17 +124,15 @@
 }
 
 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();
+	$result = $projectstatic->fetch($object->fk_project);
+	$projectstatic->fetch_thirdparty();
 
-		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 {
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action = '';
-		}
+	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 {
+		setEventMessages($object->error, $object->errors, 'errors');
+		$action = '';
 	}
 }
 
@@ -149,8 +150,6 @@
 
 // Build doc
 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'));
@@ -172,17 +171,15 @@
 if ($action == 'remove_file' && $user->rights->projet->creer) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	if ($object->fetch($id, $ref) >= 0) {
-		$langs->load("other");
-		$upload_dir = $conf->projet->dir_output;
-		$file = $upload_dir.'/'.dol_sanitizeFileName(GETPOST('file'));
+	$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');
-		}
+	$ret = dol_delete_file($file);
+	if ($ret) {
+		setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 	}
 }
 
@@ -198,452 +195,450 @@
 $formfile = new FormFile($db);
 
 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();
-		}
+	$res = $object->fetch_optionals();
+	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();
-		}
+	$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();
+	}
 
-		$object->project = clone $projectstatic;
+	$object->project = clone $projectstatic;
 
-		//$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
+	//$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
 
-		if (!empty($withproject)) {
-			// Tabs for project
-			$tab = 'tasks';
-			$head = project_prepare_head($projectstatic);
-			print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'), 0, '', '');
+	if (!empty($withproject)) {
+		// Tabs for project
+		$tab = 'tasks';
+		$head = project_prepare_head($projectstatic);
+		print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'), 0, '', '');
 
-			$param = ($mode == 'mine' ? '&mode=mine' : '');
+		$param = ($mode == 'mine' ? '&mode=mine' : '');
 
-			// Project card
+		// Project card
 
-			$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-			$morehtmlref = '<div class="refidno">';
-			// Title
-			$morehtmlref .= $projectstatic->title;
-			// Thirdparty
-			if ($projectstatic->thirdparty->id > 0) {
-				$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
-			}
-			$morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		// Title
+		$morehtmlref .= $projectstatic->title;
+		// Thirdparty
+		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) {
-				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-				$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-			}
+		// Define a complementary filter for search of next/prev ref.
+		if (!$user->rights->projet->all->lire) {
+			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+			$projectstatic->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		}
 
-			dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-			print '<div class="fichecenter">';
-			print '<div class="fichehalfleft">';
-			print '<div class="underbanner clearboth"></div>';
-
-			print '<table class="border tableforfield centpercent">';
-
-			// Usage
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
-				print '<tr><td class="tdtop">';
-				print $langs->trans("Usage");
-				print '</td>';
-				print '<td>';
-				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)) {
-					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_HIDE_TASKS) && !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);
-					print '<br>';
-				}
-				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);
-				}
-				print '</td></tr>';
-			}
+		dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-			// Visibility
-			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-			if ($projectstatic->public) {
-				print $langs->trans('SharedProject');
-			} else {
-				print $langs->trans('PrivateProject');
-			}
-			print '</td></tr>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-			// Date start - end
-			print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-			$start = dol_print_date($projectstatic->date_start, 'day');
-			print ($start ? $start : '?');
-			$end = dol_print_date($projectstatic->date_end, 'day');
-			print ' - ';
-			print ($end ? $end : '?');
-			if ($projectstatic->hasDelay()) {
-				print img_warning("Late");
-			}
-			print '</td></tr>';
+		print '<table class="border tableforfield centpercent">';
 
-			// 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);
+		// Usage
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+			print '<tr><td class="tdtop">';
+			print $langs->trans("Usage");
+			print '</td>';
+			print '<td>';
+			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)) {
+				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_HIDE_TASKS) && !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);
+				print '<br>';
+			}
+			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);
 			}
 			print '</td></tr>';
+		}
 
-			// Other attributes
-			$cols = 2;
-			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-
-			print '</table>';
-
-			print '</div>';
-
-			print '<div class="fichehalfright">';
-			print '<div class="ficheaddleft">';
-			print '<div class="underbanner clearboth"></div>';
+		// Visibility
+		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+		if ($projectstatic->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>';
+		$start = dol_print_date($projectstatic->date_start, 'day');
+		print ($start ? $start : '?');
+		$end = dol_print_date($projectstatic->date_end, 'day');
+		print ' - ';
+		print ($end ? $end : '?');
+		if ($projectstatic->hasDelay()) {
+			print img_warning("Late");
+		}
+		print '</td></tr>';
 
-			print '<table class="border centpercent">';
+		// 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);
+		}
+		print '</td></tr>';
 
-			// Description
-			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-			print nl2br($projectstatic->description);
-			print '</td></tr>';
+		// Other attributes
+		$cols = 2;
+		//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-			// Categories
-			if ($conf->categorie->enabled) {
-				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-				print $form->showCategories($projectstatic->id, 'project', 1);
-				print "</td></tr>";
-			}
+		print '</table>';
 
-			print '</table>';
+		print '</div>';
 
-			print '</div>';
-			print '</div>';
-			print '</div>';
+		print '<div class="fichehalfright">';
+		print '<div class="ficheaddleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-			print '<div class="clearboth"></div>';
+		print '<table class="border centpercent">';
 
-			print dol_get_fiche_end();
+		// Description
+		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+		print nl2br($projectstatic->description);
+		print '</td></tr>';
 
-			print '<br>';
+		// Categories
+		if ($conf->categorie->enabled) {
+			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+			print $form->showCategories($projectstatic->id, 'project', 1);
+			print "</td></tr>";
 		}
 
-		/*
-		 * Actions
-		*/
-		/*print '<div class="tabsAction">';
-
-		if ($user->rights->projet->all->creer || $user->rights->projet->creer)
-		{
-		if ($projectstatic->public || $userWrite > 0)
-		{
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create'.$param.'">'.$langs->trans('AddTask').'</a>';
-		}
-		else
-		{
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTask').'</a>';
-		}
-		}
-		else
-		{
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'</a>';
-		}
+		print '</table>';
 
 		print '</div>';
-		*/
+		print '</div>';
+		print '</div>';
 
-		// To verify role of users
-		//$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
-		//$arrayofuseridoftask=$object->getListContactId('internal');
+		print '<div class="clearboth"></div>';
 
-		$head = task_prepare_head($object);
+		print dol_get_fiche_end();
 
-		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">';
-			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
-			print '<input type="hidden" name="id" value="'.$object->id.'">';
+		print '<br>';
+	}
 
-			print dol_get_fiche_head($head, 'task_task', $langs->trans("Task"), 0, 'projecttask', 0, '', '');
+	/*
+	 * Actions
+	*/
+	/*print '<div class="tabsAction">';
 
-			print '<table class="border centpercent">';
+	if ($user->rights->projet->all->creer || $user->rights->projet->creer)
+	{
+	if ($projectstatic->public || $userWrite > 0)
+	{
+	print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create'.$param.'">'.$langs->trans('AddTask').'</a>';
+	}
+	else
+	{
+	print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('AddTask').'</a>';
+	}
+	}
+	else
+	{
+	print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('AddTask').'</a>';
+	}
 
-			// Ref
-			print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Ref").'</td>';
-			print '<td><input class="minwidth100" name="taskref" value="'.$object->ref.'"></td></tr>';
+	print '</div>';
+	*/
 
-			// Label
-			print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
-			print '<td><input class="minwidth500" name="label" value="'.$object->label.'"></td></tr>';
+	// To verify role of users
+	//$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
+	//$arrayofuseridoftask=$object->getListContactId('internal');
 
-			// Project
-			if (empty($withproject)) {
-				print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
-				print $projectstatic->getNomUrl(1);
-				print '</td></tr>';
+	$head = task_prepare_head($object);
 
-				// Third party
-				print '<td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-				if ($projectstatic->societe->id) {
-					print $projectstatic->societe->getNomUrl(1);
-				} else {
-					print '&nbsp;';
-				}
-				print '</td></tr>';
-			}
+	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">';
+		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-			// Task parent
-			print '<tr><td>'.$langs->trans("ChildOfProjectTask").'</td><td>';
-			print $formother->selectProjectTasks($object->fk_task_parent, $projectstatic->id, 'task_parent', ($user->admin ? 0 : 1), 0, 0, 0, $object->id);
-			print '</td></tr>';
+		print dol_get_fiche_head($head, 'task_task', $langs->trans("Task"), 0, 'projecttask', 0, '', '');
 
-			// Date start
-			print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-			print $form->selectDate($object->date_start, 'dateo', 1, 1, 0, '', 1, 0);
-			print '</td></tr>';
+		print '<table class="border centpercent">';
 
-			// Date end
-			print '<tr><td>'.$langs->trans("Deadline").'</td><td>';
-			print $form->selectDate($object->date_end ? $object->date_end : -1, 'datee', 1, 1, 0, '', 1, 0);
-			print '</td></tr>';
+		// Ref
+		print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Ref").'</td>';
+		print '<td><input class="minwidth100" name="taskref" value="'.$object->ref.'"></td></tr>';
 
-			// Planned workload
-			print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
-			print $form->select_duration('planned_workload', $object->planned_workload, 0, 'text');
-			print '</td></tr>';
+		// Label
+		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
+		print '<td><input class="minwidth500" name="label" value="'.$object->label.'"></td></tr>';
 
-			// Progress declared
-			print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td>';
-			print $formother->select_percent($object->progress, 'progress', 0, 5, 0, 100, 1);
+		// Project
+		if (empty($withproject)) {
+			print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
+			print $projectstatic->getNomUrl(1);
 			print '</td></tr>';
 
-			// Description
-			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
-			print '<td>';
-			print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$object->description.'</textarea>';
+			// Third party
+			print '<td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
+			if ($projectstatic->societe->id) {
+				print $projectstatic->societe->getNomUrl(1);
+			} else {
+				print '&nbsp;';
+			}
 			print '</td></tr>';
+		}
 
-			// Other options
-			$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)) {
-				print $object->showOptionals($extrafields, 'edit');
-			}
+		// Task parent
+		print '<tr><td>'.$langs->trans("ChildOfProjectTask").'</td><td>';
+		print $formother->selectProjectTasks($object->fk_task_parent, $projectstatic->id, 'task_parent', ($user->admin ? 0 : 1), 0, 0, 0, $object->id);
+		print '</td></tr>';
+
+		// Date start
+		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+		print $form->selectDate($object->date_start, 'dateo', 1, 1, 0, '', 1, 0);
+		print '</td></tr>';
+
+		// Date end
+		print '<tr><td>'.$langs->trans("Deadline").'</td><td>';
+		print $form->selectDate($object->date_end ? $object->date_end : -1, 'datee', 1, 1, 0, '', 1, 0);
+		print '</td></tr>';
+
+		// Planned workload
+		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
+		print $form->select_duration('planned_workload', $object->planned_workload, 0, 'text');
+		print '</td></tr>';
+
+		// Progress declared
+		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td>';
+		print $formother->select_percent($object->progress, 'progress', 0, 5, 0, 100, 1);
+		print '</td></tr>';
+
+		// Description
+		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
+		print '<td>';
+		print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$object->description.'</textarea>';
+		print '</td></tr>';
+
+		// Other options
+		$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)) {
+			print $object->showOptionals($extrafields, 'edit');
+		}
 
-			print '</table>';
+		print '</table>';
 
-			print dol_get_fiche_end();
+		print dol_get_fiche_end();
 
-			print '<div class="center">';
-			print '<input type="submit" class="button" name="update" value="'.$langs->trans("Modify").'"> &nbsp; ';
-			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-			print '</div>';
+		print '<div class="center">';
+		print '<input type="submit" class="button" name="update" value="'.$langs->trans("Modify").'"> &nbsp; ';
+		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '</div>';
 
-			print '</form>';
-		} else {
-			/*
-			 * Fiche tache en mode visu
-			 */
-			$param = ($withproject ? '&withproject=1' : '');
-			$linkback = $withproject ? '<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>' : '';
+		print '</form>';
+	} else {
+		/*
+		 * Fiche tache en mode visu
+		 */
+		$param = ($withproject ? '&withproject=1' : '');
+		$linkback = $withproject ? '<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>' : '';
 
-			print dol_get_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
+		print dol_get_fiche_head($head, 'task_task', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
-			if ($action == 'delete') {
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".GETPOST("id", 'int').'&withproject='.$withproject, $langs->trans("DeleteATask"), $langs->trans("ConfirmDeleteATask"), "confirm_delete");
-			}
+		if ($action == 'delete') {
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".GETPOST("id", 'int').'&withproject='.$withproject, $langs->trans("DeleteATask"), $langs->trans("ConfirmDeleteATask"), "confirm_delete");
+		}
 
-			if (!GETPOST('withproject') || empty($projectstatic->id)) {
-				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
-				$object->next_prev_filter = " fk_projet IN (".$db->sanitize($projectsListId).")";
-			} else {
-				$object->next_prev_filter = " fk_projet = ".((int) $projectstatic->id);
-			}
+		if (!GETPOST('withproject') || empty($projectstatic->id)) {
+			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+			$object->next_prev_filter = " fk_projet IN (".$db->sanitize($projectsListId).")";
+		} else {
+			$object->next_prev_filter = " fk_projet = ".((int) $projectstatic->id);
+		}
 
-			$morehtmlref = '';
+		$morehtmlref = '';
 
-			// Project
-			if (empty($withproject)) {
-				$morehtmlref .= '<div class="refidno">';
-				$morehtmlref .= $langs->trans("Project").': ';
-				$morehtmlref .= $projectstatic->getNomUrl(1);
-				$morehtmlref .= '<br>';
+		// Project
+		if (empty($withproject)) {
+			$morehtmlref .= '<div class="refidno">';
+			$morehtmlref .= $langs->trans("Project").': ';
+			$morehtmlref .= $projectstatic->getNomUrl(1);
+			$morehtmlref .= '<br>';
 
-				// Third party
-				$morehtmlref .= $langs->trans("ThirdParty").': ';
-				if (!empty($projectstatic->thirdparty)) {
-					$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
-				}
-				$morehtmlref .= '</div>';
+			// Third party
+			$morehtmlref .= $langs->trans("ThirdParty").': ';
+			if (!empty($projectstatic->thirdparty)) {
+				$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
 			}
+			$morehtmlref .= '</div>';
+		}
 
-			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
-
-			print '<div class="fichecenter">';
-			print '<div class="fichehalfleft">';
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 
-			print '<div class="underbanner clearboth"></div>';
-			print '<table class="border centpercent tableforfield">';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
 
-			// Task parent
-			print '<tr><td>'.$langs->trans("ChildOfTask").'</td><td>';
-			if ($object->fk_task_parent > 0) {
-				$tasktmp = new Task($db);
-				$tasktmp->fetch($object->fk_task_parent);
-				print $tasktmp->getNomUrl(1);
-			}
-			print '</td></tr>';
-
-			// Date start - Date end
-			print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("Deadline").'</td><td colspan="3">';
-			$start = dol_print_date($object->date_start, 'dayhour');
-			print ($start ? $start : '?');
-			$end = dol_print_date($object->date_end, 'dayhour');
-			print ' - ';
-			print ($end ? $end : '?');
-			if ($object->hasDelay()) {
-				print img_warning("Late");
-			}
-			print '</td></tr>';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">';
 
-			// Planned workload
-			print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">';
-			if ($object->planned_workload != '') {
-				print convertSecondToTime($object->planned_workload, 'allhourmin');
-			}
-			print '</td></tr>';
+		// Task parent
+		print '<tr><td>'.$langs->trans("ChildOfTask").'</td><td>';
+		if ($object->fk_task_parent > 0) {
+			$tasktmp = new Task($db);
+			$tasktmp->fetch($object->fk_task_parent);
+			print $tasktmp->getNomUrl(1);
+		}
+		print '</td></tr>';
+
+		// Date start - Date end
+		print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("Deadline").'</td><td colspan="3">';
+		$start = dol_print_date($object->date_start, 'dayhour');
+		print ($start ? $start : '?');
+		$end = dol_print_date($object->date_end, 'dayhour');
+		print ' - ';
+		print ($end ? $end : '?');
+		if ($object->hasDelay()) {
+			print img_warning("Late");
+		}
+		print '</td></tr>';
 
-			// Description
-			print '<td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
-			print nl2br($object->description);
-			print '</td></tr>';
+		// Planned workload
+		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">';
+		if ($object->planned_workload != '') {
+			print convertSecondToTime($object->planned_workload, 'allhourmin');
+		}
+		print '</td></tr>';
 
-			print '</table>';
-			print '</div>';
+		// Description
+		print '<td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
+		print nl2br($object->description);
+		print '</td></tr>';
 
-			print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '</table>';
+		print '</div>';
 
-			print '<div class="underbanner clearboth"></div>';
-			print '<table class="border centpercent tableforfield">';
+		print '<div class="fichehalfright"><div class="ficheaddleft">';
 
-			// Progress declared
-			print '<tr><td class="titlefield">'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
-			if ($object->progress != '') {
-				print $object->progress.' %';
-			}
-			print '</td></tr>';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">';
 
-			// Progress calculated
-			print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td colspan="3">';
-			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 %';
-				}
+		// Progress declared
+		print '<tr><td class="titlefield">'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
+		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 != '') {
+			$tmparray = $object->getSummaryOfTimeSpent();
+			if ($tmparray['total_duration'] > 0 && !empty($object->planned_workload)) {
+				print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
 			} else {
-				print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
+				print '0 %';
 			}
-			print '</td></tr>';
+		} else {
+			print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
+		}
+		print '</td></tr>';
 
-			// Other attributes
-			$cols = 3;
-			$parameters = array('socid'=>$socid);
-			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+		// Other attributes
+		$cols = 3;
+		$parameters = array('socid'=>$socid);
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-			print '</table>';
+		print '</table>';
 
-			print '</div>';
-			print '</div>';
+		print '</div>';
+		print '</div>';
 
-			print '</div>';
-			print '<div class="clearboth"></div>';
+		print '</div>';
+		print '<div class="clearboth"></div>';
 
-			print dol_get_fiche_end();
-		}
+		print dol_get_fiche_end();
+	}
 
 
-		if ($action != 'edit') {
-			/*
-			 * Actions
-			  */
+	if ($action != 'edit') {
+		/*
+		 * Actions
+		  */
 
-			print '<div class="tabsAction">';
+		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)) {
-				// Modify
-				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>';
-				}
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+		// modified by hook
+		if (empty($reshook)) {
+			// Modify
+			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()) {
-						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>';
-					}
+			// Delete
+			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("NotAllowed").'">'.$langs->trans('Delete').'</a>';
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
 				}
-
-				print '</div>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 			}
 
-			print '<div class="fichecenter"><div class="fichehalfleft">';
-			print '<a name="builddoc"></a>'; // ancre
+			print '</div>';
+		}
+
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
 
-			/*
-			 * Generated documents
-			 */
-			$filename = dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
-			$filedir = $conf->projet->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
-			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-			$genallowed = ($user->rights->projet->lire);
-			$delallowed = ($user->rights->projet->creer);
+		/*
+		 * Generated documents
+		 */
+		$filename = dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
+		$filedir = $conf->projet->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
+		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed = ($user->rights->projet->lire);
+		$delallowed = ($user->rights->projet->creer);
 
-			print $formfile->showdocuments('project_task', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf);
+		print $formfile->showdocuments('project_task', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf);
 
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-			// List of actions on element
-			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-			$formactions = new FormActions($db);
-			$defaultthirdpartyid = $socid > 0 ? $socid : $object->project->socid;
-			$formactions->showactions($object, 'task', $defaultthirdpartyid, 1, '', 10, 'withproject='.$withproject);
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$defaultthirdpartyid = $socid > 0 ? $socid : $object->project->socid;
+		$formactions->showactions($object, 'task', $defaultthirdpartyid, 1, '', 10, 'withproject='.$withproject);
 
-			print '</div></div></div>';
-		}
+		print '</div></div></div>';
 	}
 }
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index a85fdcf2db114..8e5877c7d0dfb 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -107,6 +107,13 @@
 $extrafields->fetch_name_optionals_label($projectstatic->table_element);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
+if ($id > 0 || $ref) {
+	$object->fetch($id, $ref);
+}
+
+restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
+
+
 
 /*
  * Actions