diff --git a/htdocs/fourn/fiche-stats.php b/htdocs/fourn/fiche-stats.php index 30f07fa38c4..dcb7cf6b6a3 100644 --- a/htdocs/fourn/fiche-stats.php +++ b/htdocs/fourn/fiche-stats.php @@ -18,7 +18,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -32,6 +31,8 @@ require('./pre.inc.php'); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); +$user->getrights(); + $langs->load('suppliers'); $langs->load('products'); $langs->load('bills'); diff --git a/htdocs/fourn/stats.php b/htdocs/fourn/stats.php index 4c5b26452b0..79bb7e3dbfc 100644 --- a/htdocs/fourn/stats.php +++ b/htdocs/fourn/stats.php @@ -72,7 +72,7 @@ $fourns=array(); llxHeader(); $sql = "SELECT s.rowid as socid, s.nom, s.ville, ca.ca_genere as ca, ca.year"; -$sql.= " , code_fournisseur, code_compta_fournisseur"; +$sql.= " , s.code_fournisseur, s.code_compta_fournisseur"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."fournisseur_ca as ca"; if ($_GET["cat"]) $sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as cf"; @@ -106,15 +106,16 @@ if ($resql) $i = 0; while ($i < min($num,$conf->liste_limit)) - { - $obj = $db->fetch_object($resql); - $var=!$var; - $i++; + { + $obj = $db->fetch_object($resql); + $var=!$var; + $i++; - $fourns[$obj->socid] = $obj->nom; - $years[$obj->year] = $obj->year; - $ca[$obj->socid][$obj->year] = $obj->ca; - } + $fourns[$obj->socid] = $obj->nom; + $code_fourns[$obj->socid] = $obj->code_fournisseur; + $years[$obj->year] = $obj->year; + $ca[$obj->socid][$obj->year] = $obj->ca; + } } else @@ -130,13 +131,13 @@ print '
| '; +print_liste_field_titre($langs->trans("SupplierCode"),$_SERVER["PHP_SELF"],"s.code_fournisseur","","",'valign="middle"',$sortfield,$sortorder); foreach($years as $year) { print ' | '.$langs->trans("CA") .' '.$year.' | '; } -print ''; +print ' | '; print " | ||||
| '.img_object($langs->trans("ShowSupplier"),"company").''; print " ".$fnom." | \n"; - print "".$obj->ville." | \n"; - print ''.$obj->code_fournisseur.' | '; + print "".$obj->ville." | \n"; + print ''.$code_fourns[$fid].' | '; foreach($years as $year) - { - print ''.price($ca[$fid][$year]).' | '; - } + { + print ''.price($ca[$fid][$year]).' | '; + } print ''; print " |