From a7d98fefb36b238145e745a386239e800e521266 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 8 Jun 2006 20:57:14 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Encore=20d'autre=20probl=E8me=20de=20mau?= =?UTF-8?q?vais=20affichage=20du=20picto=20retard=20sur=20les=20factures?= =?UTF-8?q?=20fournisseurs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/fourn/facture/fiche.php | 9 ++++++--- htdocs/fourn/facture/index.php | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index a71e3ff47a5..a2438b3ae97 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -392,11 +392,11 @@ else $rownb=9; print ''; print ''; print ''.$langs->trans('Label').''; - print ''; + print ''; print ''.$langs->trans('DateInvoice').''; $html->select_date($fac->datep,'','','','',"update"); @@ -404,6 +404,7 @@ else print ''.$langs->trans('DateEcheance').''; $html->select_date($fac->date_echeance,'ech','','','',"update"); + if (($fac->paye == 0) && ($fac->statut > 0) && $fac->date_echeance < (time() - $conf->facture->fournisseur->warning_delay)) print img_picto($langs->trans("Late"),"warning"); print ''; print ''.$langs->trans('AmountHT').''; @@ -561,7 +562,9 @@ else print ''; print ''.$langs->trans('DateEcheance').''; - print dolibarr_print_date($fac->date_echeance,'%A %d %B %Y').''; + print dolibarr_print_date($fac->date_echeance,'%A %d %B %Y'); + if (($fac->paye == 0) && ($fac->statut > 0) && $fac->date_echeance < (time() - $conf->facture->fournisseur->warning_delay)) print img_picto($langs->trans("Late"),"warning"); + print ''; print ''.$langs->trans('Status').''.$fac->LibStatut($fac->paye,$fac->statut,4).''; diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 4314e112a07..f7afd8ec376 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -195,9 +195,9 @@ if ($resql) print ""; print ''.img_object($langs->trans("ShowBill"),"bill").' '.dolibarr_trunc($obj->facnumber,12)."\n"; print ''.dolibarr_print_date($obj->date_echeance); - if (($obj->paye == 0) && ($obj->fk_statut > 0) && $obj->datefin < (time() - $conf->facture->client->warning_delay)) print img_picto($langs->trans("Late"),"warning"); + if (($obj->paye == 0) && ($obj->fk_statut > 0) && $obj->date_echeance < (time() - $conf->facture->fournisseur->warning_delay)) print img_picto($langs->trans("Late"),"warning"); print ''; - print ''.dolibarr_trunc(stripslashes("$obj->libelle"),36).''; + print ''.dolibarr_trunc($obj->libelle,36).''; print ''; print ''.img_object($langs->trans("ShowSupplier"),"company").' '.$obj->nom.''; print ''.price($obj->total_ht).'';