diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 41e9c12c63d..b1a17aa903d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7494,12 +7494,14 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 		$i = 0; $countline = 0; $lastaddediscontent = 1;
 		while ($countline < $nboflines && isset($a[$i])) {
 			if (preg_match('/<br[^>]*>/', $a[$i])) {
-				$firstline .= ($ishtml ? "<br>\n" : "\n");
-				// Is it a br for a new line of after a printed line ?
-				if (!$lastaddediscontent) {
-					$countline++;
+				if (array_key_exists($i+1, $a) && !empty($a[$i+1])) {
+					$firstline .= ($ishtml ? "<br>\n" : "\n");
+					// Is it a br for a new line of after a printed line ?
+					if (!$lastaddediscontent) {
+						$countline++;
+					}
+					$lastaddediscontent = 0;
 				}
-				$lastaddediscontent = 0;
 			} else {
 				$firstline .= $a[$i];
 				$lastaddediscontent = 1;
@@ -7507,9 +7509,12 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 			}
 			$i++;
 		}
-		$adddots = isset($a[$i]);
-		unset($a);
-		return $firstline.($adddots ? '...' : '');
+
+		$adddots = (isset($a[$i]) && (!preg_match('/<br[^>]*>/', $a[$i]) || (array_key_exists($i+1, $a) && !empty($a[$i+1]))));
+		//unset($a);
+		$ret = $firstline.($adddots ? '...' : '');
+		//exit;
+		return $ret;
 	}
 }
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 99c2d304592..fb4ed5a2e45 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -34,7 +34,7 @@
 /**
  *    \file       htdocs/product/class/product.class.php
  *    \ingroup    produit
- *    \brief      File of class to manage predefined products or services
+ *    \brief      File of class to manage the predefined products or services
  */
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
@@ -5571,7 +5571,7 @@ class Product extends CommonObject
 	 * @param  int      $origin_id      Origin id of element
 	 * @param  int	    $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
 	 * @param  Extrafields $extrafields	Array of extrafields
-     * @param  boolean  $force_update_batch   Force update batch
+	 * @param  boolean  $force_update_batch   Force update batch
 	 * @return int                      <0 if KO, >0 if OK
 	 */
 	public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null, $force_update_batch = false)