Fix: On retire la fonction price sur le total d'un délai.
This commit is contained in:
parent
936a845d5f
commit
90514aa0ea
@ -80,7 +80,7 @@ if ($result)
|
|||||||
print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","&socid=$socid",'',$sortfield);
|
print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","&socid=$socid",'',$sortfield);
|
||||||
print '<td align="center">'.$langs->trans("Description").'</td>';
|
print '<td align="center">'.$langs->trans("Description").'</td>';
|
||||||
print_liste_field_titre($langs->trans("Date"),"index.php","f.datei","","&socid=$socid",'',$sortfield);
|
print_liste_field_titre($langs->trans("Date"),"index.php","f.datei","","&socid=$socid",'',$sortfield);
|
||||||
print '<td align="center">'.$langs->trans("Duration").'</td>';
|
print '<td align="right">'.$langs->trans("Duration").'</td>';
|
||||||
print '<td align="center">'.$langs->trans("Status").'</td>';
|
print '<td align="center">'.$langs->trans("Status").'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
$var=True;
|
$var=True;
|
||||||
@ -95,15 +95,15 @@ if ($result)
|
|||||||
print '<td><a href="index.php?socid='.$objp->idp.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$objp->nom."</a></td>\n";
|
print '<td><a href="index.php?socid='.$objp->idp.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$objp->nom."</a></td>\n";
|
||||||
print '<td>'.nl2br($objp->note).'</td>';
|
print '<td>'.nl2br($objp->note).'</td>';
|
||||||
print "<td>".dolibarr_print_date($objp->dp)."</td>\n";
|
print "<td>".dolibarr_print_date($objp->dp)."</td>\n";
|
||||||
print '<td align="center">'.sprintf("%.1f",$objp->duree).'</td>';
|
print '<td align="right">'.sprintf("%.1f",$objp->duree).'</td>';
|
||||||
print '<td align="center">'.$objp->fk_statut.'</td>';
|
print '<td align="center">'.$objp->fk_statut.'</td>';
|
||||||
|
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
$total += $objp->duree;
|
$total += $objp->duree;
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
print '<tr class="liste_total"><td colspan="3"></td><td>'.$langs->trans("Total").':</td>';
|
print '<tr class="liste_total"><td colspan="3"></td><td>'.$langs->trans("Total").'</td>';
|
||||||
print "<td align=\"right\" nowrap>".($total?price($total):"0")."</td><td></td>";
|
print "<td align=\"right\" nowrap>".($total?sprintf("%.1f",$total):"0")."</td><td></td>";
|
||||||
print "</tr>";
|
print "</tr>";
|
||||||
|
|
||||||
print "</table>";
|
print "</table>";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user