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

Look: Modification esthtique mineure

Browse Source
This commit is contained in:
Laurent Destailleur 2005-04-22 23:02:44 +00:00
parent 2b388c848a
commit c5ebee51fe
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/facture.php
View File

@ -1759,10 +1759,10 @@ else
if ($num <= $limit) { if ($num <= $limit) {
// Print total // Print total
print "<tr ".$bc[!$var].">"; print "<tr ".$bc[!$var].">";
print "<td colspan=3 align=\"left\">".$langs->trans("Total").": </td>"; print "<td colspan=3 align=\"left\"><i>".$langs->trans("Total").":</i></td>";
print "<td align=\"right\"><b>".price($total)."</b></td>"; print "<td align=\"right\"><i><b>".price($total)."</b></i></td>";
print "<td align=\"right\"><b>".price($total_ttc)."</b></td>"; print "<td align=\"right\"><i><b>".price($total_ttc)."</b></i></td>";
print "<td align=\"right\"><b>".price($totalrecu)."</b></td>"; print "<td align=\"right\"><i><b>".price($totalrecu)."</b></i></td>";
print '<td align="center">&nbsp;</td>'; print '<td align="center">&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
} }

21
htdocs/compta/facture/impayees.php
View File

@ -211,20 +211,31 @@ if ($user->rights->facture->lire)
{ {
print "<td align=\"center\"><b>!!!</b></td>\n"; print "<td align=\"center\"><b>!!!</b></td>\n";
} }
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->idp.'">'.$objp->nom.'</a></td>'; print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->idp.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$objp->nom.'</a></td>';
print "<td align=\"right\">".price($objp->total)."</td>"; print "<td align=\"right\">".price($objp->total)."</td>";
print "<td align=\"right\">".price($objp->total_ttc)."</td>"; print "<td align=\"right\">".price($objp->total_ttc)."</td>";
print "<td align=\"right\">".price($objp->am)."</td>"; print "<td align=\"right\">".price($objp->am)."</td>";
// Affiche statut de la facture
if ($objp->fk_statut == 3) // Affiche statut de la facture
if (! $objp->paye)
{ {
print '<td align="center">abandonnée</td>'; if ($objp->fk_statut == 0)
{
print '<td align="center">'.$langs->trans("BillShortStatusDraft").'</td>';
}
elseif ($objp->fk_statut == 3)
{
print '<td align="center">'.$langs->trans("BillShortStatusCanceled").'</td>';
}
else
{
print '<td align="center"><a class="'.$class.'" href="'.$_SERVER["PHP_SELF"].'?filtre=paye:0,fk_statut:1">'.($objp->am?$langs->trans("BillShortStatusStarted"):$langs->trans("BillShortStatusNotPayed")).'</a></td>';
}
} }
else else
{ {
print '<td align="center"><a class="'.$class.'" href="impayees.php?filtre=paye:0,fk_statut:1">'.($objp->am?"commencé":"impayée").'</a></td>'; print '<td align="center">'.$langs->trans("BillShortStatusPayed").'</td>';
} }
print "</tr>\n"; print "</tr>\n";