diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 44e9e7ecea9..88927e94890 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -566,764 +566,780 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
-$sql .= $db->order($sortfield, $sortorder);
 
+// Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+	/* This old and fast method to get and count full list returns all record so use a high amount of memory.
+	 $resql = $db->query($sql);
+	 $nbtotalofrecords = $db->num_rows($resql);
+	 */
+	/* The slow method does not consume memory on mysql (not tested on pgsql) */
+	/*$resql = $db->query($sql, 0, 'auto', 1);
+	 while ($db->fetch_object($resql)) {
+	 $nbtotalofrecords++;
+	 }*/
+	/* This fast and low memory method to get and count full list converts the sql into a sql count */
+	$sqlforcount = preg_replace('/^SELECT[a-z0-9\._\s\(\),]+FROM/i', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	$resql = $db->query($sqlforcount);
+	$objforcount = $db->fetch_object($resql);
+	$nbtotalofrecords = $objforcount->nbtotalofrecords;
 	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
+	$db->free($resql);
 }
 
-$sql .= $db->plimit($limit + 1, $offset);
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+	$sql .= $db->plimit($limit + 1, $offset);
+}
 
 //print $sql;
 
 $resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
 
-if ($resql) {
-	$product = new Product($db);
-	$object = new Entrepot($db);
+$product = new Product($db);
+$object = new Entrepot($db);
 
-	if ($idproduct > 0) {
-		$product->fetch($idproduct);
+if ($idproduct > 0) {
+	$product->fetch($idproduct);
+}
+if ($id > 0 || $ref) {
+	$result = $object->fetch($id, $ref);
+	if ($result < 0) {
+		dol_print_error($db);
 	}
-	if ($id > 0 || $ref) {
-		$result = $object->fetch($id, $ref);
-		if ($result < 0) {
-			dol_print_error($db);
-		}
+}
+
+$num = $db->num_rows($resql);
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
+
+$i = 0;
+$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
+if ($msid) {
+	$texte = $langs->trans('StockMovementForId', $msid);
+} else {
+	$texte = $langs->trans("ListOfStockMovements");
+	if ($id) {
+		$texte .= ' ('.$langs->trans("ForThisWarehouse").')';
 	}
+}
+llxHeader("", $texte, $help_url);
 
-	$num = $db->num_rows($resql);
+/*
+ * Show tab only if we ask a particular warehouse
+ */
+if ($object->id > 0) {
+	$head = stock_prepare_head($object);
 
-	$arrayofselected = is_array($toselect) ? $toselect : array();
+	print dol_get_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock');
 
 
-	$i = 0;
-	$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-	if ($msid) {
-		$texte = $langs->trans('StockMovementForId', $msid);
-	} else {
-		$texte = $langs->trans("ListOfStockMovements");
-		if ($id) {
-			$texte .= ' ('.$langs->trans("ForThisWarehouse").')';
-		}
-	}
-	llxHeader("", $texte, $help_url);
+	$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	/*
-	 * Show tab only if we ask a particular warehouse
-	 */
-	if ($object->id > 0) {
-		$head = stock_prepare_head($object);
+	$morehtmlref = '<div class="refidno">';
+	$morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
 
-		print dol_get_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock');
-
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-		$morehtmlref = '<div class="refidno">';
-		$morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
-
-		// Project
-		if (!empty($conf->projet->enabled)) {
-			$langs->load("projects");
-			$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
-			if ($usercancreate && 1 == 2) {
-				if ($action != 'classify') {
-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-				}
-				if ($action == 'classify') {
-					$projectid = $object->fk_project;
-					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-					$morehtmlref .= $formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
-					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-					$morehtmlref .= '</form>';
-				} else {
-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-				}
+	// Project
+	if (!empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
+		if ($usercancreate && 1 == 2) {
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				$projectid = $object->fk_project;
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
 			} else {
-				if (!empty($object->fk_project)) {
-					$proj = new Project($db);
-					$proj->fetch($object->fk_project);
-					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-					$morehtmlref .= $proj->ref;
-					$morehtmlref .= '</a>';
-				} else {
-					$morehtmlref .= '';
-				}
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
 			}
 		}
-		$morehtmlref .= '</div>';
+	}
+	$morehtmlref .= '</div>';
 
-		$shownav = 1;
-		if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
-			$shownav = 0;
-		}
-
-		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref);
-
-
-		print '<div class="fichecenter">';
-		print '<div class="fichehalfleft">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border centpercent tableforfield">';
-
-		print '<tr>';
-
-		// Description
-		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>'.dol_htmlentitiesbr($object->description).'</td></tr>';
-
-		$calcproductsunique = $object->nb_different_products();
-		$calcproducts = $object->nb_products();
-
-		// Total nb of different products
-		print '<tr><td>'.$langs->trans("NumberOfDifferentProducts").'</td><td>';
-		print empty($calcproductsunique['nb']) ? '0' : $calcproductsunique['nb'];
-		print "</td></tr>";
-
-		// Nb of products
-		print '<tr><td>'.$langs->trans("NumberOfProducts").'</td><td>';
-		$valtoshow = price2num($calcproducts['nb'], 'MS');
-		print empty($valtoshow) ? '0' : $valtoshow;
-		print "</td></tr>";
-
-		print '</table>';
-
-		print '</div>';
-		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border centpercent tableforfield">';
-
-		// Value
-		print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
-		print price((empty($calcproducts['value']) ? '0' : price2num($calcproducts['value'], 'MT')), 0, $langs, 0, -1, -1, $conf->currency);
-		print "</td></tr>";
-
-		// Last movement
-		$sql = "SELECT MAX(m.datem) as datem";
-		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-		$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
-		$resqlbis = $db->query($sql);
-		if ($resqlbis) {
-			$objbis = $db->fetch_object($resqlbis);
-			$lastmovementdate = $db->jdate($objbis->datem);
-		} else {
-			dol_print_error($db);
-		}
-
-		print '<tr><td>'.$langs->trans("LastMovement").'</td><td>';
-		if ($lastmovementdate) {
-			print dol_print_date($lastmovementdate, 'dayhour');
-		} else {
-			print $langs->trans("None");
-		}
-		print "</td></tr>";
-
-		// Other attributes
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
-		// Categories
-		if ($conf->categorie->enabled) {
-			print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
-			print $form->showCategories($object->id, Categorie::TYPE_WAREHOUSE, 1);
-			print "</td></tr>";
-		}
-
-		print "</table>";
-
-		print '</div>';
-		print '</div>';
-		print '</div>';
-
-		print '<div class="clearboth"></div>';
-
-		print dol_get_fiche_end();
+	$shownav = 1;
+	if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		$shownav = 0;
 	}
 
-
-	/*
-	 * Correct stock
-	 */
-	if ($action == "correction") {
-		include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stockcorrection.tpl.php';
-		print '<br>';
-	}
-
-	/*
-	 * Transfer of units
-	 */
-	if ($action == "transfert") {
-		include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stocktransfer.tpl.php';
-		print '<br>';
-	}
+	dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref);
 
 
-	/*
-	 * Action bar
-	 */
-	if ((empty($action) || $action == 'list') && $id > 0) {
-		print "<div class=\"tabsAction\">\n";
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-		if ($user->rights->stock->mouvement->creer) {
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=correction">'.$langs->trans("CorrectStock").'</a>';
-		}
+	print '<table class="border centpercent tableforfield">';
 
-		if ($user->rights->stock->mouvement->creer) {
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
-		}
+	print '<tr>';
 
-		print '</div><br>';
-	}
+	// Description
+	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>'.dol_htmlentitiesbr($object->description).'</td></tr>';
 
-	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-		$param .= '&contextpage='.urlencode($contextpage);
-	}
-	if ($limit > 0 && $limit != $conf->liste_limit) {
-		$param .= '&limit='.urlencode($limit);
-	}
-	if ($id > 0) {
-		$param .= '&id='.urlencode($id);
-	}
-	if ($search_date_startday) {
-		$param .= '&search_date_startday='.urlencode($search_date_startday);
-	}
-	if ($search_date_startmonth) {
-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
-	}
-	if ($search_date_startyear) {
-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
-	}
-	if ($search_date_endday) {
-		$param .= '&search_date_endday='.urlencode($search_date_endday);
-	}
-	if ($search_date_endmonth) {
-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
-	}
-	if ($search_date_endyear) {
-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
-	}
-	if ($search_movement) {
-		$param .= '&search_movement='.urlencode($search_movement);
-	}
-	if ($search_inventorycode) {
-		$param .= '&search_inventorycode='.urlencode($search_inventorycode);
-	}
-	if ($search_type_mouvement) {
-		$param .= '&search_type_mouvement='.urlencode($search_type_mouvement);
-	}
-	if ($search_product_ref) {
-		$param .= '&search_product_ref='.urlencode($search_product_ref);
-	}
-	if ($search_product) {
-		$param .= '&search_product='.urlencode($search_product);
-	}
-	if ($search_batch) {
-		$param .= '&search_batch='.urlencode($search_batch);
-	}
-	if ($search_warehouse > 0) {
-		$param .= '&search_warehouse='.urlencode($search_warehouse);
-	}
-	if ($search_user) {
-		$param .= '&search_user='.urlencode($search_user);
-	}
-	if ($idproduct > 0) {
-		$param .= '&idproduct='.urlencode($idproduct);
-	}
-	// Add $param from extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+	$calcproductsunique = $object->nb_different_products();
+	$calcproducts = $object->nb_products();
 
-	// List of mass actions available
-	$arrayofmassactions = array(
-	//    'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
-	//    'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-	);
-	// By default, we should never accept deletion of stock movement.
-	if (!empty($conf->global->STOCK_ALLOW_DELETE_OF_MOVEMENT) && $permissiontodelete) {
-		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
-	}
-	if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
-		$arrayofmassactions = array();
-	}
-	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+	// Total nb of different products
+	print '<tr><td>'.$langs->trans("NumberOfDifferentProducts").'</td><td>';
+	print empty($calcproductsunique['nb']) ? '0' : $calcproductsunique['nb'];
+	print "</td></tr>";
 
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	}
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="type" value="'.$type.'">';
-	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-	if ($id > 0) {
-		print '<input type="hidden" name="id" value="'.$id.'">';
-	}
+	// Nb of products
+	print '<tr><td>'.$langs->trans("NumberOfProducts").'</td><td>';
+	$valtoshow = price2num($calcproducts['nb'], 'MS');
+	print empty($valtoshow) ? '0' : $valtoshow;
+	print "</td></tr>";
 
-	if ($id > 0) {
-		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
+	print '</table>';
+
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
+
+	print '<table class="border centpercent tableforfield">';
+
+	// Value
+	print '<tr><td class="titlefield">'.$langs->trans("EstimatedStockValueShort").'</td><td>';
+	print price((empty($calcproducts['value']) ? '0' : price2num($calcproducts['value'], 'MT')), 0, $langs, 0, -1, -1, $conf->currency);
+	print "</td></tr>";
+
+	// Last movement
+	$sql = "SELECT MAX(m.datem) as datem";
+	$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
+	$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
+	$resqlbis = $db->query($sql);
+	if ($resqlbis) {
+		$objbis = $db->fetch_object($resqlbis);
+		$lastmovementdate = $db->jdate($objbis->datem);
 	} else {
-		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
+		dol_print_error($db);
 	}
 
-	// Add code for pre mass action (confirmation or email presend form)
-	$topicmail = "SendStockMovement";
-	$modelmail = "movementstock";
-	$objecttmp = new MouvementStock($db);
-	$trackid = 'mov'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
-
-	if ($sall) {
-		foreach ($fieldstosearchall as $key => $val) {
-			$fieldstosearchall[$key] = $langs->trans($val);
-		}
-		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
-	}
-
-	$moreforfilter = '';
-
-	$parameters = array('arrayfields'=>&$arrayfields);
-	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) {
-		$moreforfilter .= $hookmanager->resPrint;
+	print '<tr><td>'.$langs->trans("LastMovement").'</td><td>';
+	if ($lastmovementdate) {
+		print dol_print_date($lastmovementdate, 'dayhour');
 	} else {
-		$moreforfilter = $hookmanager->resPrint;
+		print $langs->trans("None");
+	}
+	print "</td></tr>";
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	// Categories
+	if ($conf->categorie->enabled) {
+		print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
+		print $form->showCategories($object->id, Categorie::TYPE_WAREHOUSE, 1);
+		print "</td></tr>";
 	}
 
-	if (!empty($moreforfilter)) {
-		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-		print $moreforfilter;
-		print '</div>';
+	print "</table>";
+
+	print '</div>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+}
+
+
+/*
+ * Correct stock
+ */
+if ($action == "correction") {
+	include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stockcorrection.tpl.php';
+	print '<br>';
+}
+
+/*
+ * Transfer of units
+ */
+if ($action == "transfert") {
+	include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stocktransfer.tpl.php';
+	print '<br>';
+}
+
+
+/*
+ * Action bar
+ */
+if ((empty($action) || $action == 'list') && $id > 0) {
+	print "<div class=\"tabsAction\">\n";
+
+	if ($user->rights->stock->mouvement->creer) {
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=correction">'.$langs->trans("CorrectStock").'</a>';
 	}
 
-	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	if ($user->rights->stock->mouvement->creer) {
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
+	}
 
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '</div><br>';
+}
 
-	// Fields title search
-	print '<tr class="liste_titre_filter">';
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($id > 0) {
+	$param .= '&id='.urlencode($id);
+}
+if ($search_date_startday) {
+	$param .= '&search_date_startday='.urlencode($search_date_startday);
+}
+if ($search_date_startmonth) {
+	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+}
+if ($search_date_startyear) {
+	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+}
+if ($search_date_endday) {
+	$param .= '&search_date_endday='.urlencode($search_date_endday);
+}
+if ($search_date_endmonth) {
+	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+}
+if ($search_date_endyear) {
+	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+}
+if ($search_movement) {
+	$param .= '&search_movement='.urlencode($search_movement);
+}
+if ($search_inventorycode) {
+	$param .= '&search_inventorycode='.urlencode($search_inventorycode);
+}
+if ($search_type_mouvement) {
+	$param .= '&search_type_mouvement='.urlencode($search_type_mouvement);
+}
+if ($search_product_ref) {
+	$param .= '&search_product_ref='.urlencode($search_product_ref);
+}
+if ($search_product) {
+	$param .= '&search_product='.urlencode($search_product);
+}
+if ($search_batch) {
+	$param .= '&search_batch='.urlencode($search_batch);
+}
+if ($search_warehouse > 0) {
+	$param .= '&search_warehouse='.urlencode($search_warehouse);
+}
+if ($search_user) {
+	$param .= '&search_user='.urlencode($search_user);
+}
+if ($idproduct > 0) {
+	$param .= '&idproduct='.urlencode($idproduct);
+}
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+// List of mass actions available
+$arrayofmassactions = array(
+//    'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+//    'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+);
+// By default, we should never accept deletion of stock movement.
+if (!empty($conf->global->STOCK_ALLOW_DELETE_OF_MOVEMENT) && $permissiontodelete) {
+	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="type" value="'.$type.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+if ($id > 0) {
+	print '<input type="hidden" name="id" value="'.$id.'">';
+}
+
+if ($id > 0) {
+	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
+} else {
+	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'movement', 0, '', '', $limit, 0, 0, 1);
+}
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendStockMovement";
+$modelmail = "movementstock";
+$objecttmp = new MouvementStock($db);
+$trackid = 'mov'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($sall) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+
+$parameters = array('arrayfields'=>&$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
+
+if (!empty($moreforfilter)) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+// Fields title search
+print '<tr class="liste_titre_filter">';
+if (!empty($arrayfields['m.rowid']['checked'])) {
+	// Ref
+	print '<td class="liste_titre left">';
+	print '<input class="flat maxwidth25" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+if (! empty($arrayfields['m.datem']['checked'])) {
+	// Date
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'), 'tzuserrel');
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'), 'tzuserrel');
+	print '</div>';
+	print '</td>';
+}
+if (!empty($arrayfields['p.ref']['checked'])) {
+	// Product Ref
+	print '<td class="liste_titre left">';
+	print '<input class="flat maxwidth75" type="text" name="search_product_ref" value="'.dol_escape_htmltag($idproduct ? $product->ref : $search_product_ref).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.label']['checked'])) {
+	// Product label
+	print '<td class="liste_titre left">';
+	print '<input class="flat maxwidth100" type="text" name="search_product" value="'.dol_escape_htmltag($idproduct ? $product->label : $search_product).'">';
+	print '</td>';
+}
+// Batch
+if (!empty($arrayfields['m.batch']['checked'])) {
+	print '<td class="liste_titre center"><input class="flat maxwidth75" type="text" name="search_batch" value="'.dol_escape_htmltag($search_batch).'"></td>';
+}
+if (!empty($arrayfields['pl.eatby']['checked'])) {
+	print '<td class="liste_titre left">';
+	print '</td>';
+}
+if (!empty($arrayfields['pl.sellby']['checked'])) {
+	print '<td class="liste_titre left">';
+	print '</td>';
+}
+// Warehouse
+if (!empty($arrayfields['e.ref']['checked'])) {
+	print '<td class="liste_titre maxwidthonsmartphone left">';
+	//print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
+	print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
+	print '</td>';
+}
+if (!empty($arrayfields['m.fk_user_author']['checked'])) {
+	// Author
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" size="6" name="search_user" value="'.dol_escape_htmltag($search_user).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['m.inventorycode']['checked'])) {
+	// Inventory code
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" size="4" name="search_inventorycode" value="'.dol_escape_htmltag($search_inventorycode).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['m.label']['checked'])) {
+	// Label of movement
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" size="8" name="search_movement" value="'.dol_escape_htmltag($search_movement).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['origin']['checked'])) {
+	// Origin of movement
+	print '<td class="liste_titre left">';
+	print '&nbsp; ';
+	print '</td>';
+}
+if (!empty($arrayfields['m.fk_projet']['checked'])) {
+	// fk_project
+	print '<td class="liste_titre" align="left">';
+	print '&nbsp; ';
+	print '</td>';
+}
+if (!empty($arrayfields['m.type_mouvement']['checked'])) {
+	// Type of movement
+	print '<td class="liste_titre center">';
+	//print '<input class="flat" type="text" size="3" name="search_type_mouvement" value="'.dol_escape_htmltag($search_type_mouvement).'">';
+	print '<select id="search_type_mouvement" name="search_type_mouvement" class="maxwidth150">';
+	print '<option value="" '.(($search_type_mouvement == "") ? 'selected="selected"' : '').'>&nbsp;</option>';
+	print '<option value="0" '.(($search_type_mouvement == "0") ? 'selected="selected"' : '').'>'.$langs->trans('StockIncreaseAfterCorrectTransfer').'</option>';
+	print '<option value="1" '.(($search_type_mouvement == "1") ? 'selected="selected"' : '').'>'.$langs->trans('StockDecreaseAfterCorrectTransfer').'</option>';
+	print '<option value="2" '.(($search_type_mouvement == "2") ? 'selected="selected"' : '').'>'.$langs->trans('StockDecrease').'</option>';
+	print '<option value="3" '.(($search_type_mouvement == "3") ? 'selected="selected"' : '').'>'.$langs->trans('StockIncrease').'</option>';
+	print '</select>';
+	print ajax_combobox('search_type_mouvement');
+	// TODO: add new function $formentrepot->selectTypeOfMovement(...) like
+	// print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
+	print '</td>';
+}
+if (!empty($arrayfields['m.value']['checked'])) {
+	// Qty
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_qty" value="'.dol_escape_htmltag($search_qty).'">';
+	print '</td>';
+}
+if (!empty($arrayfields['m.price']['checked'])) {
+	// Price
+	print '<td class="liste_titre" align="left">';
+	print '&nbsp; ';
+	print '</td>';
+}
+
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Date creation
+if (!empty($arrayfields['m.datec']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+// Date modification
+if (!empty($arrayfields['m.tms']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+// Actions
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterAndCheckAddButtons(0);
+print $searchpicto;
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="liste_titre">';
+if (!empty($arrayfields['m.rowid']['checked'])) {
+	print_liste_field_titre($arrayfields['m.rowid']['label'], $_SERVER["PHP_SELF"], 'm.rowid', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.datem']['checked'])) {
+	print_liste_field_titre($arrayfields['m.datem']['label'], $_SERVER["PHP_SELF"], 'm.datem', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.label']['checked'])) {
+	print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.batch']['checked'])) {
+	print_liste_field_titre($arrayfields['m.batch']['label'], $_SERVER["PHP_SELF"], 'm.batch', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['pl.eatby']['checked'])) {
+	print_liste_field_titre($arrayfields['pl.eatby']['label'], $_SERVER["PHP_SELF"], 'pl.eatby', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['pl.sellby']['checked'])) {
+	print_liste_field_titre($arrayfields['pl.sellby']['label'], $_SERVER["PHP_SELF"], 'pl.sellby', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['e.ref']['checked'])) {
+	// We are on a specific warehouse card, no filter on other should be possible
+	print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.fk_user_author']['checked'])) {
+	print_liste_field_titre($arrayfields['m.fk_user_author']['label'], $_SERVER["PHP_SELF"], "m.fk_user_author", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.inventorycode']['checked'])) {
+	print_liste_field_titre($arrayfields['m.inventorycode']['label'], $_SERVER["PHP_SELF"], "m.inventorycode", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.label']['checked'])) {
+	print_liste_field_titre($arrayfields['m.label']['label'], $_SERVER["PHP_SELF"], "m.label", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['origin']['checked'])) {
+	print_liste_field_titre($arrayfields['origin']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.fk_projet']['checked'])) {
+	print_liste_field_titre($arrayfields['m.fk_projet']['label'], $_SERVER["PHP_SELF"], "m.fk_projet", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['m.type_mouvement']['checked'])) {
+	print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['m.value']['checked'])) {
+	print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['m.price']['checked'])) {
+	print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (!empty($arrayfields['m.datec']['checked'])) {
+	print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['m.tms']['checked'])) {
+	print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+print "</tr>\n";
+
+
+$arrayofuniqueproduct = array();
+
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit)) {
+	$objp = $db->fetch_object($resql);
+
+	$userstatic->id = $objp->fk_user_author;
+	$userstatic->login = $objp->login;
+	$userstatic->lastname = $objp->lastname;
+	$userstatic->firstname = $objp->firstname;
+	$userstatic->photo = $objp->photo;
+	$userstatic->email = $objp->user_email;
+	$userstatic->statut = $objp->user_status;
+
+	$productstatic->id = $objp->rowid;
+	$productstatic->ref = $objp->product_ref;
+	$productstatic->label = $objp->produit;
+	$productstatic->type = $objp->type;
+	$productstatic->entity = $objp->entity;
+	$productstatic->status = $objp->tosell;
+	$productstatic->status_buy = $objp->tobuy;
+	$productstatic->status_batch = $objp->tobatch;
+
+	$productlot->id = $objp->lotid;
+	$productlot->batch = $objp->batch;
+	$productlot->eatby = $objp->eatby;
+	$productlot->sellby = $objp->sellby;
+
+	$warehousestatic->id = $objp->entrepot_id;
+	$warehousestatic->ref = $objp->warehouse_ref;
+	$warehousestatic->label = $objp->warehouse_ref;
+	$warehousestatic->lieu = $objp->lieu;
+	$warehousestatic->fk_parent = $objp->fk_parent;
+	$warehousestatic->statut = $objp->statut;
+
+	$movement->type = $objp->type_mouvement;
+
+	$arrayofuniqueproduct[$objp->rowid] = $objp->produit;
+	if (!empty($objp->fk_origin)) {
+		$origin = $movement->get_origin($objp->fk_origin, $objp->origintype);
+	} else {
+		$origin = '';
+	}
+
+	print '<tr class="oddeven">';
+	// Id movement
 	if (!empty($arrayfields['m.rowid']['checked'])) {
-		// Ref
-		print '<td class="liste_titre left">';
-		print '<input class="flat maxwidth25" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-		print '</td>';
+		print '<td>';
+		print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
+		print $objp->mid;
+		print '</td>'; // This is primary not movement id
 	}
-	if (! empty($arrayfields['m.datem']['checked'])) {
+	if (!empty($arrayfields['m.datem']['checked'])) {
 		// Date
-		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
-		print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'), 'tzuserrel');
-		print '</div>';
-		print '<div class="nowrap">';
-		print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'), 'tzuserrel');
-		print '</div>';
-		print '</td>';
+		print '<td class="nowraponall center">'.dol_print_date($db->jdate($objp->datem), 'dayhour', 'tzuserrel').'</td>';
 	}
 	if (!empty($arrayfields['p.ref']['checked'])) {
-		// Product Ref
-		print '<td class="liste_titre left">';
-		print '<input class="flat maxwidth75" type="text" name="search_product_ref" value="'.dol_escape_htmltag($idproduct ? $product->ref : $search_product_ref).'">';
-		print '</td>';
+		// Product ref
+		print '<td class="nowraponall">';
+		print $productstatic->getNomUrl(1, 'stock', 16);
+		print "</td>\n";
 	}
 	if (!empty($arrayfields['p.label']['checked'])) {
 		// Product label
-		print '<td class="liste_titre left">';
-		print '<input class="flat maxwidth100" type="text" name="search_product" value="'.dol_escape_htmltag($idproduct ? $product->label : $search_product).'">';
-		print '</td>';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($productstatic->label).'">';
+		print $productstatic->label;
+		print "</td>\n";
 	}
-	// Batch
 	if (!empty($arrayfields['m.batch']['checked'])) {
-		print '<td class="liste_titre center"><input class="flat maxwidth75" type="text" name="search_batch" value="'.dol_escape_htmltag($search_batch).'"></td>';
+		print '<td class="center nowraponall">';
+		if ($productlot->id > 0) {
+			print $productlot->getNomUrl(1);
+		} else {
+			print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
+		}
+		print '</td>';
 	}
 	if (!empty($arrayfields['pl.eatby']['checked'])) {
-		print '<td class="liste_titre left">';
-		print '</td>';
+		print '<td class="center">'.dol_print_date($objp->eatby, 'day').'</td>';
 	}
 	if (!empty($arrayfields['pl.sellby']['checked'])) {
-		print '<td class="liste_titre left">';
-		print '</td>';
+		print '<td class="center">'.dol_print_date($objp->sellby, 'day').'</td>';
 	}
 	// Warehouse
 	if (!empty($arrayfields['e.ref']['checked'])) {
-		print '<td class="liste_titre maxwidthonsmartphone left">';
-		//print '<input class="flat" type="text" size="8" name="search_warehouse" value="'.($search_warehouse).'">';
-		print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
-		print '</td>';
+		print '<td class="tdoverflowmax100">';
+		print $warehousestatic->getNomUrl(1);
+		print "</td>\n";
 	}
+	// Author
 	if (!empty($arrayfields['m.fk_user_author']['checked'])) {
-		// Author
-		print '<td class="liste_titre left">';
-		print '<input class="flat" type="text" size="6" name="search_user" value="'.dol_escape_htmltag($search_user).'">';
-		print '</td>';
+		print '<td class="tdoverflowmax100">';
+		print $userstatic->getNomUrl(-1);
+		print "</td>\n";
 	}
 	if (!empty($arrayfields['m.inventorycode']['checked'])) {
 		// Inventory code
-		print '<td class="liste_titre left">';
-		print '<input class="flat" type="text" size="4" name="search_inventorycode" value="'.dol_escape_htmltag($search_inventorycode).'">';
-		print '</td>';
+		print '<td><a href="'.$_SERVER["PHP_SELF"].'?search_inventorycode='.urlencode('^'.$objp->inventorycode.'$').'&search_type_mouvement='.urlencode($objp->type_mouvement).'">'.$objp->inventorycode.'</a></td>';
 	}
 	if (!empty($arrayfields['m.label']['checked'])) {
 		// Label of movement
-		print '<td class="liste_titre left">';
-		print '<input class="flat" type="text" size="8" name="search_movement" value="'.dol_escape_htmltag($search_movement).'">';
-		print '</td>';
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objp->label).'">'.$objp->label.'</td>';
 	}
 	if (!empty($arrayfields['origin']['checked'])) {
 		// Origin of movement
-		print '<td class="liste_titre left">';
-		print '&nbsp; ';
-		print '</td>';
+		print '<td class="nowraponall">'.$origin.'</td>';
 	}
 	if (!empty($arrayfields['m.fk_projet']['checked'])) {
 		// fk_project
-		print '<td class="liste_titre" align="left">';
-		print '&nbsp; ';
+		print '<td>';
+		if ($objp->fk_project != 0) {
+			print $movement->get_origin($objp->fk_project, 'project');
+		}
 		print '</td>';
 	}
 	if (!empty($arrayfields['m.type_mouvement']['checked'])) {
 		// Type of movement
-		print '<td class="liste_titre center">';
-		//print '<input class="flat" type="text" size="3" name="search_type_mouvement" value="'.dol_escape_htmltag($search_type_mouvement).'">';
-		print '<select id="search_type_mouvement" name="search_type_mouvement" class="maxwidth150">';
-		print '<option value="" '.(($search_type_mouvement == "") ? 'selected="selected"' : '').'>&nbsp;</option>';
-		print '<option value="0" '.(($search_type_mouvement == "0") ? 'selected="selected"' : '').'>'.$langs->trans('StockIncreaseAfterCorrectTransfer').'</option>';
-		print '<option value="1" '.(($search_type_mouvement == "1") ? 'selected="selected"' : '').'>'.$langs->trans('StockDecreaseAfterCorrectTransfer').'</option>';
-		print '<option value="2" '.(($search_type_mouvement == "2") ? 'selected="selected"' : '').'>'.$langs->trans('StockDecrease').'</option>';
-		print '<option value="3" '.(($search_type_mouvement == "3") ? 'selected="selected"' : '').'>'.$langs->trans('StockIncrease').'</option>';
-		print '</select>';
-		print ajax_combobox('search_type_mouvement');
-		// TODO: add new function $formentrepot->selectTypeOfMovement(...) like
-		// print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
+		print '<td class="center">';
+		print $movement->getTypeMovement();
 		print '</td>';
 	}
 	if (!empty($arrayfields['m.value']['checked'])) {
 		// Qty
-		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="4" name="search_qty" value="'.dol_escape_htmltag($search_qty).'">';
+		print '<td class="right">';
+		if ($objp->qty > 0) {
+			print '<span class="stockmovemententry">';
+			print '+';
+			print $objp->qty;
+			print '</span>';
+		} else {
+			print '<span class="stockmovementexit">';
+			print $objp->qty;
+			print '</span>';
+		}
 		print '</td>';
 	}
 	if (!empty($arrayfields['m.price']['checked'])) {
 		// Price
-		print '<td class="liste_titre" align="left">';
-		print '&nbsp; ';
+		print '<td class="right">';
+		if ($objp->price != 0) {
+			print price($objp->price);
+		}
 		print '</td>';
 	}
 
 	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
-
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
-	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+	$parameters = array('arrayfields'=>$arrayfields, 'objp'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	// Date creation
-	if (!empty($arrayfields['m.datec']['checked'])) {
-		print '<td class="liste_titre">';
-		print '</td>';
+
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		if (in_array($objp->mid, $arrayofselected)) {
+			$selected = 1;
+		}
+		print '<input id="cb'.$objp->mid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objp->mid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
-	// Date modification
-	if (!empty($arrayfields['m.tms']['checked'])) {
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Actions
-	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0);
-	print $searchpicto;
 	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+
 	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['m.rowid']['checked'])) {
-		print_liste_field_titre($arrayfields['m.rowid']['label'], $_SERVER["PHP_SELF"], 'm.rowid', '', $param, '', $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.datem']['checked'])) {
-		print_liste_field_titre($arrayfields['m.datem']['label'], $_SERVER["PHP_SELF"], 'm.datem', '', $param, '', $sortfield, $sortorder, 'center ');
-	}
-	if (!empty($arrayfields['p.ref']['checked'])) {
-		print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['p.label']['checked'])) {
-		print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.batch']['checked'])) {
-		print_liste_field_titre($arrayfields['m.batch']['label'], $_SERVER["PHP_SELF"], 'm.batch', '', $param, '', $sortfield, $sortorder, 'center ');
-	}
-	if (!empty($arrayfields['pl.eatby']['checked'])) {
-		print_liste_field_titre($arrayfields['pl.eatby']['label'], $_SERVER["PHP_SELF"], 'pl.eatby', '', $param, '', $sortfield, $sortorder, 'center ');
-	}
-	if (!empty($arrayfields['pl.sellby']['checked'])) {
-		print_liste_field_titre($arrayfields['pl.sellby']['label'], $_SERVER["PHP_SELF"], 'pl.sellby', '', $param, '', $sortfield, $sortorder, 'center ');
-	}
-	if (!empty($arrayfields['e.ref']['checked'])) {
-		// We are on a specific warehouse card, no filter on other should be possible
-		print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.fk_user_author']['checked'])) {
-		print_liste_field_titre($arrayfields['m.fk_user_author']['label'], $_SERVER["PHP_SELF"], "m.fk_user_author", "", $param, "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.inventorycode']['checked'])) {
-		print_liste_field_titre($arrayfields['m.inventorycode']['label'], $_SERVER["PHP_SELF"], "m.inventorycode", "", $param, "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.label']['checked'])) {
-		print_liste_field_titre($arrayfields['m.label']['label'], $_SERVER["PHP_SELF"], "m.label", "", $param, "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['origin']['checked'])) {
-		print_liste_field_titre($arrayfields['origin']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.fk_projet']['checked'])) {
-		print_liste_field_titre($arrayfields['m.fk_projet']['label'], $_SERVER["PHP_SELF"], "m.fk_projet", "", $param, '', $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['m.type_mouvement']['checked'])) {
-		print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, '', $sortfield, $sortorder, 'center ');
-	}
-	if (!empty($arrayfields['m.value']['checked'])) {
-		print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, '', $sortfield, $sortorder, 'right ');
-	}
-	if (!empty($arrayfields['m.price']['checked'])) {
-		print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, '', $sortfield, $sortorder, 'right ');
-	}
-
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-
-	// Hook fields
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	if (!empty($arrayfields['m.datec']['checked'])) {
-		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	}
-	if (!empty($arrayfields['m.tms']['checked'])) {
-		print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	}
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-	print "</tr>\n";
-
-
-	$arrayofuniqueproduct = array();
-
-	$i = 0;
-	$totalarray = array();
-	while ($i < min($num, $limit)) {
-		$objp = $db->fetch_object($resql);
-
-		$userstatic->id = $objp->fk_user_author;
-		$userstatic->login = $objp->login;
-		$userstatic->lastname = $objp->lastname;
-		$userstatic->firstname = $objp->firstname;
-		$userstatic->photo = $objp->photo;
-		$userstatic->email = $objp->user_email;
-		$userstatic->statut = $objp->user_status;
-
-		$productstatic->id = $objp->rowid;
-		$productstatic->ref = $objp->product_ref;
-		$productstatic->label = $objp->produit;
-		$productstatic->type = $objp->type;
-		$productstatic->entity = $objp->entity;
-		$productstatic->status = $objp->tosell;
-		$productstatic->status_buy = $objp->tobuy;
-		$productstatic->status_batch = $objp->tobatch;
-
-		$productlot->id = $objp->lotid;
-		$productlot->batch = $objp->batch;
-		$productlot->eatby = $objp->eatby;
-		$productlot->sellby = $objp->sellby;
-
-		$warehousestatic->id = $objp->entrepot_id;
-		$warehousestatic->ref = $objp->warehouse_ref;
-		$warehousestatic->label = $objp->warehouse_ref;
-		$warehousestatic->lieu = $objp->lieu;
-		$warehousestatic->fk_parent = $objp->fk_parent;
-		$warehousestatic->statut = $objp->statut;
-
-		$movement->type = $objp->type_mouvement;
-
-		$arrayofuniqueproduct[$objp->rowid] = $objp->produit;
-		if (!empty($objp->fk_origin)) {
-			$origin = $movement->get_origin($objp->fk_origin, $objp->origintype);
-		} else {
-			$origin = '';
-		}
-
-		print '<tr class="oddeven">';
-		// Id movement
-		if (!empty($arrayfields['m.rowid']['checked'])) {
-			print '<td>';
-			print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
-			print $objp->mid;
-			print '</td>'; // This is primary not movement id
-		}
-		if (!empty($arrayfields['m.datem']['checked'])) {
-			// Date
-			print '<td class="nowraponall center">'.dol_print_date($db->jdate($objp->datem), 'dayhour', 'tzuserrel').'</td>';
-		}
-		if (!empty($arrayfields['p.ref']['checked'])) {
-			// Product ref
-			print '<td class="nowraponall">';
-			print $productstatic->getNomUrl(1, 'stock', 16);
-			print "</td>\n";
-		}
-		if (!empty($arrayfields['p.label']['checked'])) {
-			// Product label
-			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($productstatic->label).'">';
-			print $productstatic->label;
-			print "</td>\n";
-		}
-		if (!empty($arrayfields['m.batch']['checked'])) {
-			print '<td class="center nowraponall">';
-			if ($productlot->id > 0) {
-				print $productlot->getNomUrl(1);
-			} else {
-				print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
-			}
-			print '</td>';
-		}
-		if (!empty($arrayfields['pl.eatby']['checked'])) {
-			print '<td class="center">'.dol_print_date($objp->eatby, 'day').'</td>';
-		}
-		if (!empty($arrayfields['pl.sellby']['checked'])) {
-			print '<td class="center">'.dol_print_date($objp->sellby, 'day').'</td>';
-		}
-		// Warehouse
-		if (!empty($arrayfields['e.ref']['checked'])) {
-			print '<td class="tdoverflowmax100">';
-			print $warehousestatic->getNomUrl(1);
-			print "</td>\n";
-		}
-		// Author
-		if (!empty($arrayfields['m.fk_user_author']['checked'])) {
-			print '<td class="tdoverflowmax100">';
-			print $userstatic->getNomUrl(-1);
-			print "</td>\n";
-		}
-		if (!empty($arrayfields['m.inventorycode']['checked'])) {
-			// Inventory code
-			print '<td><a href="'.$_SERVER["PHP_SELF"].'?search_inventorycode='.urlencode('^'.$objp->inventorycode.'$').'&search_type_mouvement='.urlencode($objp->type_mouvement).'">'.$objp->inventorycode.'</a></td>';
-		}
-		if (!empty($arrayfields['m.label']['checked'])) {
-			// Label of movement
-			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objp->label).'">'.$objp->label.'</td>';
-		}
-		if (!empty($arrayfields['origin']['checked'])) {
-			// Origin of movement
-			print '<td class="nowraponall">'.$origin.'</td>';
-		}
-		if (!empty($arrayfields['m.fk_projet']['checked'])) {
-			// fk_project
-			print '<td>';
-			if ($objp->fk_project != 0) {
-				print $movement->get_origin($objp->fk_project, 'project');
-			}
-			print '</td>';
-		}
-		if (!empty($arrayfields['m.type_mouvement']['checked'])) {
-			// Type of movement
-			print '<td class="center">';
-			print $movement->getTypeMovement();
-			print '</td>';
-		}
-		if (!empty($arrayfields['m.value']['checked'])) {
-			// Qty
-			print '<td class="right">';
-			if ($objp->qty > 0) {
-				print '<span class="stockmovemententry">';
-				print '+';
-				print $objp->qty;
-				print '</span>';
-			} else {
-				print '<span class="stockmovementexit">';
-				print $objp->qty;
-				print '</span>';
-			}
-			print '</td>';
-		}
-		if (!empty($arrayfields['m.price']['checked'])) {
-			// Price
-			print '<td class="right">';
-			if ($objp->price != 0) {
-				print price($objp->price);
-			}
-			print '</td>';
-		}
-
-		// Extra fields
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'objp'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-
-		// Action column
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($objp->mid, $arrayofselected)) {
-				$selected = 1;
-			}
-			print '<input id="cb'.$objp->mid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objp->mid.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-
-		print "</tr>\n";
-		$i++;
-	}
-	$db->free($resql);
-
-	print "</table>";
-	print '</div>';
-	print "</form>";
-
-	// Add number of product when there is a filter on period
-	if (count($arrayofuniqueproduct) == 1 && is_numeric($year)) {
-		print "<br>";
-
-		$productidselected = 0;
-		foreach ($arrayofuniqueproduct as $key => $val) {
-			$productidselected = $key;
-			$productlabelselected = $val;
-		}
-		$datebefore = dol_get_first_day($year ? $year : strftime("%Y", time()), $month ? $month : 1, true);
-		$dateafter = dol_get_last_day($year ? $year : strftime("%Y", time()), $month ? $month : 12, true);
-		$balancebefore = $movement->calculateBalanceForProductBefore($productidselected, $datebefore);
-		$balanceafter = $movement->calculateBalanceForProductBefore($productidselected, $dateafter);
-
-		//print '<tr class="total"><td class="liste_total">';
-		print $langs->trans("NbOfProductBeforePeriod", $productlabelselected, dol_print_date($datebefore, 'day', 'gmt'));
-		//print '</td>';
-		//print '<td class="liste_total right" colspan="6">';
-		print ': '.$balancebefore;
-		print "<br>\n";
-		//print '</td></tr>';
-		//print '<tr class="total"><td class="liste_total">';
-		print $langs->trans("NbOfProductAfterPeriod", $productlabelselected, dol_print_date($dateafter, 'day', 'gmt'));
-		//print '</td>';
-		//print '<td class="liste_total right" colspan="6">';
-		print ': '.$balanceafter;
-		print "<br>\n";
-		//print '</td></tr>';
-	}
-} else {
-	dol_print_error($db);
+	$i++;
 }
 
+$db->free($resql);
+
+print "</table>";
+print '</div>';
+print "</form>";
+
+// Add number of product when there is a filter on period
+if (count($arrayofuniqueproduct) == 1 && is_numeric($year)) {
+	print "<br>";
+
+	$productidselected = 0;
+	foreach ($arrayofuniqueproduct as $key => $val) {
+		$productidselected = $key;
+		$productlabelselected = $val;
+	}
+	$datebefore = dol_get_first_day($year ? $year : strftime("%Y", time()), $month ? $month : 1, true);
+	$dateafter = dol_get_last_day($year ? $year : strftime("%Y", time()), $month ? $month : 12, true);
+	$balancebefore = $movement->calculateBalanceForProductBefore($productidselected, $datebefore);
+	$balanceafter = $movement->calculateBalanceForProductBefore($productidselected, $dateafter);
+
+	//print '<tr class="total"><td class="liste_total">';
+	print $langs->trans("NbOfProductBeforePeriod", $productlabelselected, dol_print_date($datebefore, 'day', 'gmt'));
+	//print '</td>';
+	//print '<td class="liste_total right" colspan="6">';
+	print ': '.$balancebefore;
+	print "<br>\n";
+	//print '</td></tr>';
+	//print '<tr class="total"><td class="liste_total">';
+	print $langs->trans("NbOfProductAfterPeriod", $productlabelselected, dol_print_date($dateafter, 'day', 'gmt'));
+	//print '</td>';
+	//print '<td class="liste_total right" colspan="6">';
+	print ': '.$balanceafter;
+	print "<br>\n";
+	//print '</td></tr>';
+}
 
 // End of page
 llxFooter();
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 824d667e934..8dc40c3c78c 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -789,7 +789,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$objp = $db->fetch_object($resql);
 
 	if (!empty($conf->global->STOCK_SUPPORTS_SERVICES) || $objp->fk_product_type == 0) {
-		$prod->fetch($objp->rowid);
+		$result = $prod->fetch($objp->rowid);
+		if ($result < 0) {
+			dol_print_error($db);
+			exit;
+		}
+
 		$prod->load_stock('warehouseopen, warehouseinternal'.(!$usevirtualstock?', novirtual':''), $draftchecked);
 
 		// Multilangs