lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add patch from patrick raguin to support minimum for a price

Browse Source
This commit is contained in:
Laurent Destailleur 2008-08-27 23:30:19 +00:00
parent 8411203632
commit 1f22ba919d
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/comm/stats.php
View File

@ -28,14 +28,20 @@
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/dolgraph.class.php");
/*
* View
*/
llxHeader('',"Stats"); llxHeader('',"Stats");
/************** /**************
* Paramètrage * Paramètrage
*************/ *************/
// Dossier où générer les fichiers // Dossier où générer les fichiers
$dir = $conf->commercial->dir_temp . '/' .$user->id ; $dir = $conf->commercial->dir_temp . '/' .$user->id ;
if(!is_dir($dir)) mkdir($dir,0777,true) ; create_exdir($dir);
// graphes // graphes
$graphwidth = 380 ; $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 .= " 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 .= " WHERE c.rowid = d.fk_commande and d.fk_product = p.rowid";
$sql .= " AND c.fk_user_author = ".$user->id; $sql .= " AND c.fk_user_author = ".$user->id;
$sql .= " AND c.date_valid > ".$db->idate($date_debut)." AND c.date_valid < NOW()"; $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 ;"; $sql .= " GROUP BY date_format(c.date_valid,'%Y%m') ASC";
$result = $db->query($sql) ; $result = $db->query($sql) ;
@ -87,7 +93,7 @@ if($result){
} }
} }
} else { } else {
$mesg = 'Aucune enregistrmeent retourné pour <br>' ; $mesg = 'Aucune enregistrement retourné' ;
} }
} else { } else {
$mesg = 'erreur sql : '.$db->error().'<br> requète : '.$db->lastquery().'<br>' ; $mesg = 'erreur sql : '.$db->error().'<br> requète : '.$db->lastquery().'<br>' ;
@ -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")) : "" ; $generateOn = (file_exists($dir."/".$graph['file']))? $langs->trans("GeneratedOn",dolibarr_print_date(filemtime($dir."/".$graph['file']),"dayhour")) : "" ;
// html // html
print '<table class="border" style="float:left;margin:5px;width:48%;min-width:470px;"> print '<table class="border" style="float:left;margin:5px;width:48%;min-width:400px;">
<tr class="liste_titre"> <tr class="liste_titre">
<td colspan="2">'.$graph['label'].'</td> <td colspan="2">'.$graph['label'].'</td>
</tr> </tr>

4
htdocs/includes/menus/barre_left/eldy_backoffice.php
View File

@ -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=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/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); 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 // 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); 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);
} }