Fix: Contacts in task list must be limited to contact linked to project

htdocs/lib/project.lib.php

@@ -35,16 +35,6 @@ function project_prepare_head($object)
     $head[$h][2] = 'project';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/fiche.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Tasks");
-    $head[$h][2] = 'tasks';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/fiche.php?id='.$object->id.'&mode=mine';
-	$head[$h][1] = $langs->trans("MyTasks");
-    $head[$h][2] = 'mytasks';
-	$h++;
-
 	if ($conf->propal->enabled || $conf->commande->enabled || $conf->facture->enabled)
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
@@ -89,6 +79,17 @@ function project_prepare_head($object)
         }
     }
 
+    // Then tab for sub level of projet, i mean tasks
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/fiche.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Tasks");
+    $head[$h][2] = 'tasks';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/fiche.php?id='.$object->id.'&mode=mine';
+	$head[$h][1] = $langs->trans("MyTasks");
+    $head[$h][2] = 'mytasks';
+	$h++;
+
     return $head;
 }
 

htdocs/projet/tasks/contact.php

@@ -286,7 +286,7 @@ if ($id > 0 || ! empty($ref))
 
 				print '<td colspan="1">';
 				$thirdpartyofproject=$project->getListContactId('thirdparty');
-				$selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$projectstatic->societe->id;
+				$selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$project->societe->id;
 				$selectedCompany = $formcompany->selectCompaniesForNewContact($task, 'id', $selectedCompany, 'newcompany',$thirdpartyofproject);
 				print '</td>';
 

htdocs/projet/tasks/note.php

@@ -19,7 +19,7 @@
 /**
  *	\file       htdocs/projet/tasks/note.php
  *	\ingroup    project
- *	\brief      Fiche d'information sur une tache
+ *	\brief      Page to show information on a task
  *	\version    $Id$
  */
 
@@ -137,7 +137,7 @@ if ($id > 0 || ! empty($ref))
 		print '</td></tr>';
 
 		// Note publique
-		print '<tr><td valign="top">'.$langs->trans("NotePublic").' :</td>';
+		print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
 		print '<td valign="top" colspan="3">';
 		if ($_GET["action"] == 'edit')
 		{
@@ -157,7 +157,7 @@ if ($id > 0 || ! empty($ref))
 		// Note privee
 		if (! $user->societe_id)
 		{
-			print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';
+			print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
 			print '<td valign="top" colspan="3">';
 			if ($_GET["action"] == 'edit')
 			{