Qual: Remove not used pages
This commit is contained in:
Laurent Destailleur
parent
edc58e3e93
commit
89beb6313c
@ -1,219 +0,0 @@
|
||||
<?php
|
||||
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2008 Regis Houssin <regis@dolibarr.fr>
|
||||
*
|
||||
* 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
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/**
|
||||
\file htdocs/comm/index.php
|
||||
\ingroup commercial
|
||||
\brief Page acceuil de la zone commercial cliente
|
||||
\version $Id$
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php");
|
||||
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
|
||||
|
||||
|
||||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
llxHeader('',"Stats");
|
||||
|
||||
|
||||
/**************
|
||||
* Paramètrage
|
||||
*************/
|
||||
// Dossier où générer les fichiers
|
||||
$dir = $conf->commercial->dir_temp . '/' .$user->id ;
|
||||
create_exdir($dir);
|
||||
|
||||
// graphes
|
||||
$graphwidth = 380 ;
|
||||
$graphheight = 160 ;
|
||||
|
||||
|
||||
// Chaine contenant les messages d'erreur
|
||||
$msq = '' ;
|
||||
|
||||
// Date de début du graphe
|
||||
$date_debut = time() ;
|
||||
$annees = "" ;
|
||||
if ($conf->global->SOCIETE_FISCAL_MONTH_START < dol_date("m",time()) ){
|
||||
// Si le mois actuel est plus grand, l'année de départ est là même que l'année actuelle
|
||||
$date_debut = mktime(0,0,0,$conf->global->SOCIETE_FISCAL_MONTH_START,1,dol_date("Y",time())) ;
|
||||
$annees = dol_date("Y",time()) ;
|
||||
} else {
|
||||
// Sinon le début de l'année comptable était l'année d'avant
|
||||
$date_debut = mktime(0,0,0,$conf->global->SOCIETE_FISCAL_MONTH_START,1,dol_date("Y",time())-1) ;
|
||||
$annees = (dol_date("Y",time())-1).' - '.(dol_date("Y",time())) ;
|
||||
}
|
||||
|
||||
/**********************************************
|
||||
* Récupération et génération des Infomations
|
||||
**********************************************/
|
||||
$sql = "SELECT sum(d.qty * d.price) as CAMois, sum( d.qty * (d.price - p.price_min) ) as MRMois, date_format(c.date_valid, '%Y%m') as date, date_format(c.date_valid, '%b') as month";
|
||||
$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 <= ".$db->idate(mktime());
|
||||
$sql .= " GROUP BY date_format(c.date_valid,'%Y%m') ASC";
|
||||
|
||||
$result = $db->query($sql) ;
|
||||
|
||||
// On Récupère tout à la fois
|
||||
$recapAnneeCA = array() ;
|
||||
$recapMoisCA = array() ;
|
||||
$recapAnneeMR = array() ;
|
||||
$recapMoisMR = array() ;
|
||||
if($result){
|
||||
if($db->num_rows($result)>0){
|
||||
while($obj = $db->fetch_object($result)){
|
||||
if($obj->date != dol_date("Ym",time())){
|
||||
$recapAnneeCA[] = array( $obj->month, $obj->CAMois ) ;
|
||||
$recapAnneeMR[] = array( $obj->month, $obj->MRMois ) ;
|
||||
}else{
|
||||
$recapMoisCA[] = array( $obj->month, $obj->CAMois ) ;
|
||||
$recapMoisMR[] = array( $obj->month, $obj->MRMois ) ;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$mesg = 'Aucune enregistrement retourné' ;
|
||||
}
|
||||
} else {
|
||||
$mesg = 'erreur sql : '.$db->error().'<br> requète : '.$db->lastquery().'<br>' ;
|
||||
}
|
||||
|
||||
$graphfiles=array(
|
||||
'recapAnneeCA' =>array(
|
||||
'file' => 'recapAnneeCA.png',
|
||||
'label' => $langs->trans('CAOrder').' - '.$annees,
|
||||
'data' => $recapAnneeCA
|
||||
),
|
||||
'recapAnneeMR' =>array(
|
||||
'file' => 'recapAnneeMR.png',
|
||||
'label' => $langs->trans('MargeOrder').' - '.$annees,
|
||||
'data' => $recapAnneeMR
|
||||
),
|
||||
'recapMoisCA' =>array(
|
||||
'file' => 'recapMoisCA.png',
|
||||
'label' => $langs->trans('CAOrder').' '.$langs->trans('FromTo',dol_date("01/m/Y",time()),dol_date("d/m/Y",time())),
|
||||
'data' => $recapMoisCA
|
||||
),
|
||||
'recapMoisMR'=>array(
|
||||
'file' => 'recapMoisMR.png',
|
||||
'label' => $langs->trans('MargeOrder').' '.$langs->trans('FromTo',dol_date("01/m/Y",time()),dol_date("d/m/Y",time())),
|
||||
'data' => $recapMoisMR
|
||||
)
|
||||
) ;
|
||||
|
||||
|
||||
/***********************
|
||||
* Affichage de graphes
|
||||
***********************/
|
||||
$px = new DolGraph();
|
||||
$msggraph = $px->isGraphKo();
|
||||
if (! $mesg)
|
||||
{
|
||||
|
||||
foreach($graphfiles as $key => $graph){
|
||||
$graph_data = $graph['data'] ;
|
||||
|
||||
if (is_array($graph_data))
|
||||
{
|
||||
$px->SetData($graph_data);
|
||||
$px->SetMaxValue($px->GetCeilMaxValue()<0?0:$px->GetCeilMaxValue());
|
||||
$px->SetMinValue($px->GetFloorMinValue()>0?0:$px->GetFloorMinValue());
|
||||
$px->SetWidth($graphwidth);
|
||||
$px->SetHeight($graphheight);
|
||||
$px->SetHorizTickIncrement(1);
|
||||
$px->SetPrecisionY(0);
|
||||
$px->SetShading(3);
|
||||
|
||||
$px->draw($dir."/".$graph['file']);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
dol_print_error($db,'Error for calculating graph on key='.$key.' - '.$product->error);
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
$msg.=$msggraph ;
|
||||
}
|
||||
|
||||
/************
|
||||
* Affichage
|
||||
************/
|
||||
// en-tête
|
||||
if($mesg) print '<div class="error">'.$mesg.'</div>' ;
|
||||
dol_fiche_head(array(array('stats.php',$langs->trans("Commercial"))), 0, $langs->trans("Stats"));
|
||||
/*****************************
|
||||
* Rappel Infos du Commercial
|
||||
*****************************/
|
||||
print '<table class="border" width="100%">
|
||||
<tr>
|
||||
<td width="15%">'.$langs->trans("Name").'</td><td colspan="3">'.$user->nom.'</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="15%">'.$langs->trans("Surname").'</td><td colspan="3">'.$user->prenom.'</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="15%">'.$langs->trans("Login").'</td><td colspan="3">'.$user->login.'</td>
|
||||
</tr>
|
||||
</table>' ;
|
||||
|
||||
print "</div>" ; // Fin de dol_fiche_head
|
||||
|
||||
/***************************
|
||||
* Affichage des Graphiques
|
||||
***************************/
|
||||
//tableaux
|
||||
foreach($graphfiles as $graph){
|
||||
// données
|
||||
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_comm&file='.urlencode($user->id .'/'.$graph['file']);
|
||||
$generateOn = (file_exists($dir."/".$graph['file']))? $langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graph['file']),"dayhour")) : "" ;
|
||||
|
||||
// html
|
||||
print '<table class="border" style="float:left;margin:5px;width:48%;min-width:400px;">
|
||||
<tr class="liste_titre">
|
||||
<td colspan="2">'.$graph['label'].'</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" align="center" style="padding:5px;">
|
||||
<img src="'.$url.'" alt="'.$langs->trans("NoData").'" style="float:left" width="'.$graphwidth.'">
|
||||
<table class="border" style="float:right">
|
||||
<tr class="liste_titre">
|
||||
<td align="center">'.$langs->trans("Month").'</td><td align="center">'.$langs->trans("Currency".$conf->monnaie).'</td>
|
||||
</tr>'.array2table($graph['data'],0,'','','align="center"').'
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>'.$generateOn.'</td>
|
||||
<td align="center"><a href="stats.php?action=recalcul">'.img_picto($langs->trans("ReCalculate"),'refresh').'</a></td>
|
||||
</tr>
|
||||
</table>' ;
|
||||
}
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter();
|
||||
?>
|
||||
@ -1,224 +0,0 @@
|
||||
<?php
|
||||
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2005-2008 Regis Houssin <regis@dolibarr.fr>
|
||||
*
|
||||
* 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
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/compta/stats/comm.php
|
||||
* \ingroup commercial
|
||||
* \version $Id$
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php");
|
||||
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
|
||||
|
||||
if (!$user->rights->compta->resultat->lire)
|
||||
accessforbidden();
|
||||
|
||||
|
||||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
llxHeader('',"Stats");
|
||||
|
||||
if($_GET['id']!="")
|
||||
{
|
||||
// Utilisateur a partir duquel il faut generer les stats
|
||||
$userstats = new User($db,$_GET['id']) ;
|
||||
$userstats->fetch() ;
|
||||
|
||||
// Dossier ou generer les fichiers
|
||||
$dir = $conf->commercial->dir_temp . '/' .$userstats->id ;
|
||||
create_exdir($dir);
|
||||
|
||||
// graphes
|
||||
$graphwidth = 380 ;
|
||||
$graphheight = 160 ;
|
||||
|
||||
|
||||
// Chaine contenant les messages d'erreur
|
||||
$msq = '' ;
|
||||
|
||||
// Date de d<>but du graphe
|
||||
$date_debut = time() ;
|
||||
$annees = "" ;
|
||||
if ($conf->global->SOCIETE_FISCAL_MONTH_START < dol_date("m",time()) ){
|
||||
// Si le mois actuel est plus grand, l'ann<6E>e de d<>part est l<> m<>me que l'ann<6E>e actuelle
|
||||
$date_debut = mktime(0,0,0,$conf->global->SOCIETE_FISCAL_MONTH_START,1,dol_date("Y",time())) ;
|
||||
$annees = dol_date("Y",time()) ;
|
||||
} else {
|
||||
// Sinon le d<>but de l'ann<6E>e comptable <20>tait l'ann<6E>e d'avant
|
||||
$date_debut = mktime(0,0,0,$conf->global->SOCIETE_FISCAL_MONTH_START,1,dol_date("Y",time())-1) ;
|
||||
$annees = (dol_date("Y",time())-1).' - '.(dol_date("Y",time())) ;
|
||||
}
|
||||
|
||||
/**********************************************
|
||||
* R<EFBFBD>cup<EFBFBD>ration et g<EFBFBD>n<EFBFBD>ration des Infomations
|
||||
**********************************************/
|
||||
$sql = "SELECT sum(d.qty * d.price) as CAMois, sum( d.qty * (d.price - p.price_min) ) as MRMois, date_format(c.date_valid, '%Y%m') as date, date_format(c.date_valid, '%b') as month";
|
||||
$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 = ".$userstats->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 ;";
|
||||
|
||||
$result = $db->query($sql) ;
|
||||
|
||||
// On R<>cup<75>re tout <20> la fois
|
||||
$recapAnneeCA = array() ;
|
||||
$recapMoisCA = array() ;
|
||||
$recapAnneeMR = array() ;
|
||||
$recapMoisMR = array() ;
|
||||
if($result){
|
||||
if($db->num_rows($result)>0){
|
||||
while($obj = $db->fetch_object($result)){
|
||||
if($obj->date != dol_date("Ym",time())){
|
||||
$recapAnneeCA[] = array( $obj->month, $obj->CAMois ) ;
|
||||
$recapAnneeMR[] = array( $obj->month, $obj->MRMois ) ;
|
||||
}else{
|
||||
$recapMoisCA[] = array( $obj->month, $obj->CAMois ) ;
|
||||
$recapMoisMR[] = array( $obj->month, $obj->MRMois ) ;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$mesg = 'Aucun enregistrement retourne pour '.$user->login.'<br>' ;
|
||||
}
|
||||
} else {
|
||||
$mesg = 'erreur sql : '.$db->error().'<br> requete : '.$db->lastquery().'<br>' ;
|
||||
}
|
||||
|
||||
$graphfiles=array(
|
||||
'recapAnneeCA' =>array(
|
||||
'file' => 'recapAnneeCA.png',
|
||||
'label' => $langs->trans('CAOrder').' - '.$annees,
|
||||
'data' => $recapAnneeCA
|
||||
),
|
||||
'recapAnneeMR' =>array(
|
||||
'file' => 'recapAnneeMR.png',
|
||||
'label' => $langs->trans('MargeOrder').' - '.$annees,
|
||||
'data' => $recapAnneeMR
|
||||
),
|
||||
'recapMoisCA' =>array(
|
||||
'file' => 'recapMoisCA.png',
|
||||
'label' => $langs->trans('CAOrder').' '.$langs->trans('FromTo',dol_date("01/m/Y",time()),dol_date("d/m/Y",time())),
|
||||
'data' => $recapMoisCA
|
||||
),
|
||||
'recapMoisMR'=>array(
|
||||
'file' => 'recapMoisMR.png',
|
||||
'label' => $langs->trans('MargeOrder').' '.$langs->trans('FromTo',dol_date("01/m/Y",time()),dol_date("d/m/Y",time())),
|
||||
'data' => $recapMoisMR
|
||||
)
|
||||
) ;
|
||||
|
||||
|
||||
/***********************
|
||||
* Affichage de graphes
|
||||
***********************/
|
||||
$px = new DolGraph();
|
||||
$msggraph = $px->isGraphKo();
|
||||
if (! $mesg)
|
||||
{
|
||||
|
||||
foreach($graphfiles as $key => $graph){
|
||||
$graph_data = $graph['data'] ;
|
||||
|
||||
if (is_array($graph_data))
|
||||
{
|
||||
$px->SetData($graph_data);
|
||||
$px->SetMaxValue($px->GetCeilMaxValue()<0?0:$px->GetCeilMaxValue());
|
||||
$px->SetMinValue($px->GetFloorMinValue()>0?0:$px->GetFloorMinValue());
|
||||
$px->SetWidth($graphwidth);
|
||||
$px->SetHeight($graphheight);
|
||||
$px->SetHorizTickIncrement(1);
|
||||
$px->SetPrecisionY(0);
|
||||
$px->SetShading(3);
|
||||
|
||||
$px->draw($dir."/".$graph['file']);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
dol_print_error($db,'Error for calculating graph on key='.$key.' - '.$product->error);
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
$msg.=$msggraph ;
|
||||
}
|
||||
|
||||
/************
|
||||
* Affichage
|
||||
************/
|
||||
// en-t<>te
|
||||
if($mesg) print '<div class="error">'.$mesg.'</div>' ;
|
||||
dol_fiche_head(array(array('stats.php',$langs->trans("Commercial"))), 0, $langs->trans("Stats"));
|
||||
/*****************************
|
||||
* Rappel Infos du Commercial
|
||||
*****************************/
|
||||
print '<table class="border" width="100%">
|
||||
<tr>
|
||||
<td width="15%">'.$langs->trans("Name").'</td><td colspan="3">'.$userstats->nom.'</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="15%">'.$langs->trans("Surname").'</td><td colspan="3">'.$userstats->prenom.'</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="15%">'.$langs->trans("Login").'</td><td colspan="3">'.$userstats->login.'</td>
|
||||
</tr>
|
||||
</table>' ;
|
||||
|
||||
print "</div>" ; // Fin de dol_fiche_head
|
||||
|
||||
/***************************
|
||||
* Affichage des Graphiques
|
||||
***************************/
|
||||
//tableaux
|
||||
foreach($graphfiles as $graph){
|
||||
// donn<6E>es
|
||||
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_comm&file='.urlencode($userstats->id .'/'.$graph['file']);
|
||||
$generateOn = (file_exists($dir."/".$graph['file']))? $langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graph['file']),"dayhour")) : "" ;
|
||||
|
||||
// html
|
||||
print '<table class="border" style="float:left;margin:5px;width:48%;min-width:470px;">
|
||||
<tr class="liste_titre">
|
||||
<td>'.$graph['label'].'</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" style="padding:5px;">
|
||||
<img src="'.$url.'" alt="'.$langs->trans("NoData").'" style="float:left" width="'.$graphwidth.'">
|
||||
<table class="border" style="float:right">
|
||||
<tr class="liste_titre">
|
||||
<td align="center">'.$langs->trans("Month").'</td><td align="center">'.$langs->trans("Currency".$conf->monnaie).'</td>
|
||||
</tr>'.array2table($graph['data'],0,'','','align="center"').'
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>'.$generateOn.'</td>
|
||||
</tr>
|
||||
</table>' ;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter();
|
||||
?>
|
||||
@ -332,8 +332,6 @@ 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 (! empty($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
|
||||
|
||||
@ -298,14 +298,8 @@ if ($modulepart)
|
||||
$original_file='';
|
||||
}
|
||||
|
||||
// images des stats du commercial
|
||||
elseif ($modulepart == 'graph_comm')
|
||||
{
|
||||
$accessallowed=1;
|
||||
$original_file= $conf->commercial->dir_temp . '/' .$original_file; // No files are built on disk
|
||||
}
|
||||
// Wrapping generique (allows any module to open a file if file is in directory
|
||||
// called DOL_DATA_ROOT/modulepart.
|
||||
// called DOL_DATA_ROOT/modulepart).
|
||||
else
|
||||
{
|
||||
$accessallowed=1;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user