diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 69543c2a16344ae2470743ee90d63384cf04b7f9..4c19d85888b6d7ce299b77ea23bc5decb5c63c9f 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2010      Regis Houssin        <regis@dolibarr.fr>
+/* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2010	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2012	Regis Houssin			<regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,17 +33,21 @@ require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 $langs->load("projects");
 $langs->load("companies");
 
-$taskid = isset($_GET["id"])?$_GET["id"]:'';
-$id = GETPOST('id','int');
-$ref= GETPOST('ref');
-$action=GETPOST('action');
-$withproject=GETPOST('withproject');
+$id=GETPOST('id','int');
+$ref=GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+$withproject=GETPOST('withproject','int');
+$project_ref=GETPOST('project_ref','alpha');
 
 // Security check
 $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;
-//$result = restrictedArea($user, 'projet', $taskid, 'projet_task');
-if (!$user->rights->projet->lire) accessforbidden();
+//$result = restrictedArea($user, 'projet', $id, 'projet_task');
+if (! $user->rights->projet->lire) accessforbidden();
+
+$object = new Task($db);
+$projectstatic = new Project($db);
 
 
 /*
@@ -53,31 +57,28 @@ if (!$user->rights->projet->lire) accessforbidden();
 // Add new contact
 if ($action == 'addcontact' && $user->rights->projet->creer)
 {
+	$result = $object->fetch($id);
 
-	$result = 0;
-	$task = new Task($db);
-	$result = $task->fetch($taskid);
-
-    if ($result > 0 && $taskid > 0)
+    if ($result > 0 && $id > 0)
     {
-  		$result = $task->add_contact($_POST["contactid"], $_POST["type"], $_POST["source"]);
+  		$result = $object->add_contact($_POST["contactid"], $_POST["type"], $_POST["source"]);
     }
 
 	if ($result >= 0)
 	{
-		Header("Location: contact.php?id=".$task->id);
+		Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
 	}
 	else
 	{
-		if ($task->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
 		}
 		else
 		{
-			$mesg = '<div class="error">'.$task->error.'</div>';
+			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
 	}
 }
@@ -85,10 +86,9 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 // bascule du statut d'un contact
 if ($action == 'swapstatut' && $user->rights->projet->creer)
 {
-	$task = new Task($db);
-	if ($task->fetch($taskid))
+	if ($object->fetch($id))
 	{
-	    $result=$task->swapContactStatus(GETPOST('ligne'));
+	    $result=$object->swapContactStatus(GETPOST('ligne'));
 	}
 	else
 	{
@@ -99,13 +99,12 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 // Efface un contact
 if ($action == 'deleteline' && $user->rights->projet->creer)
 {
-	$task = new Task($db);
-	$task->fetch($taskid);
-	$result = $task->delete_contact($_GET["lineid"]);
+	$object->fetch($id);
+	$result = $object->delete_contact($_GET["lineid"]);
 
 	if ($result >= 0)
 	{
-		Header("Location: contact.php?id=".$task->id);
+		Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
 	}
 	else
@@ -114,6 +113,22 @@ if ($action == 'deleteline' && $user->rights->projet->creer)
 	}
 }
 
+// Retreive 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)
+	{
+		$tasksarray=$object->getTasksArray(0, 0, $projectstatic->id, $socid, 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));
+		}
+	}
+}
 
 /*
  * View
@@ -125,8 +140,6 @@ $form = new Form($db);
 $formcompany   = new FormCompany($db);
 $contactstatic = new Contact($db);
 $userstatic = new User($db);
-$project = new Project($db);
-$task = new Task($db);
 
 
 /* *************************************************************************** */
@@ -137,19 +150,19 @@ $task = new Task($db);
 
 if ($id > 0 || ! empty($ref))
 {
-	if ($task->fetch($id,$ref) > 0)
+	if ($object->fetch($id) > 0)
 	{
-		$result=$project->fetch($task->fk_project);
-		if (! empty($project->socid)) $project->societe->fetch($project->socid);
+		$result=$projectstatic->fetch($object->fk_project);
+		if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
 
-		$userWrite  = $project->restrictedProjectArea($user,'write');
+		$userWrite  = $projectstatic->restrictedProjectArea($user,'write');
 
 		if ($withproject)
 		{
     		// Tabs for project
     		$tab='tasks';
-    		$head=project_prepare_head($project);
-    		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($project->public?'projectpub':'project'));
+    		$head=project_prepare_head($projectstatic);
+    		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project'));
 
     		$param=($mode=='mine'?'&mode=mine':'');
 
@@ -162,28 +175,28 @@ if ($id > 0 || ! empty($ref))
     		// Define a complementary filter for search of next/prev ref.
     		if (! $user->rights->projet->all->lire)
     		{
-    		    $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0);
-    		    $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
+    		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,0);
+    		    $projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
     		}
-    		print $form->showrefnav($project,'ref','',1,'ref','ref','',$param);
+    		print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1');
     		print '</td></tr>';
 
-    		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$project->title.'</td></tr>';
+    		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projectstatic->title.'</td></tr>';
 
     		print '<tr><td>'.$langs->trans("Company").'</td><td>';
-    		if (! empty($project->societe->id)) print $project->societe->getNomUrl(1);
+    		if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1);
     		else print '&nbsp;';
     		print '</td>';
     		print '</tr>';
 
     		// Visibility
     		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-    		if ($project->public) print $langs->trans('SharedProject');
+    		if ($projectstatic->public) print $langs->trans('SharedProject');
     		else print $langs->trans('PrivateProject');
     		print '</td></tr>';
 
     		// Statut
-    		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$project->getLibStatut(4).'</td></tr>';
+    		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';
 
     		print '</table>';
 
@@ -193,12 +206,12 @@ if ($id > 0 || ! empty($ref))
 		}
 
 		// To verify role of users
-		//$userAccess = $project->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
-		//$arrayofuseridoftask=$task->getListContactId('internal');
+		//$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
+		//$arrayofuseridoftask=$object->getListContactId('internal');
 
 		dol_htmloutput_mesg($mesg);
 
-		$head = task_prepare_head($task);
+		$head = task_prepare_head($object);
 		dol_fiche_head($head, 'task_contact', $langs->trans("Task"), 0, 'projecttask');
 
 
@@ -208,33 +221,33 @@ if ($id > 0 || ! empty($ref))
 		print '<table class="border" width="100%">';
 
 		$param=(GETPOST('withproject')?'&withproject=1':'');
-		$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$project->id.'">'.$langs->trans("BackToList").'</a>':'';
+		$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
 
 		// Ref
 		print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">';
-		if (! GETPOST('withproject') || empty($project->id))
+		if (! GETPOST('withproject') || empty($projectstatic->id))
 		{
-		    $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
-		    $task->next_prev_filter=" fk_projet in (".$projectsListId.")";
+		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1);
+		    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
-		else $task->next_prev_filter=" fk_projet = ".$project->id;
-	    print $form->showrefnav($task,'id',$linkback,1,'rowid','ref','',$param);
+		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
+	    print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
 		print '</td></tr>';
 
 		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$task->label.'</td></tr>';
+		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 
 		// Project
 		if (empty($withproject))
 		{
     		print '<tr><td>'.$langs->trans("Project").'</td><td>';
-    		print $project->getNomUrl(1);
+    		print $projectstatic->getNomUrl(1);
     		print '</td></tr>';
 
     		// Customer
     		print "<tr><td>".$langs->trans("Company")."</td>";
     		print '<td colspan="3">';
-    		if ($project->societe->id > 0) print $project->societe->getNomUrl(1);
+    		if ($projectstatic->societe->id > 0) print $projectstatic->societe->getNomUrl(1);
     		else print '&nbsp;';
     		print '</td></tr>';
 		}
@@ -283,11 +296,11 @@ if ($id > 0 || ! empty($ref))
 
 			print '<td colspan="1">';
 			// On recupere les id des users deja selectionnes
-			$contactsofproject=$project->getListContactId('internal');
+			$contactsofproject=$projectstatic->getListContactId('internal');
 			$form->select_users($user->id,'contactid',0,'',0,'',$contactsofproject);
 			print '</td>';
 			print '<td>';
-			$formcompany->selectTypeContact($task, '', 'type','internal','rowid');
+			$formcompany->selectTypeContact($object, '', 'type','internal','rowid');
 			print '</td>';
 			print '<td align="right" colspan="3" ><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
 			print '</tr>';
@@ -295,13 +308,13 @@ if ($id > 0 || ! empty($ref))
 			print '</form>';
 
 			// Line to add an external contact. Only if project linked to a third party.
-			if ($project->socid)
+			if ($projectstatic->socid)
 			{
-				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
+				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 				print '<input type="hidden" name="action" value="addcontact">';
 				print '<input type="hidden" name="source" value="external">';
-				print '<input type="hidden" name="id" value="'.$id.'">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 				$var=!$var;
 				print "<tr $bc[$var]>";
@@ -311,18 +324,18 @@ if ($id > 0 || ! empty($ref))
 				print '</td>';
 
 				print '<td colspan="1">';
-				$thirdpartyofproject=$project->getListContactId('thirdparty');
-				$selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$project->societe->id;
-				$selectedCompany = $formcompany->selectCompaniesForNewContact($task, 'id', $selectedCompany, 'newcompany',$thirdpartyofproject);
+				$thirdpartyofproject=$projectstatic->getListContactId('thirdparty');
+				$selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$projectstatic->societe->id;
+				$selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany',$thirdpartyofproject);
 				print '</td>';
 
 				print '<td colspan="1">';
-				$contactofproject=$project->getListContactId('external');
+				$contactofproject=$projectstatic->getListContactId('external');
 				$nbofcontacts=$form->select_contacts($selectedCompany,'','contactid',0,'',$contactofproject);
 				if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
 				print '</td>';
 				print '<td>';
-				$formcompany->selectTypeContact($task, '', 'type','external','rowid');
+				$formcompany->selectTypeContact($object, '', 'type','external','rowid');
 				print '</td>';
 				print '<td align="right" colspan="3" ><input type="submit" class="button" value="'.$langs->trans("Add").'"';
 				if (! $nbofcontacts) print ' disabled="disabled"';
@@ -348,7 +361,7 @@ if ($id > 0 || ! empty($ref))
 
 		foreach(array('internal','external') as $source)
 		{
-			$tab = $task->liste_contact(-1,$source);
+			$tab = $object->liste_contact(-1,$source);
 			$num=count($tab);
 
 			$i = 0;
@@ -405,9 +418,9 @@ if ($id > 0 || ! empty($ref))
 				// Statut
 				print '<td align="center">';
 				// Activation desativation du contact
-				if ($task->statut >= 0) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'&amp;action=swapstatut&amp;ligne='.$tab[$i]['rowid'].'">';
+				if ($object->statut >= 0) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=swapstatut&amp;ligne='.$tab[$i]['rowid'].'">';
 				print $contactstatic->LibStatut($tab[$i]['status'],3);
-				if ($task->statut >= 0) print '</a>';
+				if ($object->statut >= 0) print '</a>';
 				print '</td>';
 
 				// Icon update et delete
@@ -415,7 +428,7 @@ if ($id > 0 || ! empty($ref))
 				if ($user->rights->projet->creer)
 				{
 					print '&nbsp;';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'&amp;action=deleteline&amp;lineid='.$tab[$i]['rowid'].'">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$tab[$i]['rowid'].'">';
 					print img_delete();
 					print '</a>';
 				}
@@ -436,6 +449,5 @@ if ($id > 0 || ! empty($ref))
 
 
 llxFooter();
-
 $db->close();
 ?>
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 12840e9dd34468209f2313c415ad3d0dab8018e7..37856acec080035f02476e1ae915a224679fe865 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
+/* Copyright (C) 2010-2012 Regis Houssin <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,12 +32,14 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 $langs->load('projects');
 $langs->load('other');
 
-$action=GETPOST('action');
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
 $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 $id = GETPOST('id','int');
-$ref= GETPOST('ref');
-$withproject=GETPOST('withproject');
+$ref= GETPOST('ref','alpha');
+$withproject=GETPOST('withproject','int');
+$project_ref = GETPOST('project_ref','alpha');
 
 // Security check
 $socid=0;
@@ -57,21 +59,23 @@ if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="name";
 
 
+$object = new Task($db);
+$projectstatic = new Project($db);
 
-$task = new Task($db);
-
-if ($task->fetch($id,$ref) > 0)
-{
-	$projectstatic = new Project($db);
-	$projectstatic->fetch($task->fk_project);
-
-	if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
-
-	$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($task->ref);
-}
-else
+if ($id > 0 || ! empty($ref))
 {
-	dol_print_error($db);
+	if ($object->fetch($id,$ref) > 0)
+	{
+		$projectstatic->fetch($object->fk_project);
+		
+		if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
+		
+		$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
+	}
+	else
+	{
+		dol_print_error($db);
+	}
 }
 
 
@@ -118,143 +122,155 @@ if ($action=='delete')
 	$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
 }
 
-
-/*
- * View
- */
-
-$form = new Form($db);
-$project = new Project($db);
-$task = new Task($db);
-
-llxHeader('',$langs->trans('Project'));
-
-if ($id > 0 || ! empty($ref))
+// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
+if (! empty($project_ref) && ! empty($withproject))
 {
-    if ($task->fetch($id,$ref) >= 0)
-    {
-		$result=$project->fetch($task->fk_project);
-		if (! empty($project->socid)) $project->societe->fetch($project->socid);
-
-		$userWrite  = $project->restrictedProjectArea($user,'write');
-
-		if ($withproject)
+	if ($projectstatic->fetch(0,$project_ref) > 0)
+	{
+		$tasksarray=$object->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
+		if (count($tasksarray) > 0)
 		{
-    		// Tabs for project
-    		$tab='tasks';
-    		$head=project_prepare_head($project);
-    		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($project->public?'projectpub':'project'));
-
-    		$param=($mode=='mine'?'&mode=mine':'');
-
-    		print '<table class="border" width="100%">';
-
-    		// Ref
-    		print '<tr><td width="30%">';
-    		print $langs->trans("Ref");
-    		print '</td><td>';
-    		// Define a complementary filter for search of next/prev ref.
-    		if (! $user->rights->projet->all->lire)
-    		{
-    		    $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0);
-    		    $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
-    		}
-    		print $form->showrefnav($project,'ref','',1,'ref','ref','',$param);
-    		print '</td></tr>';
-
-    		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$project->title.'</td></tr>';
-
-    		print '<tr><td>'.$langs->trans("Company").'</td><td>';
-    		if (! empty($project->societe->id)) print $project->societe->getNomUrl(1);
-    		else print '&nbsp;';
-    		print '</td>';
-    		print '</tr>';
-
-    		// Visibility
-    		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-    		if ($project->public) print $langs->trans('SharedProject');
-    		else print $langs->trans('PrivateProject');
-    		print '</td></tr>';
-
-    		// Statut
-    		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$project->getLibStatut(4).'</td></tr>';
-
-    		print '</table>';
-
-    		dol_fiche_end();
-
-    		print '<br>';
+			$id=$tasksarray[0]->id;
+			$object->fetch($id);
 		}
-
-    	$head = task_prepare_head($task);
-    	dol_fiche_head($head, 'task_document', $langs->trans("Task"), 0, 'projecttask');
-
-    	$param=(GETPOST('withproject')?'&withproject=1':'');
-    	$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$project->id.'">'.$langs->trans("BackToList").'</a>':'';
-
-    	// Files list constructor
-    	$filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-    	$totalsize=0;
-    	foreach($filearray as $key => $file)
-    	{
-    		$totalsize+=$file['size'];
-    	}
-
-    	print '<table class="border" width="100%">';
-
-    	// Ref
-    	print '<tr><td width="30%">';
-    	print $langs->trans("Ref");
-    	print '</td><td colspan="3">';
-		if (! GETPOST('withproject') || empty($project->id))
+		else
 		{
-		    $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
-		    $task->next_prev_filter=" fk_projet in (".$projectsListId.")";
+			Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode)?'':'&mode='.$mode));
 		}
-		else $task->next_prev_filter=" fk_projet = ".$project->id;
-	   	print $form->showrefnav($task,'id',$linkback,1,'rowid','ref','',$param);
-    	print '</td>';
-    	print '</tr>';
-
-    	// Label
-    	print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$task->label.'</td></tr>';
-
-    	// Project
-    	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("Company").'</td><td colspan="3">';
-        	if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
-        	else print '&nbsp;';
-        	print '</td></tr>';
-    	}
-
-    	// Files infos
-    	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-    	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
-
-    	print "</table>\n";
-
-    	dol_fiche_end();
-
-        print '<br>';
+	}
+}
 
-    	dol_htmloutput_mesg($mesg);
 
+/*
+ * View
+ */
 
-    	// Affiche formulaire upload
-    	$formfile=new FormFile($db);
-    	$formfile->form_attach_new_file(DOL_URL_ROOT.'/projet/tasks/document.php?id='.$task->id,'',0,0,$user->rights->projet->creer);
+$form = new Form($db);
 
+llxHeader('',$langs->trans('Project'));
 
-    	// List of document
-    	$param='&id='.$task->id;
-    	$formfile->list_of_documents($filearray,$task,'projet',$param,0,dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($task->ref).'/');
-    }
+if ($object->id > 0)
+{
+	if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
+	
+	$userWrite  = $projectstatic->restrictedProjectArea($user,'write');
+	
+	if (! empty($withproject))
+	{
+		// Tabs for project
+		$tab='tasks';
+		$head=project_prepare_head($projectstatic);
+		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project'));
+	
+		$param=($mode=='mine'?'&mode=mine':'');
+	
+		print '<table class="border" width="100%">';
+	
+		// Ref
+		print '<tr><td width="30%">';
+		print $langs->trans("Ref");
+		print '</td><td>';
+		// Define a complementary filter for search of next/prev ref.
+		if (! $user->rights->projet->all->lire)
+		{
+			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,0);
+			$projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
+		}
+		print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1');
+		print '</td></tr>';
+	
+		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projectstatic->title.'</td></tr>';
+	
+		print '<tr><td>'.$langs->trans("Company").'</td><td>';
+		if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1);
+		else print '&nbsp;';
+		print '</td>';
+		print '</tr>';
+	
+		// Visibility
+		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
+		if ($projectstatic->public) print $langs->trans('SharedProject');
+		else print $langs->trans('PrivateProject');
+		print '</td></tr>';
+	
+		// Statut
+		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';
+	
+		print '</table>';
+	
+		dol_fiche_end();
+	
+		print '<br>';
+	}
+	
+	$head = task_prepare_head($object);
+	dol_fiche_head($head, 'task_document', $langs->trans("Task"), 0, 'projecttask');
+	
+	$param=(GETPOST('withproject')?'&withproject=1':'');
+	$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
+	
+	// Files list constructor
+	$filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$totalsize=0;
+	foreach($filearray as $key => $file)
+	{
+		$totalsize+=$file['size'];
+	}
+	
+	print '<table class="border" width="100%">';
+	
+	// Ref
+	print '<tr><td width="30%">';
+	print $langs->trans("Ref");
+	print '</td><td colspan="3">';
+	if (empty($withproject) || empty($projectstatic->id))
+	{
+		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1);
+		$object->next_prev_filter=" fk_projet in (".$projectsListId.")";
+	}
+	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
+	print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
+	print '</td>';
+	print '</tr>';
+	
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
+	
+	// Project
+	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("Company").'</td><td colspan="3">';
+		if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
+		else print '&nbsp;';
+		print '</td></tr>';
+	}
+	
+	// Files infos
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+	
+	print "</table>\n";
+	
+	dol_fiche_end();
+	
+	print '<br>';
+	
+	dol_htmloutput_mesg($mesg);
+	
+	
+	// Affiche formulaire upload
+	$formfile=new FormFile($db);
+	$formfile->form_attach_new_file(DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id,'',0,0,$user->rights->projet->creer);
+	
+	
+	// List of document
+	$param='&id='.$object->id;
+	$formfile->list_of_documents($filearray,$object,'projet',$param,0,dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref).'/');
 }
 else
 {
@@ -264,6 +280,5 @@ else
 
 
 llxFooter();
-
 $db->close();
 ?>
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 5946dd5d23cd6fda823bd1cdef3856e428aab2da..11cf96ca9c77999a683a7bde3d763a9bf1be2f8d 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010 Regis Houssin  <regis@dolibarr.fr>
+/* Copyright (C) 2010-2012 Regis Houssin  <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,12 +28,14 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
 
 $langs->load('projects');
 
-$action=GETPOST('action');
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
 $mine = $_REQUEST['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');
+$withproject=GETPOST('withproject','int');
+$project_ref = GETPOST('project_ref','alpha');
 
 // Security check
 $socid=0;
@@ -42,7 +44,39 @@ if (!$user->rights->projet->lire) accessforbidden();
 //$result = restrictedArea($user, 'projet', $id, '', 'task'); // TODO ameliorer la verification
 
 $object = new Task($db);
-$object->fetch($id, $ref);
+$projectstatic = new Project($db);
+
+if ($id > 0 || ! empty($ref))
+{
+	if ($object->fetch($id,$ref) > 0)
+	{
+		$projectstatic->fetch($object->fk_project);
+		if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+
+// Retreive 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)
+	{
+		$tasksarray=$object->getTasksArray(0, 0, $projectstatic->id, $socid, 0);
+		if (count($tasksarray) > 0)
+		{
+			$id=$tasksarray[0]->id;
+			$object->fetch($id);
+		}
+		else
+		{
+			Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode)?'':'&mode='.$mode));
+		}
+	}
+}
 
 
 /*
@@ -70,24 +104,20 @@ else if ($action == 'setnote_private' && $user->rights->ficheinter->creer)
 llxHeader();
 
 $form = new Form($db);
-$project = new Project($db);
 $userstatic = new User($db);
 
 $now=dol_now();
 
-if ($id > 0 || ! empty($ref))
+if ($object->id > 0)
 {
-	$result=$project->fetch($object->fk_project);
-	if (! empty($project->socid)) $project->societe->fetch($project->socid);
+	$userWrite  = $projectstatic->restrictedProjectArea($user,'write');
 
-	$userWrite  = $project->restrictedProjectArea($user,'write');
-
-	if ($withproject)
+	if (! empty($withproject))
 	{
 		// Tabs for project
 		$tab='tasks';
-		$head=project_prepare_head($project);
-		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($project->public?'projectpub':'project'));
+		$head=project_prepare_head($projectstatic);
+		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project'));
 
 		$param=($mode=='mine'?'&mode=mine':'');
 
@@ -100,30 +130,30 @@ if ($id > 0 || ! empty($ref))
 		// Define a complementary filter for search of next/prev ref.
 		if (! $user->rights->projet->all->lire)
 		{
-		    $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0);
-		    $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
+		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,0);
+		    $projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
 		}
-		print $form->showrefnav($project,'ref','',1,'ref','ref','',$param);
+		print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1');
 		print '</td></tr>';
 
 		// Project
-		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$project->title.'</td></tr>';
+		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projectstatic->title.'</td></tr>';
 
 		// Company
 		print '<tr><td>'.$langs->trans("Company").'</td><td>';
-		if (! empty($project->societe->id)) print $project->societe->getNomUrl(1);
+		if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1);
 		else print '&nbsp;';
 		print '</td>';
 		print '</tr>';
 
 		// Visibility
 		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-		if ($project->public) print $langs->trans('SharedProject');
+		if ($projectstatic->public) print $langs->trans('SharedProject');
 		else print $langs->trans('PrivateProject');
 		print '</td></tr>';
 
 		// Statut
-		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$project->getLibStatut(4).'</td></tr>';
+		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';
 
 		print '</table>';
 
@@ -138,16 +168,16 @@ if ($id > 0 || ! empty($ref))
 	print '<table class="border" width="100%">';
 
 	$param=(GETPOST('withproject')?'&withproject=1':'');
-	$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$project->id.'">'.$langs->trans("BackToList").'</a>':'';
+	$linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
 
 	// Ref
 	print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
-	if (! GETPOST('withproject') || empty($project->id))
+	if (empty($withproject) || empty($projectstatic->id))
 	{
-	    $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
+	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1);
 	    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 	}
-	else $object->next_prev_filter=" fk_projet = ".$project->id;
+	else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
 	print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
 	print '</td></tr>';
 
@@ -158,12 +188,12 @@ if ($id > 0 || ! empty($ref))
 	if (empty($withproject))
 	{
 		print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
-		print $project->getNomUrl(1);
+		print $projectstatic->getNomUrl(1);
 		print '</td></tr>';
 
 		// Third party
 		print '<tr><td>'.$langs->trans("Company").'</td><td>';
-		if ($project->societe->id > 0) print $project->societe->getNomUrl(1);
+		if ($projectstatic->societe->id > 0) print $projectstatic->societe->getNomUrl(1);
 		else print'&nbsp;';
 		print '</td></tr>';
 	}
@@ -180,7 +210,7 @@ if ($id > 0 || ! empty($ref))
 	dol_fiche_end();
 }
 
-llxFooter();
 
+llxFooter();
 $db->close();
 ?>
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 261dbd2d98509b1c3c338f99bcfe8cc4418bdd1a..b31b2ccb32847131587218202eb72348a10f9cb9 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2010      Regis Houssin        <regis@dolibarr.fr>
+/* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2012	Regis Houssin			<regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 /**
  *	\file       htdocs/projet/tasks/task.php
- *	\ingroup    projet
+ *	\ingroup    project
  *	\brief      Page of a project task
  */
 
@@ -29,17 +29,20 @@ require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
 
-$taskid = GETPOST('id','int');
-$taskref = GETPOST("ref");
-$id = GETPOST('id','int');
-$ref= GETPOST('ref');
-$action=GETPOST('action');
-$withproject=GETPOST('withproject');
+$id=GETPOST('id','int');
+$ref=GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+$withproject=GETPOST('withproject','int');
+$project_ref=GETPOST('project_ref','alpha');
 
 // Security check
 $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;
-if (!$user->rights->projet->lire) accessforbidden();
+if (! $user->rights->projet->lire) accessforbidden();
+
+$object = new Task($db);
+$projectstatic = new Project($db);
 
 
 /*
@@ -57,44 +60,38 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
 	}
 	if (! $error)
 	{
-		$task = new Task($db);
-		$task->fetch($id);
+		$object->fetch($id);
 
 		$tmparray=explode('_',$_POST['task_parent']);
 		$task_parent=$tmparray[1];
 		if (empty($task_parent)) $task_parent = 0;	// If task_parent is ''
 
-		$task->label = $_POST["label"];
-		$task->description = $_POST['description'];
-		$task->fk_task_parent = $task_parent;
-		$task->date_start = dol_mktime(12,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']);
-		$task->date_end = dol_mktime(12,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']);
-		$task->progress = $_POST['progress'];
-
-		$result=$task->update($user);
+		$object->label = $_POST["label"];
+		$object->description = $_POST['description'];
+		$object->fk_task_parent = $task_parent;
+		$object->date_start = dol_mktime(12,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']);
+		$object->date_end = dol_mktime(12,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']);
+		$object->progress = $_POST['progress'];
 
-		$taskid=$task->id;  // On retourne sur la fiche tache
+		$result=$object->update($user);
 	}
 	else
 	{
-		$taskid=$_POST["id"];
 		$action='edit';
 	}
 }
 
-if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->projet->supprimer)
+if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->supprimer)
 {
-	$task = new Task($db);
-	if ($task->fetch($id) >= 0 )
+	if ($object->fetch($id) >= 0 )
 	{
-		$projet = new Project($db);
-		$result=$projet->fetch($task->fk_projet);
-		if (! empty($projet->socid))
+		$result=$projecstatict->fetch($object->fk_projet);
+		if (! empty($projecstatic->socid))
 		{
-			$projet->societe->fetch($projet->socid);
+			$projecstatic->societe->fetch($projecstatic->socid);
 		}
 
-		if ($task->delete($user) > 0)
+		if ($object->delete($user) > 0)
 		{
 			Header("Location: index.php");
 			exit;
@@ -102,12 +99,28 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->
 		else
 		{
 			$langs->load("errors");
-			$mesg='<div class="error">'.$langs->trans($task->error).'</div>';
-			$_POST["action"]='';
+			$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+			$action='';
 		}
 	}
 }
 
+// Retreive 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)
+	{
+		$tasksarray=$object->getTasksArray(0, 0, $projectstatic->id, $socid, 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));
+		}
+	}
+}
 
 /*
  * View
@@ -117,24 +130,22 @@ llxHeader("",$langs->trans("Task"));
 
 $form = new Form($db);
 $formother = new FormOther($db);
-$project = new Project($db);
-$task = new Task($db);
 
-if ($taskid)
+if ($id > 0 || ! empty($ref))
 {
-	if ($task->fetch($taskid) > 0)
+	if ($object->fetch($id) > 0)
 	{
-		$result=$project->fetch($task->fk_project);
-		if (! empty($project->socid)) $project->societe->fetch($project->socid);
+		$result=$projectstatic->fetch($object->fk_project);
+		if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
 
-		$userWrite  = $project->restrictedProjectArea($user,'write');
+		$userWrite  = $projectstatic->restrictedProjectArea($user,'write');
 
-		if ($withproject)
+		if (! empty($withproject))
 		{
     		// Tabs for project
     		$tab='tasks';
-    		$head=project_prepare_head($project);
-    		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($project->public?'projectpub':'project'));
+    		$head=project_prepare_head($projectstatic);
+    		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project'));
 
     		$param=($mode=='mine'?'&mode=mine':'');
 
@@ -147,28 +158,28 @@ if ($taskid)
     		// Define a complementary filter for search of next/prev ref.
     		if (! $user->rights->projet->all->lire)
     		{
-    		    $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0);
-    		    $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
+    		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,0);
+    		    $projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
     		}
-    		print $form->showrefnav($project,'ref','',1,'ref','ref','',$param);
+    		print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1');
     		print '</td></tr>';
 
-    		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$project->title.'</td></tr>';
+    		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projectstatic->title.'</td></tr>';
 
     		print '<tr><td>'.$langs->trans("Company").'</td><td>';
-    		if (! empty($project->societe->id)) print $project->societe->getNomUrl(1);
+    		if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1);
     		else print '&nbsp;';
     		print '</td>';
     		print '</tr>';
 
     		// Visibility
     		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-    		if ($project->public) print $langs->trans('SharedProject');
+    		if ($projectstatic->public) print $langs->trans('SharedProject');
     		else print $langs->trans('PrivateProject');
     		print '</td></tr>';
 
     		// Statut
-    		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$project->getLibStatut(4).'</td></tr>';
+    		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';
 
     		print '</table>';
 
@@ -184,7 +195,7 @@ if ($taskid)
 
 		if ($user->rights->projet->all->creer || $user->rights->projet->creer)
 		{
-		    if ($project->public || $userWrite > 0)
+		    if ($projectstatic->public || $userWrite > 0)
 		    {
 		        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create'.$param.'">'.$langs->trans('AddTask').'</a>';
 		    }
@@ -202,12 +213,12 @@ if ($taskid)
 		*/
 
 		// To verify role of users
-		//$userAccess = $project->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
-		//$arrayofuseridoftask=$task->getListContactId('internal');
+		//$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
+		//$arrayofuseridoftask=$object->getListContactId('internal');
 
 		dol_htmloutput_mesg($mesg);
 
-		$head=task_prepare_head($task);
+		$head=task_prepare_head($object);
 		dol_fiche_head($head, 'task_task', $langs->trans("Task"),0,'projecttask');
 
 		if ($action == 'edit' && $user->rights->projet->creer)
@@ -216,56 +227,56 @@ if ($taskid)
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="update">';
 			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
-			print '<input type="hidden" name="id" value="'.$task->id.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 			print '<table class="border" width="100%">';
 
 			// Ref
 			print '<tr><td width="30%">'.$langs->trans("Ref").'</td>';
-			print '<td>'.$task->ref.'</td></tr>';
+			print '<td>'.$object->ref.'</td></tr>';
 
 			// Label
 			print '<tr><td>'.$langs->trans("Label").'</td>';
-			print '<td><input size="30" name="label" value="'.$task->label.'"></td></tr>';
+			print '<td><input size="30" name="label" value="'.$object->label.'"></td></tr>';
 
 			// Project
 			if (empty($withproject))
 			{
     			print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
-    			print $project->getNomUrl(1);
+    			print $projectstatic->getNomUrl(1);
     			print '</td></tr>';
 
     			// Third party
     			print '<td>'.$langs->trans("Company").'</td><td colspan="3">';
-    			if ($project->societe->id) print $project->societe->getNomUrl(1);
+    			if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
     			else print '&nbsp;';
     			print '</td></tr>';
 			}
 
 			// Task parent
 			print '<tr><td>'.$langs->trans("ChildOfTask").'</td><td>';
-			print $formother->selectProjectTasks($task->fk_task_parent,$project->id, 'task_parent', $user->admin?0:1, 0);
+			print $formother->selectProjectTasks($object->fk_task_parent,$projectstatic->id, 'task_parent', $user->admin?0:1, 0);
 			print '</td></tr>';
 
 			// Date start
 			print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-			print $form->select_date($task->date_start,'dateo');
+			print $form->select_date($object->date_start,'dateo');
 			print '</td></tr>';
 
 			// Date end
 			print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-			print $form->select_date($task->date_end?$task->date_end:-1,'datee');
+			print $form->select_date($object->date_end?$object->date_end:-1,'datee');
 			print '</td></tr>';
 
 			// Progress
 			print '<tr><td>'.$langs->trans("Progress").'</td><td colspan="3">';
-			print $formother->select_percent($task->progress,'progress');
+			print $formother->select_percent($object->progress,'progress');
 			print '</td></tr>';
 
 			// Description
 			print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
 			print '<td>';
-			print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$task->description.'</textarea>';
+			print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$object->description.'</textarea>';
 			print '</td></tr>';
 
 			print '</table>';
@@ -283,7 +294,7 @@ if ($taskid)
 			 * Fiche tache en mode visu
 			 */
 		    $param=($withproject?'&withproject=1':'');
-		    $linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$project->id.'">'.$langs->trans("BackToList").'</a>':'';
+		    $linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
 
 			if ($action == 'delete')
 			{
@@ -297,51 +308,51 @@ if ($taskid)
 			print '<tr><td width="30%">';
 			print $langs->trans("Ref");
 			print '</td><td colspan="3">';
-			if (! GETPOST('withproject') || empty($project->id))
+			if (! GETPOST('withproject') || empty($projectstatic->id))
 			{
-			    $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
-			    $task->next_prev_filter=" fk_projet in (".$projectsListId.")";
+			    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1);
+			    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 			}
-			else $task->next_prev_filter=" fk_projet = ".$project->id;
-			print $form->showrefnav($task,'id',$linkback,1,'rowid','ref','',$param);
+			else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
+			print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
 			print '</td>';
 			print '</tr>';
 
 			// Label
-			print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$task->label.'</td></tr>';
+			print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
 
 			// Project
 			if (empty($withproject))
 			{
     			print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
-    			print $project->getNomUrl(1);
+    			print $projectstatic->getNomUrl(1);
     			print '</td></tr>';
 
     			// Third party
     			print '<td>'.$langs->trans("Company").'</td><td colspan="3">';
-    			if ($project->societe->id) print $project->societe->getNomUrl(1);
+    			if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
     			else print '&nbsp;';
     			print '</td></tr>';
 			}
 
 			// Date start
 			print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">';
-			print dol_print_date($task->date_start,'day');
+			print dol_print_date($object->date_start,'day');
 			print '</td></tr>';
 
 			// Date end
 			print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">';
-			print dol_print_date($task->date_end,'day');
+			print dol_print_date($object->date_end,'day');
 			print '</td></tr>';
 
 			// Progress
 			print '<tr><td>'.$langs->trans("Progress").'</td><td colspan="3">';
-			print $task->progress.' %';
+			print $object->progress.' %';
 			print '</td></tr>';
 
 			// Description
 			print '<td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
-			print nl2br($task->description);
+			print nl2br($object->description);
 			print '</td></tr>';
 
 			print '</table>';
@@ -361,7 +372,7 @@ if ($taskid)
 			// Modify
 			if ($user->rights->projet->creer)
 			{
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$task->id.'&amp;action=edit&amp;withproject='.$withproject.'">'.$langs->trans('Modify').'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit&amp;withproject='.$withproject.'">'.$langs->trans('Modify').'</a>';
 			}
 			else
 			{
@@ -369,9 +380,9 @@ if ($taskid)
 			}
 
 			// Delete
-			if ($user->rights->projet->supprimer && ! $task->hasChildren())
+			if ($user->rights->projet->supprimer && ! $object->hasChildren())
 			{
-				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$task->id.'&amp;action=delete&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
 			}
 			else
 			{
@@ -385,6 +396,5 @@ if ($taskid)
 
 
 llxFooter();
-
 $db->close();
 ?>
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 8f93368d6e438b27745adcedd9c7129997b65864..d6d592d21f82531da97fe0814ac9914f225b7111 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2010      Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
+/* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2012	Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 
 /**
  *	\file       htdocs/projet/tasks/time.php
- *	\ingroup    projet
+ *	\ingroup    project
  *	\brief      Page to add new time spent on a task
  */
 
@@ -32,17 +32,21 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
 
 $langs->load('projects');
 
-$taskid = isset($_GET["id"])?$_GET["id"]:'';
-$id = GETPOST('id','int');
-$ref= GETPOST('ref');
-$action=GETPOST('action');
-$withproject=GETPOST('withproject');
+$id=GETPOST('id','int');
+$ref=GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+$withproject=GETPOST('withproject','int');
+$project_ref=GETPOST('project_ref','alpha');
 
 // Security check
 $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;
 if (!$user->rights->projet->lire) accessforbidden();
 
+$object = new Task($db);
+$projectstatic = new Project($db);
+
 
 /*
  * Actions
@@ -64,28 +68,27 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
 
 	if (! $error)
 	{
-		$task = new Task($db);
-		$task->fetch($_POST["id"]);
+		$object->fetch($id);
 
-		$task->timespent_note = $_POST["timespent_note"];
-		$task->timespent_duration = $_POST["timespent_durationhour"]*60*60;	// We store duration in seconds
-		$task->timespent_duration+= $_POST["timespent_durationmin"]*60;		// We store duration in seconds
-		$task->timespent_date = dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]);
-		$task->timespent_fk_user = $_POST["userid"];
+		$object->timespent_note = $_POST["timespent_note"];
+		$object->timespent_duration = $_POST["timespent_durationhour"]*60*60;	// We store duration in seconds
+		$object->timespent_duration+= $_POST["timespent_durationmin"]*60;		// We store duration in seconds
+		$object->timespent_date = dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]);
+		$object->timespent_fk_user = $_POST["userid"];
 
-		$result=$task->addTimeSpent($user);
+		$result=$object->addTimeSpent($user);
 		if ($result >= 0)
 		{
 
 		}
 		else
 		{
-			$mesg='<div class="error">'.$langs->trans($task->error).'</div>';
+			$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
 		}
 	}
 	else
 	{
-		$_POST["action"]='';
+		$action='';
 	}
 }
 
@@ -101,44 +104,59 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree
 
 	if (! $error)
 	{
-		$task = new Task($db);
-		$task->fetch($_POST["id"]);
-
-		$task->timespent_id = $_POST["lineid"];
-		$task->timespent_note = $_POST["timespent_note_line"];
-		$task->timespent_old_duration = $_POST["old_duration"];
-		$task->timespent_duration = $_POST["new_durationhour"]*60*60;	// We store duration in seconds
-		$task->timespent_duration+= $_POST["new_durationmin"]*60;		// We store duration in seconds
-		$task->timespent_date = dol_mktime(12,0,0,$_POST["timelinemonth"],$_POST["timelineday"],$_POST["timelineyear"]);
-		$task->timespent_fk_user = $_POST["userid_line"];
-
-		$result=$task->updateTimeSpent($user);
+		$object->fetch($id);
+
+		$object->timespent_id = $_POST["lineid"];
+		$object->timespent_note = $_POST["timespent_note_line"];
+		$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"]*60;		// We store duration in seconds
+		$object->timespent_date = dol_mktime(12,0,0,$_POST["timelinemonth"],$_POST["timelineday"],$_POST["timelineyear"]);
+		$object->timespent_fk_user = $_POST["userid_line"];
+
+		$result=$object->updateTimeSpent($user);
 		if ($result >= 0)
 		{
 
 		}
 		else
 		{
-			$mesg='<div class="error">'.$langs->trans($task->error).'</div>';
+			$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
 		}
 	}
 	else
 	{
-		$_POST["action"]='';
+		$action='';
 	}
 }
 
-if ($action == 'confirm_delete' && $_REQUEST["confirm"] == "yes" && $user->rights->projet->creer)
+if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->creer)
 {
-	$task = new Task($db);
-	$task->fetchTimeSpent($_GET['lineid']);
-	$result = $task->delTimeSpent($user);
+	$object->fetchTimeSpent($_GET['lineid']);
+	$result = $object->delTimeSpent($user);
 
 	if (!$result)
 	{
 		$langs->load("errors");
-		$mesg='<div class="error">'.$langs->trans($task->error).'</div>';
-		$_POST["action"]='';
+		$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+		$action='';
+	}
+}
+
+// Retreive 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)
+	{
+		$tasksarray=$object->getTasksArray(0, 0, $projectstatic->id, $socid, 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));
+		}
 	}
 }
 
@@ -147,10 +165,6 @@ if ($action == 'confirm_delete' && $_REQUEST["confirm"] == "yes" && $user->right
  * View
  */
 
-$form = new Form($db);
-$project = new Project($db);
-$task = new Task($db);
-
 llxHeader("",$langs->trans("Task"));
 
 $form = new Form($db);
@@ -160,19 +174,19 @@ if ($id > 0 || ! empty($ref))
 	/*
 	 * Fiche projet en mode visu
 	 */
-	if ($task->fetch($id,$ref) >= 0)
+	if ($object->fetch($id) >= 0)
 	{
-		$result=$project->fetch($task->fk_project);
-		if (! empty($project->socid)) $project->societe->fetch($project->socid);
+		$result=$projectstatic->fetch($object->fk_project);
+		if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
 
-		$userWrite  = $project->restrictedProjectArea($user,'write');
+		$userWrite = $projectstatic->restrictedProjectArea($user,'write');
 
 		if ($withproject)
 		{
     		// Tabs for project
     		$tab='tasks';
-    		$head=project_prepare_head($project);
-    		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($project->public?'projectpub':'project'));
+    		$head=project_prepare_head($projectstatic);
+    		dol_fiche_head($head, $tab, $langs->trans("Project"),0,($projectstatic->public?'projectpub':'project'));
 
     		$param=($mode=='mine'?'&mode=mine':'');
 
@@ -185,28 +199,28 @@ if ($id > 0 || ! empty($ref))
     		// Define a complementary filter for search of next/prev ref.
     		if (! $user->rights->projet->all->lire)
     		{
-    		    $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0);
-    		    $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
+    		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,0);
+    		    $projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
     		}
-    		print $form->showrefnav($project,'ref','',1,'ref','ref','',$param);
+    		print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1');
     		print '</td></tr>';
 
-    		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$project->title.'</td></tr>';
+    		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projectstatic->title.'</td></tr>';
 
     		print '<tr><td>'.$langs->trans("Company").'</td><td>';
-    		if (! empty($project->societe->id)) print $project->societe->getNomUrl(1);
+    		if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1);
     		else print '&nbsp;';
     		print '</td>';
     		print '</tr>';
 
     		// Visibility
     		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-    		if ($project->public) print $langs->trans('SharedProject');
+    		if ($projectstatic->public) print $langs->trans('SharedProject');
     		else print $langs->trans('PrivateProject');
     		print '</td></tr>';
 
     		// Statut
-    		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$project->getLibStatut(4).'</td></tr>';
+    		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';
 
     		print '</table>';
 
@@ -215,48 +229,48 @@ if ($id > 0 || ! empty($ref))
     		print '<br>';
 		}
 
-		$head=task_prepare_head($task);
+		$head=task_prepare_head($object);
 		dol_fiche_head($head, 'task_time', $langs->trans("Task"),0,'projecttask');
 
 		dol_htmloutput_mesg($mesg);
 
 		if ($action == 'deleteline')
 		{
-			$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&lineid='.$_GET["lineid"],$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
+			$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id.'&lineid='.$_GET["lineid"],$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
 			if ($ret == 'html') print '<br>';
 		}
 
 		print '<table class="border" width="100%">';
 
 		$param=($withproject?'&withproject=1':'');
-		$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$project->id.'">'.$langs->trans("BackToList").'</a>':'';
+		$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
 
 		// Ref
 		print '<tr><td width="30%">';
 		print $langs->trans("Ref");
 		print '</td><td colspan="3">';
-		if (! GETPOST('withproject') || empty($project->id))
+		if (! GETPOST('withproject') || empty($projectstatic->id))
 		{
-		    $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
-		    $task->next_prev_filter=" fk_projet in (".$projectsListId.")";
+		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1);
+		    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
-		else $task->next_prev_filter=" fk_projet = ".$project->id;
-	    print $form->showrefnav($task,'id',$linkback,1,'rowid','ref','',$param);
+		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
+	    print $form->showrefnav($object,'id',$linkback,1,'rowid','ref','',$param);
 		print '</td></tr>';
 
 		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$task->label.'</td></tr>';
+		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
 
 		// Project
 		if (empty($withproject))
 		{
     		print '<tr><td>'.$langs->trans("Project").'</td><td>';
-    		print $project->getNomUrl(1);
+    		print $projectstatic->getNomUrl(1);
     		print '</td></tr>';
 
     		// Third party
     		print '<td>'.$langs->trans("Company").'</td><td>';
-    		if ($project->societe->id) print $project->societe->getNomUrl(1);
+    		if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
     		else print '&nbsp;';
     		print '</td></tr>';
 		}
@@ -273,10 +287,10 @@ if ($id > 0 || ! empty($ref))
 		{
 			print '<br>';
 
-			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'">';
+			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="addtimespent">';
-			print '<input type="hidden" name="id" value="'.$task->id.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 			print '<table class="noborder" width="100%">';
 
@@ -298,7 +312,7 @@ if ($id > 0 || ! empty($ref))
 
 			// Contributor
 			print '<td nowrap="nowrap">';
-			$contactoftask=$task->getListContactId('internal');
+			$contactoftask=$object->getListContactId('internal');
 			print img_object('','user');
 			print $form->select_users($_POST["userid"]?$_POST["userid"]:$user->id,'userid',0,'',0,'',$contactoftask);
 			print '</td>';
@@ -329,7 +343,7 @@ if ($id > 0 || ! empty($ref))
 		$sql.= ", u.name, u.firstname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 		$sql .= " , ".MAIN_DB_PREFIX."user as u";
-		$sql .= " WHERE t.fk_task =".$task->id;
+		$sql .= " WHERE t.fk_task =".$object->id;
 		$sql .= " AND t.fk_user = u.rowid";
 		$sql .= " ORDER BY t.task_date DESC";
 
@@ -353,10 +367,10 @@ if ($id > 0 || ! empty($ref))
 			dol_print_error($db);
 		}
 
-		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'">';
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="updateline">';
-		print '<input type="hidden" name="id" value="'.$task->id.'">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
@@ -427,7 +441,7 @@ if ($id > 0 || ! empty($ref))
 
 			// Edit and delete icon
 			print '<td align="center" valign="middle" width="80">';
-			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
+			if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
   		    {
   		    	print '<input type="hidden" name="lineid" value="'.$_GET['lineid'].'">';
   		    	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
@@ -437,12 +451,12 @@ if ($id > 0 || ! empty($ref))
   		    else if ($user->rights->projet->creer)
 			{
 				print '&nbsp;';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'&amp;action=editline&amp;lineid='.$task_time->rowid.'">';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$task_time->rowid.'">';
 				print img_edit();
 				print '</a>';
 
 				print '&nbsp;';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'&amp;action=deleteline&amp;lineid='.$task_time->rowid.'">';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$task_time->rowid.'">';
 				print img_delete();
 				print '</a>';
 			}
@@ -460,7 +474,7 @@ if ($id > 0 || ! empty($ref))
 	}
 }
 
-$db->close();
 
 llxFooter();
+$db->close();
 ?>