diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index ad4acbe362a..7038c745364 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
@@ -115,8 +115,9 @@ if ($action == "correct_stock" && ! $cancel)
 		$object = new Product($db);
 		$result=$object->fetch($id);
 
-		if ($object->hasbatch() && (! GETPOST("sellby")) && (! GETPOST("eatby")) && (! GETPOST("batch_number"))) {
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors');
+		if ($object->hasbatch() && ! GETPOST("batch_number"))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
 			$error++;
 			$action='correction';
 		}
@@ -202,7 +203,19 @@ if ($action == "transfert_stock" && ! $cancel)
 		$error++;
 		$action='transfert';
 	}
-
+	if (! empty($conf->productbatch->enabled))
+	{
+	    $object = new Product($db);
+	    $result=$object->fetch($id);
+	
+	    if ($object->hasbatch() && ! GETPOST("batch_number"))
+	    {
+	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
+	        $error++;
+	        $action='transfert';
+	    }
+	}
+	
 	if (! $error)
 	{
 		if ($id)
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index b1121731293..90a7468a351 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -80,11 +80,11 @@
 		print '<td colspan="4"><input class="flat" name="unitprice" id="unitprice" size="10" value="'.GETPOST("unitprice").'"></td>';
 		print '</tr>';
 
-		// Eat-by date
+		// Serial / Eat-by date
 		if ((! empty($conf->productbatch->enabled)) && is_object($product) && $product->hasbatch())
 		{
 			print '<tr>';
-			print '<td colspan="2">'.$langs->trans("batch_number").'</td><td colspan="4">';
+			print '<td colspan="2" class="fieldrequired">'.$langs->trans("batch_number").'</td><td colspan="4">';
 			print '<input type="text" name="batch_number" size="40" value="'.GETPOST("batch_number").'">';
 			print '</td>';
 			print '</tr><tr>';
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 93c3135e5f1..0f13a5452da 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -75,7 +75,7 @@
 		if ((! empty($conf->productbatch->enabled)) && $product->hasbatch())
 		{
 			print '<tr>';
-			print '<td>'.$langs->trans("batch_number").'</td><td colspan="5">';
+			print '<td class="fieldrequired">'.$langs->trans("batch_number").'</td><td colspan="5">';
 			print '<input type="text" name="batch_number" size="40"'.($pdluoid > 0 ? ' disabled':'').' value="'.(GETPOST('batch_number')?GETPOST('batch_number'):$pdluo->batch).'">';			// If form was opened for a specific pdluoid, field is disabled
 			print '</td>';
 			print '</tr><tr>';