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 '
'; - print ''; - print ''; - print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","",'valign="middle"',$sortfield); - print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.ville","","",'valign="middle"',$sortfield); - print ''; - print_liste_field_titre($langs->trans("CA"),$_SERVER["PHP_SELF"],"s.code_compta","","",'align="right"',$sortfield); - print ''; - print "\n"; - - print ''; - - print ''; - print ''; - - print ''; - - print ''; - - print ''; - - $var=True; - while ($i < min($num,$conf->liste_limit)) { $obj = $db->fetch_object($resql); $var=!$var; - - print ""; - print '\n"; - print "\n"; - print ''; - print ''; - print ''; - print "\n"; $i++; + + $fourns[$obj->idp] = $obj->nom; + $years[$obj->year] = $obj->year; + $ca[$obj->idp][$obj->year] = $obj->ca; } - print "
  
 '; - print '
'.img_object($langs->trans("ShowSupplier"),"company").''; - print " idp\">$obj->nom".$obj->ville."'.$obj->code_fournisseur.' '.price($obj->ca).'  
\n"; - print "
\n"; - $db->free($resql); + } else { dolibarr_print_error($db); } + +print_barre_liste($langs->trans("SuppliersProductsSellSalesTurnover"), $page, "stats.php", "", $sortfield, $sortorder, '', $num); + +print '
'; +print ''; +print ''; +print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","",'valign="middle"',$sortfield); +print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.ville","","",'valign="middle"',$sortfield); +print ''; + +foreach($years as $year) +{ + print ''; +} +print ''; +print "\n"; + +print ''; + +print ''; +print ''; + +foreach($years as $year) +{ + print ''; +} + +print ''; + +print ''; +$var=True; + +foreach($fourns as $fid => $fnom) +{ + $var=!$var; + + print ""; + print '\n"; + print "\n"; + print ''; + + foreach($years as $year) + { + print ''; + } + print ''; + print "\n"; +} + +print "
 '.$langs->trans("CA") .' '.$year.' 
 '; + print '
'.img_object($langs->trans("ShowSupplier"),"company").''; + print " $fnom".$obj->ville."'.$obj->code_fournisseur.' '.price($ca[$fid][$year]).'  
\n"; +print "
\n"; +$db->free($resql); + + + + + + + + + + + $db->close(); llxFooter('$Date$ - $Revision$');