diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php
index de794607fae..acb0e8aacce 100644
--- a/htdocs/product/stats/fiche.php
+++ b/htdocs/product/stats/fiche.php
@@ -244,7 +244,7 @@ if ($_GET["id"] || $_GET["ref"])
if ($ret < 0) dolibarr_print_error($db);
$langs->load("propal");
print '
| ';
- print ''.$langs->trans("Proposals").'';
+ print ''.img_object('','propal').' '.$langs->trans("Proposals").'';
print ' | ';
print $product->stats_propale['customers'];
print ' | ';
@@ -261,7 +261,7 @@ if ($_GET["id"] || $_GET["ref"])
if ($ret < 0) dolibarr_print_error($db);
$langs->load("orders");
print ' |
| ';
- print ''.$langs->trans("Orders").'';
+ print ''.img_object('','order').' '.$langs->trans("Orders").'';
print ' | ';
print $product->stats_commande['customers'];
print ' | ';
@@ -278,7 +278,7 @@ if ($_GET["id"] || $_GET["ref"])
if ($ret < 0) dolibarr_print_error($db);
$langs->load("contracts");
print ' |
| ';
- print ''.$langs->trans("Contracts").'';
+ print ''.img_object('','contract').' '.$langs->trans("Contracts").'';
print ' | ';
print $product->stats_contrat['customers'];
print ' | ';
@@ -295,7 +295,7 @@ if ($_GET["id"] || $_GET["ref"])
if ($ret < 0) dolibarr_print_error($db);
$langs->load("bills");
print ' |
| ';
- print ''.$langs->trans("Bills").'';
+ print ''.img_object('','bill').' '.$langs->trans("Bills").'';
print ' | ';
print $product->stats_facture['customers'];
print ' | ';
diff --git a/htdocs/product/stock/entrepot.class.php b/htdocs/product/stock/entrepot.class.php
index af084f5972c..16e2546c403 100644
--- a/htdocs/product/stock/entrepot.class.php
+++ b/htdocs/product/stock/entrepot.class.php
@@ -331,5 +331,27 @@ class Entrepot
return $this->statuts[$statut];
}
+
+
+ /**
+ * \brief Renvoie nom clicable (avec eventuellement le picto)
+ * \param withpicto Inclut le picto dans le lien
+ * \param option Sur quoi pointe le lien
+ * \return string Chaine avec URL
+ */
+ function getNomUrl($withpicto=0,$option='')
+ {
+ global $langs;
+
+ $result='';
+
+ $lien='';
+ $lienfin='';
+
+ if ($withpicto) $result.=($lien.img_object($langs->trans("ShowStock"),'stock').$lienfin.' ');
+ $result.=$lien.$this->libelle.$lienfin;
+ return $result;
+ }
+
}
?>
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 689a6059649..8b663142d77 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -226,7 +226,7 @@ if ($_GET["id"] || $_GET["ref"])
// Stock
if ($product->type == 0 && $conf->stock->enabled)
{
- print ' |
| '.$langs->trans("Stock").' | ';
+ print '
| '.$langs->trans("TotalStock").' | ';
if ($product->no_stock)
{
print "Pas de définition de stock pour ce produit";
@@ -247,30 +247,6 @@ if ($_GET["id"] || $_GET["ref"])
print "";
- /*
- * Contenu des stocks
- */
- print '
';
- print '| '.$langs->trans("Warehouse").' | Valeur du stock | ';
- $sql = "SELECT e.rowid, e.label, ps.reel FROM ".MAIN_DB_PREFIX."entrepot as e, ".MAIN_DB_PREFIX."product_stock as ps";
- $sql .= " WHERE ps.fk_entrepot = e.rowid AND ps.fk_product = ".$product->id;
- $sql .= " ORDER BY lower(e.label)";
-
- $resql=$db->query($sql);
- if ($resql)
- {
- $num = $db->num_rows($resql);
- $i = 0; $total = 0;
- while ($i < $num)
- {
- $obj = $db->fetch_object($resql);
- print '| '.$obj->label.' | '.$obj->reel.' | '; ;
- $total = $total + $obj->reel;
- $i++;
- }
- }
- print '| '.$langs->trans("Total").': | '.$total." | ";
-
}
print '';
@@ -279,12 +255,14 @@ if ($_GET["id"] || $_GET["ref"])
*/
if ($_GET["action"] == "correction")
{
- print_titre ("Correction du stock");
+ print_titre($langs->trans("StockCorrection"));
print " |