From 8f56d2d798fab276991b0cfce54ec611a67df3c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 15 Feb 2012 23:27:03 +0100
Subject: [PATCH] Fix: Show project when task is view as a standalone card.

---
 htdocs/projet/tasks/contact.php  | 25 +++++++++--------
 htdocs/projet/tasks/document.php | 23 +++++++++-------
 htdocs/projet/tasks/note.php     | 27 ++++++++++---------
 htdocs/projet/tasks/task.php     | 46 +++++++++++++++++---------------
 htdocs/projet/tasks/time.php     | 27 ++++++++++---------
 5 files changed, 82 insertions(+), 66 deletions(-)

diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index bda55f209cf..bf1cd5ae804 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -37,6 +37,7 @@ $taskid = isset($_GET["id"])?$_GET["id"]:'';
 $id = GETPOST('id');
 $ref= GETPOST('ref');
 $action=GETPOST('action');
+$withproject=GETPOST('withproject');
 
 // Security check
 $socid=0;
@@ -143,7 +144,7 @@ if ($id > 0 || ! empty($ref))
 
 		$userWrite  = $project->restrictedProjectArea($user,'write');
 
-		if (GETPOST('withproject'))
+		if ($withproject)
 		{
     		// Tabs for project
     		$tab='tasks';
@@ -224,17 +225,19 @@ if ($id > 0 || ! empty($ref))
 		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$task->label.'</td></tr>';
 
 		// Project
-		/*print '<tr><td>'.$langs->trans("Project").'</td><td>';
-		print $project->getNomUrl(1);
-		print '</td></tr>';
+		if (empty($withproject))
+		{
+    		print '<tr><td>'.$langs->trans("Project").'</td><td>';
+    		print $project->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);
-		else print '&nbsp;';
-		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);
+    		else print '&nbsp;';
+    		print '</td></tr>';
+		}
 
 		print "</table>";
 
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index c589b17bc9d..746cc823e32 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -37,6 +37,7 @@ $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 $id = GETPOST('id');
 $ref= GETPOST('ref');
+$withproject=GETPOST('withproject');
 
 // Security check
 $socid=0;
@@ -137,7 +138,7 @@ if ($id > 0 || ! empty($ref))
 
 		$userWrite  = $project->restrictedProjectArea($user,'write');
 
-		if (GETPOST('withproject'))
+		if ($withproject)
 		{
     		// Tabs for project
     		$tab='tasks';
@@ -219,16 +220,18 @@ if ($id > 0 || ! empty($ref))
     	print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$task->label.'</td></tr>';
 
     	// Project
-    	/*print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
-    	print $projectstatic->getNomUrl(1);
-    	print '</td></tr>';
+    	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>';
-		*/
+        	// 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>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 787b4edd78b..2fb8e0c9bdf 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -33,6 +33,7 @@ $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 $id = GETPOST('id');
 $ref= GETPOST('ref');
+$withproject=GETPOST('withproject');
 
 // Security check
 $socid=0;
@@ -107,7 +108,7 @@ if ($id > 0 || ! empty($ref))
 
 		$userWrite  = $project->restrictedProjectArea($user,'write');
 
-		if (GETPOST('withproject'))
+		if ($withproject)
 		{
     		// Tabs for project
     		$tab='tasks';
@@ -180,18 +181,20 @@ if ($id > 0 || ! empty($ref))
 		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$task->label.'</td></tr>';
 
 		// Project
-		/*print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
-		print $project->getNomUrl(1);
-		print '</td></tr>';
+		if (empty($withproject))
+		{
+    		print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
+    		print $project->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);
-		else print'&nbsp;';
-		print '</td></tr>';
-		*/
+    		// Third party
+    		print '<tr><td>'.$langs->trans("Company").'</td><td>';
+    		if ($project->societe->id > 0) print $project->societe->getNomUrl(1);
+    		else print'&nbsp;';
+    		print '</td></tr>';
+		}
 
-		// Note publique
+		// Note public
 		print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
 		print '<td valign="top" colspan="3">';
 		if ($action == 'edit')
@@ -209,7 +212,7 @@ if ($id > 0 || ! empty($ref))
 		}
 		print "</td></tr>";
 
-		// Note privee
+		// Note private
 		if (! $user->societe_id)
 		{
 			print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 746b821cafb..821ff229059 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -129,7 +129,7 @@ if ($taskid)
 
 		$userWrite  = $project->restrictedProjectArea($user,'write');
 
-		if (GETPOST('withproject'))
+		if ($withproject)
 		{
     		// Tabs for project
     		$tab='tasks';
@@ -229,16 +229,18 @@ if ($taskid)
 			print '<td><input size="30" name="label" value="'.$task->label.'"></td></tr>';
 
 			// Project
-			/*print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
-			print $project->getNomUrl(1);
-			print '</td></tr>';
+			if (empty($withproject))
+			{
+    			print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
+    			print $project->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);
-			else print '&nbsp;';
-			print '</td></tr>';
-			*/
+    			// Third party
+    			print '<td>'.$langs->trans("Company").'</td><td colspan="3">';
+    			if ($project->societe->id) print $project->societe->getNomUrl(1);
+    			else print '&nbsp;';
+    			print '</td></tr>';
+			}
 
 			// Task parent
 			print '<tr><td>'.$langs->trans("ChildOfTask").'</td><td>';
@@ -280,8 +282,8 @@ if ($taskid)
 			/*
 			 * Fiche tache en mode visu
 			 */
-		    $param=(GETPOST('withproject')?'&withproject=1':'');
-		    $linkback=GETPOST('withproject')?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$project->id.'">'.$langs->trans("BackToList").'</a>':'';
+		    $param=($withproject?'&withproject=1':'');
+		    $linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$project->id.'">'.$langs->trans("BackToList").'</a>':'';
 
 			if ($action == 'delete')
 			{
@@ -309,16 +311,18 @@ if ($taskid)
 			print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$task->label.'</td></tr>';
 
 			// Project
-			/*print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
-			print $project->getNomUrl(1);
-			print '</td></tr>';
+			if (empty($withproject))
+			{
+    			print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
+    			print $project->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);
-			else print '&nbsp;';
-			print '</td></tr>';
-			*/
+    			// Third party
+    			print '<td>'.$langs->trans("Company").'</td><td colspan="3">';
+    			if ($project->societe->id) print $project->societe->getNomUrl(1);
+    			else print '&nbsp;';
+    			print '</td></tr>';
+			}
 
 			// Date start
 			print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index a3ee4c6abf2..bed27babac4 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -36,6 +36,7 @@ $taskid = isset($_GET["id"])?$_GET["id"]:'';
 $id = GETPOST('id');
 $ref= GETPOST('ref');
 $action=GETPOST('action');
+$withproject=GETPOST('withproject');
 
 // Security check
 $socid=0;
@@ -166,7 +167,7 @@ if ($id > 0 || ! empty($ref))
 
 		$userWrite  = $project->restrictedProjectArea($user,'write');
 
-		if (GETPOST('withproject'))
+		if ($withproject)
 		{
     		// Tabs for project
     		$tab='tasks';
@@ -227,8 +228,8 @@ 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>':'';
+		$param=($withproject?'&withproject=1':'');
+		$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$project->id.'">'.$langs->trans("BackToList").'</a>':'';
 
 		// Ref
 		print '<tr><td width="30%">';
@@ -247,16 +248,18 @@ if ($id > 0 || ! empty($ref))
 		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$task->label.'</td></tr>';
 
 		// Project
-		/*print '<tr><td>'.$langs->trans("Project").'</td><td>';
-		print $project->getNomUrl(1);
-		print '</td></tr>';
+		if (empty($withproject))
+		{
+    		print '<tr><td>'.$langs->trans("Project").'</td><td>';
+    		print $project->getNomUrl(1);
+    		print '</td></tr>';
 
-		// Third party
-		print '<td>'.$langs->trans("Company").'</td><td>';
-		if ($project->societe->id) print $project->societe->getNomUrl(1);
-		else print '&nbsp;';
-		print '</td></tr>';
-		*/
+    		// Third party
+    		print '<td>'.$langs->trans("Company").'</td><td>';
+    		if ($project->societe->id) print $project->societe->getNomUrl(1);
+    		else print '&nbsp;';
+    		print '</td></tr>';
+		}
 
 		print '</table>';