diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index f90832b61b4..789c8fa88a0 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -44,6 +44,8 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'inventorycard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $listoffset = GETPOST('listoffset', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $limit = GETPOSTINT('limit') > 0 ? GETPOSTINT('limit') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page == -1) {
@@ -71,6 +73,13 @@ $object = new Inventory($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id;
 
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) {
+	$sortfield = "e.ref";
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -99,7 +108,8 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'inclu
 //$result = restrictedArea($user, 'mymodule', $id);
 
 //Parameters Page
-$paramwithsearch = '';
+$paramwithsearch = '&sortfield=' . urlencode($sortfield);
+$paramwithsearch .= '&sortorder=' . urlencode($sortorder);
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$paramwithsearch .= '&limit='.((int) $limit);
 }
@@ -442,6 +452,11 @@ if ($object->id <= 0) {
 	exit;
 }
 
+$param = '';
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit=' . ((int) $limit);
+}
+
 
 $res = $object->fetch_optionals();
 
@@ -577,6 +592,8 @@ print '<form id="formrecord" name="formrecord" method="POST" action="'.$_SERVER[
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="updateinventorylines">';
 print '<input type="hidden" name="id" value="'.$object->id.'">';
+print '<input type="hidden" name="sortfield" value="' . $sortfield . '">';
+print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';
 if ($backtopage) {
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 }
@@ -927,8 +944,8 @@ print '<div class="div-table-responsive-no-min">';
 print '<table id="tablelines" class="noborder noshadow centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Warehouse").'</td>';
-print '<td>'.$langs->trans("Product").'</td>';
+print getTitleFieldOfList($langs->trans("Warehouse"), 0, $_SERVER['PHP_SELF'], 'e.ref', '', 'id=' . $object->id . '&page=' . $page . $param, '', $sortfield, $sortorder, '', 0, '') . "\n";
+print getTitleFieldOfList($langs->trans("Product"), 0, $_SERVER['PHP_SELF'], 'p.ref', '', 'id=' . $object->id . '&page=' . $page . $param, '', $sortfield, $sortorder, '', 0, '') . "\n";
 if (isModEnabled('productbatch')) {
 	print '<td>';
 	print $langs->trans("Batch");
@@ -1012,12 +1029,18 @@ if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STAT
 	print '</tr>';
 }
 
+// Sort by warehouse/product or product/warehouse
+$sortfield .= ',' . ($sortfield == 'e.ref' ? 'p.ref' : 'e.ref');
+$sortorder .= ',' . $sortorder;
+
 // Request to show lines of inventory (prefilled after start/validate step)
 $sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
 $sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.fk_movement, id.pmp_real, id.pmp_expected';
-$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
-$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
-$sql .= $db->order('id.rowid', 'ASC');
+$sql .= ' FROM ' . $db->prefix() . 'inventorydet as id';
+$sql .= ' LEFT JOIN ' . $db->prefix() . 'product as p ON id.fk_product = p.rowid';
+$sql .= ' LEFT JOIN ' . $db->prefix() . 'entrepot as e ON id.fk_warehouse = e.rowid';
+$sql .= ' WHERE id.fk_inventory = ' . ((int) $object->id);
+$sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($limit, $offset);
 
 $cacheOfProducts = array();