diff --git a/htdocs/comm/stats.php b/htdocs/comm/stats.php index 445b6c3f639..3762f181534 100644 --- a/htdocs/comm/stats.php +++ b/htdocs/comm/stats.php @@ -28,14 +28,20 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); + +/* + * View + */ + llxHeader('',"Stats"); + /************** * Paramètrage *************/ // Dossier où générer les fichiers $dir = $conf->commercial->dir_temp . '/' .$user->id ; -if(!is_dir($dir)) mkdir($dir,0777,true) ; +create_exdir($dir); // graphes $graphwidth = 380 ; @@ -65,8 +71,8 @@ $sql = "SELECT sum(d.qty * d.price) as CAMois, sum( d.qty * (d.price - p.price_m $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."product as p"; $sql .= " WHERE c.rowid = d.fk_commande and d.fk_product = p.rowid"; $sql .= " AND c.fk_user_author = ".$user->id; -$sql .= " AND c.date_valid > ".$db->idate($date_debut)." AND c.date_valid < NOW()"; -$sql .= " GROUP BY date_format(c.date_valid,'%Y%m') ASC ;"; +$sql .= " AND c.date_valid > ".$db->idate($date_debut)." AND c.date_valid <= ".$db->idate(mktime()); +$sql .= " GROUP BY date_format(c.date_valid,'%Y%m') ASC"; $result = $db->query($sql) ; @@ -87,7 +93,7 @@ if($result){ } } } else { - $mesg = 'Aucune enregistrmeent retourné pour
' ; + $mesg = 'Aucune enregistrement retourné' ; } } else { $mesg = 'erreur sql : '.$db->error().'
requète : '.$db->lastquery().'
' ; @@ -185,7 +191,7 @@ foreach($graphfiles as $graph){ $generateOn = (file_exists($dir."/".$graph['file']))? $langs->trans("GeneratedOn",dolibarr_print_date(filemtime($dir."/".$graph['file']),"dayhour")) : "" ; // html - print ' + print '
diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 1264b6c25a4..b645a5e02f6 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -323,6 +323,8 @@ class MenuLeft { if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/liste.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/liste.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1 ,$user->rights->commande->lire); + // Statistiques de vente perso + if ($conf->global->COMMANDE_SHOWMYSTATS && $leftmenu=="orders") $newmenu->add_submenu(DOL_URL_ROOT."/comm/stats.php?leftmenu=orders", $langs->trans("Stats"), 1, $user->rights->commande->lire); } // Suppliers orders @@ -357,8 +359,6 @@ class MenuLeft { if ($leftmenu=="ficheinter") $newmenu->add_submenu(DOL_URL_ROOT."/fichinter/index.php?leftmenu=ficheinter", $langs->trans("List"), 1 ,$user->rights->ficheinter->lire); } - // Statistiques de vente - $newmenu->add(DOL_URL_ROOT."/comm/stats.php", $langs->trans("Stats"), 0 ,1); }
'.$graph['label'].'