*
* 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
@@ -34,18 +34,17 @@ $langs->load("products");
$langs->load("bills");
$langs->load("other");
-$mode=isset($_GET["mode"])?$_GET["mode"]:'byunit';
-$error=0;
-$mesg='';
+$id = GETPOST('id');
+$ref = GETPOST('ref');
+$mode = (GETPOST('mode') ? GETPOST('mode') : 'byunit');
+$error = 0;
+$mesg = '';
// Security check
-if (isset($_GET["id"]) || isset($_GET["ref"]))
-{
- $id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
-}
-$fieldid = isset($_GET["ref"])?'ref':'rowid';
+$fieldid = (! empty($id) ? $id : $ref);
+$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'produit|service',$id,'product','','',$fieldid);
+$result=restrictedArea($user,'produit|service',$fieldid,'product','','',$fieldtype);
/*
@@ -53,19 +52,18 @@ $result=restrictedArea($user,'produit|service',$id,'product','','',$fieldid);
*/
$form = new Form($db);
-if ($_GET["id"] || $_GET["ref"])
+if (! empty($id) || ! empty($ref))
{
- $product = new Product($db);
- if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]);
- if ($_GET["id"]) $result = $product->fetch($_GET["id"]);
+ $object = new Product($db);
+ $result = $object->fetch($id,$ref);
- llxHeader("","",$langs->trans("CardProduct".$product->type));
+ llxHeader("","",$langs->trans("CardProduct".$object->type));
if ($result)
{
- $head=product_prepare_head($product, $user);
- $titre=$langs->trans("CardProduct".$product->type);
- $picto=($product->type==1?'service':'product');
+ $head=product_prepare_head($object, $user);
+ $titre=$langs->trans("CardProduct".$object->type);
+ $picto=($object->type==1?'service':'product');
dol_fiche_head($head, 'stats', $titre, 0, $picto);
@@ -74,34 +72,34 @@ if ($_GET["id"] || $_GET["ref"])
// Reference
print '';
print '| '.$langs->trans("Ref").' | ';
- print $form->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($object,'ref','',1,'ref');
print ' | ';
print '
';
// Label
- print '| '.$langs->trans("Label").' | '.$product->libelle.' |
';
+ print '| '.$langs->trans("Label").' | '.$object->libelle.' |
';
// Status (to sell)
print '| '.$langs->trans("Status").' ('.$langs->trans("Sell").')'.' | ';
- print $product->getLibStatut(2,0);
+ print $object->getLibStatut(2,0);
print ' |
';
// Status (to buy)
print '| '.$langs->trans("Status").' ('.$langs->trans("Buy").')'.' | ';
- print $product->getLibStatut(2,1);
+ print $object->getLibStatut(2,1);
print ' |
';
// Graphs additionels generes pas le script product-graph.php
$year = strftime('%Y',time());
- $file = get_exdir($product->id, 3) . "ventes-".$year."-".$product->id.".png";
+ $file = get_exdir($object->id, 3) . "ventes-".$year."-".$object->id.".png";
if (file_exists (DOL_DATA_ROOT.'/product/temp/'.$file) )
{
print '| Ventes | ';
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_product&file='.$file;
print ' ';
- $file = get_exdir($product->id, 3) . "ventes-".$product->id.".png";
+ $file = get_exdir($object->id, 3) . "ventes-".$object->id.".png";
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_product&file='.$file;
print '';
print ' |
';
@@ -113,12 +111,12 @@ if ($_GET["id"] || $_GET["ref"])
// Choice of stats
- if ($mode == 'bynumber') print '';
+ if ($mode == 'bynumber') print '';
else print img_picto('','tick').' ';
print $langs->trans("StatsByNumberOfUnits");
if ($mode == 'bynumber') print '';
print ' ';
- if ($mode == 'byunit') print '';
+ if ($mode == 'byunit') print '';
else print img_picto('','tick').' ';
print $langs->trans("StatsByNumberOfEntities");
if ($mode == 'byunit') print '';
@@ -131,9 +129,9 @@ if ($_GET["id"] || $_GET["ref"])
$WIDTH=380;
$HEIGHT=160;
$dir = (!empty($conf->product->dir_temp)?$conf->product->dir_temp:$conf->service->dir_temp);
- if (! file_exists($dir.'/'.$product->id))
+ if (! file_exists($dir.'/'.$object->id))
{
- if (dol_mkdir($dir.'/'.$product->id) < 0)
+ if (dol_mkdir($dir.'/'.$object->id) < 0)
{
$mesg = $langs->trans("ErrorCanNotCreateDir",$dir);
$error++;
@@ -142,20 +140,20 @@ if ($_GET["id"] || $_GET["ref"])
$graphfiles=array(
'propal' =>array('modulepart'=>'productstats_proposals',
- 'file' => $product->id.'/propal12m.png',
+ 'file' => $object->id.'/propal12m.png',
'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsProposals"):$langs->trans("NumberOfProposals"))),
'orders' =>array('modulepart'=>'productstats_orders',
- 'file' => $product->id.'/orders12m.png',
+ 'file' => $object->id.'/orders12m.png',
'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsCustomerOrders"):$langs->trans("NumberOfCustomerOrders"))),
'invoices' =>array('modulepart'=>'productstats_invoices',
- 'file' => $product->id.'/invoices12m.png',
+ 'file' => $object->id.'/invoices12m.png',
'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsCustomerInvoices"):$langs->trans("NumberOfCustomerInvoices"))),
'invoicessuppliers'=>array('modulepart'=>'productstats_invoicessuppliers',
- 'file' => $product->id.'/invoicessuppliers12m.png',
+ 'file' => $object->id.'/invoicessuppliers12m.png',
'label' => ($mode=='byunit'?$langs->trans("NumberOfUnitsSupplierInvoices"):$langs->trans("NumberOfSupplierInvoices"))),
- // 'orderssuppliers' =>array('modulepart'=>'productstats_orderssuppliers', 'file' => $product->id.'/orderssuppliers12m.png', 'label' => $langs->trans("Nombre commande fournisseurs sur les 12 derniers mois")),
- // 'contracts' =>array('modulepart'=>'productstats_contracts', 'file' => $product->id.'/contracts12m.png', 'label' => $langs->trans("Nombre contrats sur les 12 derniers mois")),
+ // 'orderssuppliers' =>array('modulepart'=>'productstats_orderssuppliers', 'file' => $object->id.'/orderssuppliers12m.png', 'label' => $langs->trans("Nombre commande fournisseurs sur les 12 derniers mois")),
+ // 'contracts' =>array('modulepart'=>'productstats_contracts', 'file' => $object->id.'/contracts12m.png', 'label' => $langs->trans("Nombre contrats sur les 12 derniers mois")),
);
@@ -173,10 +171,10 @@ if ($_GET["id"] || $_GET["ref"])
$graph_data = array();
// TODO Test si deja existant et recent, on ne genere pas
- if ($key == 'propal') $graph_data = $product->get_nb_propal($socid,$mode);
- if ($key == 'orders') $graph_data = $product->get_nb_order($socid,$mode);
- if ($key == 'invoices') $graph_data = $product->get_nb_vente($socid,$mode);
- if ($key == 'invoicessuppliers') $graph_data = $product->get_nb_achat($socid,$mode);
+ if ($key == 'propal') $graph_data = $object->get_nb_propal($socid,$mode);
+ if ($key == 'orders') $graph_data = $object->get_nb_order($socid,$mode);
+ if ($key == 'invoices') $graph_data = $object->get_nb_vente($socid,$mode);
+ if ($key == 'invoicessuppliers') $graph_data = $object->get_nb_achat($socid,$mode);
if (is_array($graph_data))
{
$px->SetData($graph_data);
@@ -193,7 +191,7 @@ if ($_GET["id"] || $_GET["ref"])
}
else
{
- dol_print_error($db,'Error for calculating graph on key='.$key.' - '.$product->error);
+ dol_print_error($db,'Error for calculating graph on key='.$key.' - '.$object->error);
}
}
}
@@ -240,7 +238,7 @@ if ($_GET["id"] || $_GET["ref"])
{
print ''.($mesg?''.$mesg.'':$langs->trans("ChartNotGenerated")).' | ';
}
- print ''.img_picto($langs->trans("ReCalculate"),'refresh').' | ';
+ print ''.img_picto($langs->trans("ReCalculate"),'refresh').' | ';
print '';
print '';
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index bbd9938994d..ebbdbfd7292 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -108,9 +108,9 @@ if ($conf->use_javascript_ajax && ((round($third['prospect'])?1:0)+(round($third
{
print '| ';
$dataseries=array();
- if ($conf->societe->enabled && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[]=array('label'=>$langs->trans("Prospects"),'values'=>array(round($third['prospect'])));
- if ($conf->societe->enabled && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Customers"),'values'=>array(round($third['customer'])));
- if ($conf->fournisseur->enabled && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Suppliers"),'values'=>array(round($third['supplier'])));
+ if ($conf->societe->enabled && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[]=array('label'=>$langs->trans("Prospects"),'data'=>round($third['prospect']));
+ if ($conf->societe->enabled && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Customers"),'data'=>round($third['customer']));
+ if ($conf->fournisseur->enabled && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Suppliers"),'data'=>round($third['supplier']));
$data=array('series'=>$dataseries);
dol_print_graph('stats',300,180,$data,1,'pie',0);
print ' |
';