diff --git a/htdocs/fourn/stats.php b/htdocs/fourn/stats.php index 187e1bcbe98..aadad334fb9 100644 --- a/htdocs/fourn/stats.php +++ b/htdocs/fourn/stats.php @@ -58,8 +58,8 @@ if ($user->societe_id > 0) if ($page == -1) { $page = 0 ; } $offset = $conf->liste_limit * $page ; -if (! $sortorder) $sortorder="DESC"; -if (! $sortfield) $sortfield="ca"; +if (! $sortorder) $sortorder="ASC"; +if (! $sortfield) $sortfield="year"; /* @@ -67,7 +67,7 @@ if (! $sortfield) $sortfield="ca"; * */ -$sql = "SELECT s.idp, s.nom, s.ville, SUM(ca.ca_genere) as ca"; +$sql = "SELECT s.idp, s.nom, s.ville, ca.ca_genere as ca, ca.year"; $sql.= " , code_fournisseur, 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"; @@ -88,7 +88,8 @@ if ($search_ville) { $sql .= " AND s.ville LIKE '%".$search_ville."%'"; } -$sql .= " GROUP BY ca.fk_societe"; +$sql .= " AND ca.year > (date_format(now(),'%Y') - 5)"; + $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset); $resql = $db->query($sql); @@ -97,56 +98,88 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print_barre_liste($langs->trans("SuppliersProductsSellSalesTurnover"), $page, "stats.php", "", $sortfield, $sortorder, '', $num); - - print '
\n"; - $db->free($resql); + } else { dolibarr_print_error($db); } + +print_barre_liste($langs->trans("SuppliersProductsSellSalesTurnover"), $page, "stats.php", "", $sortfield, $sortorder, '', $num); + +print '\n"; +$db->free($resql); + + + + + + + + + + + $db->close(); llxFooter('$Date$ - $Revision$');