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

FIX the time spent on project was not visible in its overwiew

Browse Source
This commit is contained in:
Laurent Destailleur 2016-11-17 17:03:50 +01:00
parent 7d27e011a5
commit 2d7d240c86
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/projet/element.php
View File

@ -348,7 +348,7 @@ $listofreferent=array(
'table'=>'projet_task', 'table'=>'projet_task',
'datefieldname'=>'task_date', 'datefieldname'=>'task_date',
'disableamount'=>0, 'disableamount'=>0,
'test'=>$conf->projet->enabled && $user->rights->projet->lire && $conf->salaries->enabled && empty($conf->global->PROJECT_HIDE_TASKS)), 'test'=>$conf->projet->enabled && $user->rights->projet->lire && empty($conf->global->PROJECT_HIDE_TASKS)),
); );
if ($action=="addelement") if ($action=="addelement")
@ -815,13 +815,21 @@ foreach ($listofreferent as $key => $value)
if ($tablename == 'don') $total_ht_by_line=$element->amount; if ($tablename == 'don') $total_ht_by_line=$element->amount;
elseif ($tablename == 'projet_task') elseif ($tablename == 'projet_task')
{ {
$tmp = $element->getSumOfAmount($elementuser, $dates, $datee); // $element is a task. $elementuser may be empty if (! empty($conf->salaries->enabled))
$total_ht_by_line = price2num($tmp['amount'],'MT'); {
if ($tmp['nblinesnull'] > 0) // TODO Permission to read daily rate
{ $tmp = $element->getSumOfAmount($elementuser, $dates, $datee); // $element is a task. $elementuser may be empty
$langs->load("errors"); $total_ht_by_line = price2num($tmp['amount'],'MT');
$warning=$langs->trans("WarningSomeLinesWithNullHourlyRate", $conf->currency); if ($tmp['nblinesnull'] > 0)
} {
$langs->load("errors");
$warning=$langs->trans("WarningSomeLinesWithNullHourlyRate", $conf->currency);
}
}
else
{
print $langs->trans("ModuleDisabled");
}
} }
else else
{ {