lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix column task ref/label

Browse Source
This commit is contained in:
Laurent Destailleur 2016-10-24 17:47:31 +02:00
parent 9560ec54cc
commit 6bd219b117
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/projet/tasks/time.php
View File

@ -570,7 +570,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
print '<td width="100">'.$langs->trans("Date").'</td>'; print '<td width="100">'.$langs->trans("Date").'</td>';
if (! $id && ! $ref) // Not a dedicated task if (! $id && ! $ref) // Not a dedicated task
{ {
print '<td>'.$langs->trans("Task").'</td>'; print '<td>'.$langs->trans("RefTask").'</td>';
print '<td>'.$langs->trans("LabelTask").'</td>';
} }
print '<td>'.$langs->trans("By").'</td>'; print '<td>'.$langs->trans("By").'</td>';
print '<td align="left">'.$langs->trans("Note").'</td>'; print '<td align="left">'.$langs->trans("Note").'</td>';
@ -614,6 +615,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
$tasktmp->ref = $task_time->ref; $tasktmp->ref = $task_time->ref;
$tasktmp->label = $task_time->label; $tasktmp->label = $task_time->label;
print $tasktmp->getNomUrl(1, 'withproject', 'time'); print $tasktmp->getNomUrl(1, 'withproject', 'time');
print '</td>';
print '<td class="nowrap">';
print $tasktmp->label;
print '</td>'; print '</td>';
} }
@ -702,7 +706,13 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
$total += $task_time->task_duration; $total += $task_time->task_duration;
$totalvalue += price2num($task_time->thm * $task_time->task_duration / 3600); $totalvalue += price2num($task_time->thm * $task_time->task_duration / 3600);
} }
print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
$colspan=3;
if (! $id && ! $ref) // Not a dedicated task
{
$colspan+=2;
}
print '<tr class="liste_total"><td colspan="'.$colspan.'" class="liste_total">'.$langs->trans("Total").'</td>';
print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total,'allhourmin').'</td>'; print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total,'allhourmin').'</td>';
if ($conf->salaries->enabled) if ($conf->salaries->enabled)
{ {