diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index ab0184189a8..56e6cb59657 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -69,7 +69,7 @@ print '<td class="linecoldisablestockchange right">'.$form->textwithpicto($langs
 print '<td class="linecolefficiency right">'.$form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')).'</td>';
 
 // Cost
-print '<td class="linecolcost right">'.$langs->trans('CostPrice').'</td>';
+print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td>';
 
 print '<td class="linecoledit"></td>'; // No width to allow autodim
 
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index f62bf5d9cc5..cd11bdb9803 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -90,8 +90,8 @@ DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 7cc5d3966c1..563fb881152 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -413,19 +413,7 @@ if ($id > 0 || $ref)
             print '<div class="underbanner clearboth"></div>';
             print '<table class="border tableforfield" width="100%">';
 
-			// Minimum Price
-			print '<tr><td class="titlefield">'.$langs->trans("BuyingPriceMin").'</td>';
-            print '<td colspan="2">';
-			$product_fourn = new ProductFournisseur($db);
-			if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
-			{
-			    if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur();
-			    else print $langs->trans("NotDefined");
-			}
-            print '</td></tr>';
-
 			// Cost price. Can be used for margin module for option "calculate margin on explicit cost price
-            // Accountancy sell code
             print '<tr><td>';
 			$textdesc = $langs->trans("CostPriceDescription");
 			$textdesc .= "<br>".$langs->trans("CostPriceUsage");
@@ -435,7 +423,25 @@ if ($id > 0 || $ref)
             print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
             print '</td></tr>';
 
-			print '</table>';
+            // PMP
+            print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("AverageUnitPricePMPShort"), $langs->trans("AverageUnitPricePMPDesc")).'</td>';
+            print '<td>';
+            if ($object->pmp > 0) print price($object->pmp).' '.$langs->trans("HT");
+            print '</td>';
+            print '</tr>';
+
+            // Best buying Price
+            print '<tr><td class="titlefield">'.$langs->trans("BuyingPriceMin").'</td>';
+            print '<td colspan="2">';
+            $product_fourn = new ProductFournisseur($db);
+            if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
+            {
+            	if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur();
+            	else print $langs->trans("NotDefined");
+            }
+            print '</td></tr>';
+
+            print '</table>';
 
             print '</div>';
             print '<div style="clear:both"></div>';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 89e99df4b1e..5ae9e06f2ca 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -54,7 +54,7 @@ if (!empty($conf->variants->enabled)) {
 }
 
 // Load translation files required by the page
-$langs->loadlangs(array('products', 'orders', 'bills', 'stocks', 'sendings'));
+$langs->loadlangs(array('products', 'suppliers', 'orders', 'bills', 'stocks', 'sendings', 'margins'));
 if (!empty($conf->productbatch->enabled)) $langs->load("productbatch");
 
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -564,8 +564,18 @@ if ($id > 0 || $ref)
 				print '</td></tr>';
 			}
 
+			// Cost price. Can be used for margin module for option "calculate margin on explicit cost price
+			print '<tr><td>';
+			$textdesc = $langs->trans("CostPriceDescription");
+			$textdesc .= "<br>".$langs->trans("CostPriceUsage");
+			$text = $form->textwithpicto($langs->trans("CostPrice"), $textdesc, 1, 'help', '');
+			print $form->editfieldkey($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
+			print '</td><td colspan="2">';
+			print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
+			print '</td></tr>';
+
 			// PMP
-			print '<tr><td class="titlefield">'.$langs->trans("AverageUnitPricePMP").'</td>';
+			print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("AverageUnitPricePMPShort"), $langs->trans("AverageUnitPricePMPDesc")).'</td>';
 			print '<td>';
 			if ($object->pmp > 0) print price($object->pmp).' '.$langs->trans("HT");
 			print '</td>';
@@ -822,7 +832,7 @@ if (!$variants) {
 	print '<tr class="liste_titre">';
 	print '<td colspan="4">'.$langs->trans("Warehouse").'</td>';
 	print '<td class="right">'.$langs->trans("NumberOfUnit").'</td>';
-	print '<td class="right">'.$langs->trans("AverageUnitPricePMPShort").'</td>';
+	print '<td class="right">'.$form->textwithpicto($langs->trans("AverageUnitPricePMPShort"), $langs->trans("AverageUnitPricePMPDesc")).'</td>';
 	print '<td class="right">'.$langs->trans("EstimatedStockValueShort").'</td>';
 	print '<td class="right">'.$langs->trans("SellPriceMin").'</td>';
 	print '<td class="right">'.$langs->trans("EstimatedStockValueSellShort").'</td>';