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 '
| '.$langs->trans("Label").' | '.$task->label.' |
';
// Project
- /*print '| '.$langs->trans("Project").' | ';
- print $project->getNomUrl(1);
- print ' |
';
+ if (empty($withproject))
+ {
+ print '| '.$langs->trans("Project").' | ';
+ print $project->getNomUrl(1);
+ print ' |
';
- // Customer
- print "| ".$langs->trans("Company")." | ";
- print '';
- if ($project->societe->id > 0) print $project->societe->getNomUrl(1);
- else print ' ';
- print ' |
';
- */
+ // Customer
+ print "| ".$langs->trans("Company")." | ";
+ print '';
+ if ($project->societe->id > 0) print $project->societe->getNomUrl(1);
+ else print ' ';
+ print ' |
';
+ }
print "";
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 '| '.$langs->trans("Label").' | '.$task->label.' |
';
// Project
- /*print '| '.$langs->trans("Project").' | ';
- print $projectstatic->getNomUrl(1);
- print ' |
';
+ if (empty($withproject))
+ {
+ print '| '.$langs->trans("Project").' | ';
+ print $projectstatic->getNomUrl(1);
+ print ' |
';
- // Third party
- print ''.$langs->trans("Company").' | ';
- if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
- else print ' ';
- print ' | ';
- */
+ // Third party
+ print ''.$langs->trans("Company").' | ';
+ if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
+ else print ' ';
+ print ' | ';
+ }
// Files infos
print '| '.$langs->trans("NbOfAttachedFiles").' | '.count($filearray).' |
';
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 '| '.$langs->trans("Label").' | '.$task->label.' |
';
// Project
- /*print '| '.$langs->trans("Project").' | ';
- print $project->getNomUrl(1);
- print ' |
';
+ if (empty($withproject))
+ {
+ print '| '.$langs->trans("Project").' | ';
+ print $project->getNomUrl(1);
+ print ' |
';
- // Third party
- print '| '.$langs->trans("Company").' | ';
- if ($project->societe->id > 0) print $project->societe->getNomUrl(1);
- else print' ';
- print ' |
';
- */
+ // Third party
+ print '| '.$langs->trans("Company").' | ';
+ if ($project->societe->id > 0) print $project->societe->getNomUrl(1);
+ else print' ';
+ print ' |
';
+ }
- // Note publique
+ // Note public
print '| '.$langs->trans("NotePublic").' | ';
print '';
if ($action == 'edit')
@@ -209,7 +212,7 @@ if ($id > 0 || ! empty($ref))
}
print " |
";
- // Note privee
+ // Note private
if (! $user->societe_id)
{
print '| '.$langs->trans("NotePrivate").' | ';
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 ' |
';
// Project
- /*print '| '.$langs->trans("Project").' | ';
- print $project->getNomUrl(1);
- print ' |
';
+ if (empty($withproject))
+ {
+ print '| '.$langs->trans("Project").' | ';
+ print $project->getNomUrl(1);
+ print ' |
';
- // Third party
- print ''.$langs->trans("Company").' | ';
- if ($project->societe->id) print $project->societe->getNomUrl(1);
- else print ' ';
- print ' | ';
- */
+ // Third party
+ print ''.$langs->trans("Company").' | ';
+ if ($project->societe->id) print $project->societe->getNomUrl(1);
+ else print ' ';
+ print ' | ';
+ }
// Task parent
print '| '.$langs->trans("ChildOfTask").' | ';
@@ -280,8 +282,8 @@ if ($taskid)
/*
* Fiche tache en mode visu
*/
- $param=(GETPOST('withproject')?'&withproject=1':'');
- $linkback=GETPOST('withproject')?''.$langs->trans("BackToList").'':'';
+ $param=($withproject?'&withproject=1':'');
+ $linkback=$withproject?''.$langs->trans("BackToList").'':'';
if ($action == 'delete')
{
@@ -309,16 +311,18 @@ if ($taskid)
print ' |
| '.$langs->trans("Label").' | '.$task->label.' |
';
// Project
- /*print '| '.$langs->trans("Project").' | ';
- print $project->getNomUrl(1);
- print ' |
';
+ if (empty($withproject))
+ {
+ print '| '.$langs->trans("Project").' | ';
+ print $project->getNomUrl(1);
+ print ' |
';
- // Third party
- print ''.$langs->trans("Company").' | ';
- if ($project->societe->id) print $project->societe->getNomUrl(1);
- else print ' ';
- print ' | ';
- */
+ // Third party
+ print ''.$langs->trans("Company").' | ';
+ if ($project->societe->id) print $project->societe->getNomUrl(1);
+ else print ' ';
+ print ' | ';
+ }
// Date start
print '| '.$langs->trans("DateStart").' | ';
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 '';
- $param=(GETPOST('withproject')?'&withproject=1':'');
- $linkback=GETPOST('withproject')?''.$langs->trans("BackToList").'':'';
+ $param=($withproject?'&withproject=1':'');
+ $linkback=$withproject?''.$langs->trans("BackToList").'':'';
// Ref
print '| ';
@@ -247,16 +248,18 @@ if ($id > 0 || ! empty($ref))
print ' | | '.$langs->trans("Label").' | '.$task->label.' | ';
// Project
- /*print '| '.$langs->trans("Project").' | ';
- print $project->getNomUrl(1);
- print ' | ';
+ if (empty($withproject))
+ {
+ print '| '.$langs->trans("Project").' | ';
+ print $project->getNomUrl(1);
+ print ' | ';
- // Third party
- print ''.$langs->trans("Company").' | ';
- if ($project->societe->id) print $project->societe->getNomUrl(1);
- else print ' ';
- print ' | ';
- */
+ // Third party
+ print ''.$langs->trans("Company").' | ';
+ if ($project->societe->id) print $project->societe->getNomUrl(1);
+ else print ' ';
+ print ' | ';
+ }
print ' ';
|