From 0d413c47b188e4df554f022d6832491e0d51999a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 15 Jan 2020 13:33:11 +0100
Subject: [PATCH] Fix duplicate info

---
 htdocs/projet/contact.php    |  8 --------
 htdocs/projet/element.php    |  8 --------
 htdocs/projet/tasks.php      | 10 +---------
 htdocs/projet/tasks/note.php |  2 +-
 htdocs/projet/tasks/task.php |  4 ++--
 htdocs/projet/tasks/time.php |  8 --------
 6 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 82eb598190b..cf94b1a5354 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -268,14 +268,6 @@ if ($id > 0 || ! empty($ref))
     print nl2br($object->description);
     print '</td></tr>';
 
-    // Bill time
-    if (empty($conf->global->PROJECT_HIDE_TASKS) && ! empty($conf->global->PROJECT_BILL_TIME_SPENT))
-    {
-    	print '<tr><td>'.$langs->trans("BillTime").'</td><td>';
-    	print yn($object->usage_bill_time);
-    	print '</td></tr>';
-    }
-
     // Categories
     if ($conf->categorie->enabled) {
         print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 1cb88b47a28..9be63cad242 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -244,14 +244,6 @@ print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
 print nl2br($object->description);
 print '</td></tr>';
 
-// Bill time
-if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
-{
-	print '<tr><td>'.$langs->trans("BillTime").'</td><td>';
-	print yn($object->usage_bill_time);
-	print '</td></tr>';
-}
-
 // Categories
 if ($conf->categorie->enabled) {
     print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 2dc342c0ca0..ff2d08cd6fc 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -90,7 +90,7 @@ $hookmanager->initHooks(array('projecttaskscard', 'globalcard'));
 
 $progress = GETPOST('progress', 'int');
 $label = GETPOST('label', 'alpha');
-$description = GETPOST('description');
+$description = GETPOST('description', 'none');
 $planned_workloadhour = (GETPOST('planned_workloadhour', 'int') ?GETPOST('planned_workloadhour', 'int') : 0);
 $planned_workloadmin = (GETPOST('planned_workloadmin', 'int') ?GETPOST('planned_workloadmin', 'int') : 0);
 $planned_workload = $planned_workloadhour * 3600 + $planned_workloadmin * 60;
@@ -476,14 +476,6 @@ if ($id > 0 || !empty($ref))
     print nl2br($object->description);
     print '</td></tr>';
 
-    // Bill time
-    if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
-    {
-    	print '<tr><td>'.$langs->trans("BillTime").'</td><td>';
-    	print yn($object->usage_bill_time);
-    	print '</td></tr>';
-    }
-
     // Categories
     if ($conf->categorie->enabled) {
         print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 42dbaa48cc2..d0a6aa4dad9 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -205,7 +205,7 @@ if ($object->id > 0)
 		print '<div class="ficheaddleft">';
 		print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border entpercent tableforfield">';
+		print '<table class="border centpercent tableforfield">';
 
 		// Description
 		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 8199b5b17b4..4b64fabe665 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -509,7 +509,7 @@ if ($id > 0 || !empty($ref))
 			print '<div class="fichehalfleft">';
 
 			print '<div class="underbanner clearboth"></div>';
-			print '<table class="border centpercent">';
+			print '<table class="border centpercent tableforfield">';
 
 			// Task parent
 			print '<tr><td>'.$langs->trans("ChildOfTask").'</td><td>';
@@ -550,7 +550,7 @@ if ($id > 0 || !empty($ref))
 			print '<div class="fichehalfright"><div class="ficheaddleft">';
 
 			print '<div class="underbanner clearboth"></div>';
-			print '<table class="border centpercent">';
+			print '<table class="border centpercent tableforfield">';
 
 			// Progress declared
 			print '<tr><td class="titlefield">'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 8e7856759a7..f9069f7efa7 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -576,14 +576,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
             print nl2br($projectstatic->description);
             print '</td></tr>';
 
-            // Bill time
-            if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT))
-            {
-	            print '<tr><td>'.$langs->trans("BillTime").'</td><td>';
-	            print yn($projectstatic->usage_bill_time);
-	            print '</td></tr>';
-            }
-
             // Categories
             if ($conf->categorie->enabled) {
                 print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';