diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 9106c3aef7d..1adaf1f041d 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,13 @@ * $Source$ * */ + +/** \file htdocs/fourn/facture/index.php + \ingroup fournisseur,facture + \brief Lsite des factures fournisseurs + \version $Revision$ +*/ + require("./pre.inc.php"); require("../../contact.class.php"); require("../../facturefourn.class.php"); @@ -127,13 +134,13 @@ if ($result) print ''; print ''; - print_liste_field_titre($langs->trans("Ref"),"index.php","facnumber"); - print_liste_field_titre($langs->trans("Date"),"index.php","fac.datef"); - print ''; - print_liste_field_titre($langs->trans("Company"),"index.php","s.nom"); - print_liste_field_titre($langs->trans("AmountHT"),"index.php","fac.total_ht","","",'align="right"'); - print_liste_field_titre($langs->trans("AmountTTC"),"index.php","fac.total_ttc","","",'align="right"'); - print_liste_field_titre($langs->trans("Status"),"index.php","fk_statut,paye","","",'align="center"'); + print_liste_field_titre($langs->trans("Ref"),"index.php","facnumber","","","",$sortfield); + print_liste_field_titre($langs->trans("Date"),"index.php","fac.datef","","","",$sortfield); + print_liste_field_titre($langs->trans("Label"),"index.php","fac.libelle","","","",$sortfield); + print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","","",$sortfield); + print_liste_field_titre($langs->trans("AmountHT"),"index.php","fac.total_ht","","",'align="right"',$sortfield); + print_liste_field_titre($langs->trans("AmountTTC"),"index.php","fac.total_ttc","","",'align="right"',$sortfield); + print_liste_field_titre($langs->trans("Status"),"index.php","fk_statut,paye","","",'align="center"',$sortfield); print "\n"; $var=True; while ($i < min($num,$limit)) @@ -193,7 +200,7 @@ if ($result) } else { - print $db->error(); + dolibarr_print_error($db); } $db->close(); diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 0a2043b9b4e..0f5a48b1f62 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -106,7 +106,7 @@ if ($result) print '
'.$langs->trans("Label").'
'; print ''; - print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","",'valign="center"'); + print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","",'valign="center"',$sortfield); print ''; print ''; print "\n"; diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index ba4675320e8..3f0e962567f 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -954,7 +954,9 @@ function transcoS2L($zonein,$devise) function print_liste_field_titre($name, $file, $field, $begin="", $options="", $td="", $sortfield="") { global $conf; - if ($sortfield == $field) + // Le champ de tri est mis en évidence. + // Exemple si (sortfield,field)=("nom","xxx.nom") ou (sortfield,field)=("nom","nom") + if ($sortfield == $field || $sortfield == ereg_replace("^[^\.]+\.","",$field)) { print '
'.$langs->trans("Town").'