diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 2c333ff616e..b7d3f86b9e7 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -731,7 +731,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('mo'));
-		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, false, 'MOChild');
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, false);
 
 
 		print '</div><div class="fichehalfright">';
diff --git a/htdocs/mrp/tpl/linkedobjectblock.tpl.php b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
index 9374fc2e4d0..dfa6d9797c2 100644
--- a/htdocs/mrp/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
@@ -39,44 +39,75 @@ $langs->load("bom");
 $total = 0;
 $ilink = 0;
 
-$mo_static = new Mo($db);
-$res = $mo_static->fetch($object->id);
-$TMoChilds = $mo_static->getMoChilds();
+if ($object->element == 'mo') {
+	$mo_static = new Mo($db);
+	$res = $mo_static->fetch($object->id);
+	$TMoChilds = $mo_static->getMoChilds();
 
-foreach ($TMoChilds as $key => $objectlink) {
-	$ilink++;
 
-	$trclass = 'oddeven';
+	foreach ($TMoChilds as $key => $objectlink) {
+		$ilink++;
 
-	echo '<tr class="'.$trclass.'" >';
-	echo '<td class="linkedcol-element" >'.$langs->trans("ManufacturingOrder");
-	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
-		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
+		$trclass = 'oddeven';
+
+		echo '<tr class="' . $trclass . '" >';
+		echo '<td class="linkedcol-element" >' . $langs->trans("ManufacturingOrder");
+		if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+			print '<a class="objectlinked_importbtn" href="' . $objectlink->getNomUrl(0, '', 0, 1) . '&amp;action=selectlines" data-element="' . $objectlink->element . '" data-id="' . $objectlink->id . '"  > <i class="fa fa-indent"></i> </a';
+		}
+		echo '</td>';
+		echo '<td class="linkedcol-name nowraponall" >' . $objectlink->getNomUrl(1) . '</td>';
+
+		echo '<td class="linkedcol-ref" align="center">';
+		//  $result = $product_static->fetch($objectlink->fk_product);
+		print '</td>';
+		echo '<td class="linkedcol-date" align="center">' . dol_print_date($objectlink->date_creation, 'day') . '</td>';
+		echo '<td class="linkedcol-amount right">-</td>';
+		echo '<td class="linkedcol-statut right">' . $objectlink->getLibStatut(3) . '</td>';
+		echo '<td class="linkedcol-action right">';
+
+		// we want to make the link via element_element for delete action
+		$sql = " Select rowid from " . MAIN_DB_PREFIX . "element_element";
+		$sql .= " WHERE  fk_source = " . (int) $object->id . " and fk_target = '" . dol_escape_htmltag($key) . "'";
+
+		$resql = $db->query($sql);
+		$k = 0;
+		if ($resql) {
+			$obj = $db->fetch_object($resql);
+			if ($obj->rowid && $obj->rowid > 0) $k = $obj->rowid;
+		}
+		echo '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=dellink&token=' . newToken() . '&dellinkid=' . $k . '">' . img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink') . '</a>';
+		echo '</td>';
+		echo "</tr>\n";
 	}
-	echo '</td>';
-	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+} else {
+	$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
 
-	echo '<td class="linkedcol-ref" align="center">';
-	//  $result = $product_static->fetch($objectlink->fk_product);
-	print '</td>';
-	echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
-	echo '<td class="linkedcol-amount right">-</td>';
-	echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
-	echo '<td class="linkedcol-action right">';
+	$total = 0;
+	$ilink = 0;
+	foreach ($linkedObjectBlock as $key => $objectlink) {
+		$ilink++;
 
-	// we want to make the link via element_element for delete action
-	$sql = " Select rowid from " . MAIN_DB_PREFIX . "element_element";
-	$sql .= " WHERE  fk_source = ". (int) $object->id . " and fk_target = '" . dol_escape_htmltag($key) ."'";
+		$trclass = 'oddeven';
+		if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+			$trclass .= ' liste_sub_total';
+		}
+		print '<tr class="'.$trclass.'"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
+		print '<td class="linkedcol-element" >'.$langs->trans("ManufacturingOrder");
+		if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+			$url = DOL_URL_ROOT.'/mrp/mo_card.php?id='.$objectlink->id;
+			print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
+		}
+		print '</td>';
 
-	$resql = $db->query($sql);
-	$k = 0;
-	if ($resql) {
-		$obj = $db->fetch_object($resql);
-		if ($obj->rowid && $obj->rowid > 0 ) $k = $obj->rowid;
+		print '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+		print '<td class="linkedcol-ref" >'.$objectlink->ref_client.'</td>';
+		print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date_start_planned, 'day').'</td>';
+		print '<td class="linkedcol-amount right">-</td>';
+		print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+		print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+		print "</tr>\n";
 	}
-	echo '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=dellink&token=' . newToken() . '&dellinkid=' . $k . '">' . img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink') . '</a>';
-	echo '</td>';
-	echo "</tr>\n";
 }
 
 echo "<!-- END PHP TEMPLATE -->\n";