diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index 7ed0d4b5f4d..948a207ff35 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -167,16 +167,7 @@ if ($resql) print ''.img_object($langs->trans('ShowOrder'),'order').' '.$objp->ref.''; print ''.img_object($langs->trans('ShowCompany'),'company').' '.$objp->nom.''; print ''.$objp->ref_client.''; - $now = time(); - $lim = 3600 * 24 * 15 ; - if ( ($now - $objp->date_commande) > $lim && $objp->statutid == 1 ) - { - print ' > 15 jours'; - } - else - { - print ' '; - } + print ' '; print ''; $y = strftime('%Y',$objp->date_commande); $m = strftime('%m',$objp->date_commande); diff --git a/htdocs/compta/commande/liste.php b/htdocs/compta/commande/liste.php index 96f21bfba85..19272629516 100644 --- a/htdocs/compta/commande/liste.php +++ b/htdocs/compta/commande/liste.php @@ -113,7 +113,7 @@ if ($resql) print_liste_field_titre($langs->trans("Ref"),"liste.php","c.ref","",$param,'',$sortfield); print_liste_field_titre($langs->trans("Company"),"liste.php","s.nom","",$param,'',$sortfield); print_liste_field_titre($langs->trans("Date"),"liste.php","c.date_commande","",$param, 'align="center"',$sortfield); - print_liste_field_titre($langs->trans("Status"),"liste.php","c.fk_statut","",$param,'align="center"',$sortfield); + print_liste_field_titre($langs->trans("Status"),"liste.php","c.fk_statut","",$param,'align="right"',$sortfield); print "\n"; $var=True; @@ -143,7 +143,7 @@ if ($resql) print " "; print strftime("%Y",$objp->date_commande)."\n"; - print ''.$generic_commande->statuts[$objp->fk_statut].''; + print ''.$generic_commande->LibStatut($objp->fk_statut,5).''; print "\n"; $total = $total + $objp->price;