diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index de3d36747e8..37a44c82097 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1759,10 +1759,10 @@ else if ($num <= $limit) { // Print total print ""; - print "".$langs->trans("Total").": "; - print "".price($total).""; - print "".price($total_ttc).""; - print "".price($totalrecu).""; + print "".$langs->trans("Total").":"; + print "".price($total).""; + print "".price($total_ttc).""; + print "".price($totalrecu).""; print ' '; print "\n"; } diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 666fdfc3d66..70d4969570a 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -211,20 +211,31 @@ if ($user->rights->facture->lire) { print "!!!\n"; } - print ''.$objp->nom.''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.$objp->nom.''; print "".price($objp->total).""; print "".price($objp->total_ttc).""; print "".price($objp->am).""; - // Affiche statut de la facture - if ($objp->fk_statut == 3) + // Affiche statut de la facture + if (! $objp->paye) { - print 'abandonnée'; + if ($objp->fk_statut == 0) + { + print ''.$langs->trans("BillShortStatusDraft").''; + } + elseif ($objp->fk_statut == 3) + { + print ''.$langs->trans("BillShortStatusCanceled").''; + } + else + { + print ''.($objp->am?$langs->trans("BillShortStatusStarted"):$langs->trans("BillShortStatusNotPayed")).''; + } } else { - print ''.($objp->am?"commencé":"impayée").''; + print ''.$langs->trans("BillShortStatusPayed").''; } print "\n";