diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 21ed3790418..7012b6bff07 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -365,7 +365,7 @@ function show_stats_for_company($product, $socid)
if ($ret < 0) dol_print_error($db);
$langs->load("propal");
print '| ';
- print ''.img_object('', 'propal').' '.$langs->trans("Proposals").'';
+ print ''.img_object('', 'propal', 'class="paddingright"').$langs->trans("Proposals").'';
print ' | ';
print $product->stats_propale['customers'];
print ' | ';
@@ -383,7 +383,7 @@ function show_stats_for_company($product, $socid)
if ($ret < 0) dol_print_error($db);
$langs->load("supplier_proposal");
print ' |
| ';
- print ''.img_object('', 'supplier_proposal').' '.$langs->trans("SupplierProposals").'';
+ print ''.img_object('', 'supplier_proposal', 'class="paddingright"').$langs->trans("SupplierProposals").'';
print ' | ';
print $product->stats_proposal_supplier['suppliers'];
print ' | ';
@@ -401,7 +401,7 @@ function show_stats_for_company($product, $socid)
if ($ret < 0) dol_print_error($db);
$langs->load("orders");
print ' |
| ';
- print ''.img_object('', 'order').' '.$langs->trans("CustomersOrders").'';
+ print ''.img_object('', 'order', 'class="paddingright"').$langs->trans("CustomersOrders").'';
print ' | ';
print $product->stats_commande['customers'];
print ' | ';
@@ -419,7 +419,7 @@ function show_stats_for_company($product, $socid)
if ($ret < 0) dol_print_error($db);
$langs->load("orders");
print ' |
| ';
- print ''.img_object('', 'supplier_order').' '.$langs->trans("SuppliersOrders").'';
+ print ''.img_object('', 'supplier_order', 'class="paddingright"').$langs->trans("SuppliersOrders").'';
print ' | ';
print $product->stats_commande_fournisseur['suppliers'];
print ' | ';
@@ -455,7 +455,7 @@ function show_stats_for_company($product, $socid)
if ($ret < 0) dol_print_error($db);
$langs->load("bills");
print ' |
| ';
- print ''.img_object('', 'supplier_invoice').' '.$langs->trans("SuppliersInvoices").'';
+ print ''.img_object('', 'supplier_invoice', 'class="paddingright"').$langs->trans("SuppliersInvoices").'';
print ' | ';
print $product->stats_facture_fournisseur['suppliers'];
print ' | ';
@@ -474,7 +474,7 @@ function show_stats_for_company($product, $socid)
if ($ret < 0) dol_print_error($db);
$langs->load("contracts");
print ' |
| ';
- print ''.img_object('', 'contract').' '.$langs->trans("Contracts").'';
+ print ''.img_object('', 'contract', 'class="paddingright"').$langs->trans("Contracts").'';
print ' | ';
print $product->stats_contrat['customers'];
print ' | ';
@@ -496,15 +496,15 @@ function show_stats_for_company($product, $socid)
$langs->load("mrp");
print ' |
| ';
- print ''.img_object('', 'mrp').' '.$langs->trans("BOM").'';
+ print ''.img_object('', 'bom', 'class="paddingright"').$langs->trans("BOM").'';
print ' | ';
print ' | ';
- print $form->textwithpicto($product->stats_bom['nb_toproduce'], $langs->trans("QtyToProduce"));
- print $form->textwithpicto($product->stats_bom['nb_toconsume'], $langs->trans("ToConsume"));
+ print $form->textwithpicto($product->stats_bom['nb_toconsume'], $langs->trans("RowMaterial"));
+ print $form->textwithpicto($product->stats_bom['nb_toproduce'], $langs->trans("Finished"));
print ' | ';
- print $form->textwithpicto($product->stats_bom['qty_toproduce'], $langs->trans("QtyToProduce"));
- print $form->textwithpicto($product->stats_bom['qty_toconsume'], $langs->trans("ToConsume"));
+ print $form->textwithpicto($product->stats_bom['qty_toconsume'], $langs->trans("RowMaterial"));
+ print $form->textwithpicto($product->stats_bom['qty_toproduce'], $langs->trans("Finished"));
print ' | ';
print '
';
}
@@ -519,7 +519,7 @@ function show_stats_for_company($product, $socid)
}
$langs->load("mrp");
print '| ';
- print ''.img_object('', 'mrp').' '.$langs->trans("MO").'';
+ print ''.img_object('', 'mrp', 'class="paddingright"').$langs->trans("MO").'';
print ' | ';
print $form->textwithpicto($product->stats_mo['customers_toconsume'], $langs->trans("ToConsume"));
print $form->textwithpicto($product->stats_mo['customers_consumed'], $langs->trans("QtyAlreadyConsumed"));
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index f8286216e57..3be810a2e8e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2464,7 +2464,7 @@ class Product extends CommonObject
$this->stats_bom['qty_toconsume'] = 0;
$sql = "SELECT COUNT(DISTINCT b.rowid) as nb_toproduce,";
- $sql .= " b.qty as qty_toproduce";
+ $sql .= " SUM(b.qty) as qty_toproduce";
$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
$sql .= " WHERE ";
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index 1582646cd8a..d1254a65b1e 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -244,8 +244,8 @@ if ($id > 0 || !empty($ref))
print ' |
';
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "b.rowid", "", "&id=".$product->id, '', $sortfield, $sortorder);
print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "b.date_valid", "", "&id=".$product->id, 'align="center"', $sortfield, $sortorder);
- print_liste_field_titre("ToConsume", $_SERVER["PHP_SELF"], "", "", "&id=".$product->id, '', $sortfield, $sortorder, 'center ');
- print_liste_field_titre("QtyToProduce", $_SERVER["PHP_SELF"], "", "", "&id=".$product->id, '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("RowMaterial", $_SERVER["PHP_SELF"], "", "", "&id=".$product->id, '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre("Finished", $_SERVER["PHP_SELF"], "", "", "&id=".$product->id, '', $sortfield, $sortorder, 'center ');
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "b.status", "", "&id=".$product->id, '', $sortfield, $sortorder, 'center ');
print "
\n";