From e8a3af017ec8e769b17f3b2d32449e9ac70509fe Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Mon, 6 Aug 2012 17:10:55 +0200
Subject: [PATCH 1/2] task #185 : Can input HT amount when correcting stock to
 recalculate PMP

---
 htdocs/langs/fr_FR/stocks.lang   | 1 +
 htdocs/product/stock/product.php | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 4aacdedaead..6549d8a4afc 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -33,6 +33,7 @@ StockCorrection=Corriger stock
 StockMovement=Transférer
 StockMovements=Mouvements de stock
 NumberOfUnit=Nombre de pièces
+UnitPurchaseValue=Prix d'achat unitaire
 TotalStock=Total en stock
 StockTooLow=Stock insuffisant
 EnhancedValue=Valorisation
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index a3cdf0f7dc9..65f741f3225 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -74,6 +74,7 @@ if ($action == 'setstocklimit')
 // Correct stock
 if ($action == "correct_stock" && ! $_POST["cancel"])
 {
+	if ($_POST["price"] == '') $_POST["price"] = 0;
 	if (is_numeric($_POST["nbpiece"]) && $id)
 	{
 		$product = new Product($db);
@@ -85,7 +86,7 @@ if ($action == "correct_stock" && ! $_POST["cancel"])
     		$_POST["nbpiece"],
     		$_POST["mouvement"],
     		$_POST["label"],
-    		0
+    		$_POST["price"]
 		);		// We do not change value of stock for a correction
 
 		if ($result > 0)
@@ -350,9 +351,10 @@ if ($_GET["id"] || $_GET["ref"])
 		// Label
 		print '<tr>';
 		print '<td width="20%">'.$langs->trans("Label").'</td>';
-		print '<td colspan="4">';
+		print '<td colspan="2">';
 		print '<input type="text" name="label" size="40" value="">';
 		print '</td>';
+		print '<td width="20%">'.$langs->trans("UnitPurchaseValue").'</td><td width="20%"><input class="flat" name="price" size="10" value=""></td>';
 		print '</tr>';
 
 		print '</table>';

From c2b38e84153979739f34d11b1e81a69719ae59c2 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Mon, 6 Aug 2012 18:11:00 +0200
Subject: [PATCH 2/2] task #185

---
 htdocs/product/stock/product.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 65f741f3225..3cc34986d2f 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -75,7 +75,7 @@ if ($action == 'setstocklimit')
 if ($action == "correct_stock" && ! $_POST["cancel"])
 {
 	if ($_POST["price"] == '') $_POST["price"] = 0;
-	if (is_numeric($_POST["nbpiece"]) && $id)
+	if (is_numeric($_POST["nbpiece"]) && $id && is_numeric($_POST["price"]))
 	{
 		$product = new Product($db);
 		$result=$product->fetch($id);