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

Fix missing total of timespent

Browse Source
This commit is contained in:
Laurent Destailleur 2017-01-02 12:27:34 +01:00
parent 1b352768c2
commit 40fa816b99
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/projet/element.php
View File

@ -829,7 +829,7 @@ foreach ($listofreferent as $key => $value)
print "</td>\n"; print "</td>\n";
// Date or TimeSpent // Date or TimeSpent
$date=''; $date=''; $total_time_by_line = null;
if ($tablename == 'expensereport_det') $date = $element->date; // No draft status on lines if ($tablename == 'expensereport_det') $date = $element->date; // No draft status on lines
elseif (! empty($element->status) || ! empty($element->statut) || ! empty($element->fk_status)) elseif (! empty($element->status) || ! empty($element->statut) || ! empty($element->fk_status))
{ {
@ -858,6 +858,7 @@ foreach ($listofreferent as $key => $value)
{ {
$tmpprojtime = $element->getSumOfAmount($elementuser, $dates, $datee); // $element is a task. $elementuser may be empty $tmpprojtime = $element->getSumOfAmount($elementuser, $dates, $datee); // $element is a task. $elementuser may be empty
print convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin'); print convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin');
$total_time_by_line = $tmpprojtime['nbseconds'];
} }
else print dol_print_date($date,'day'); else print dol_print_date($date,'day');
print '</td>'; print '</td>';
@ -995,6 +996,8 @@ foreach ($listofreferent as $key => $value)
$total_ht_by_third += $total_ht_by_line; $total_ht_by_third += $total_ht_by_line;
$total_ttc_by_third += $total_ttc_by_line; $total_ttc_by_third += $total_ttc_by_line;
$total_time = $total_time + $total_time_by_line;
} }
if (canApplySubtotalOn($tablename)) if (canApplySubtotalOn($tablename))
@ -1020,7 +1023,17 @@ foreach ($listofreferent as $key => $value)
if ($breakline) print $breakline; if ($breakline) print $breakline;
// Total // Total
print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Number").': '.$i.'</td>'; $colspan=4;
if (in_array($tablename, array('projet_task'))) $colspan=2;
print '<tr class="liste_total"><td colspan="'.$colspan.'">'.$langs->trans("Number").': '.$i.'</td>';
if (in_array($tablename, array('projet_task')))
{
print '<td align="center">';
print convertSecondToTime($total_time, 'allhourmin');
print '</td>';
print '<td>';
print '</td>';
}
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td align="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_ht).'</td>'; //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td align="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_ht).'</td>';
//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td align="right" width="100">'.$langs->trans("Total").' : '.price($total_ht).'</td>'; //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td align="right" width="100">'.$langs->trans("Total").' : '.price($total_ht).'</td>';
print '<td align="right">'; print '<td align="right">';