diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 1126e04785e..2df4278ecbe 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -607,6 +607,44 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</div>';
 
 		print "</form>\n";
+		?>
+
+		<script type="text/javascript" language="javascript">
+			$(document).ready(function() {
+
+				$(".collapse_bom").click(function() {
+
+					var id_bom_line = $(this).attr('id').replace('collapse-', '');
+					console.log('tr [parentid="'+ id_bom_line +'"]')
+					if($(this).text().indexOf('+') > 0) {
+						$('[parentid="'+ id_bom_line +'"]').show();
+						$(this).html('(-)&nbsp;');
+					}
+					else {
+						$('[parentid="'+ id_bom_line +'"]').hide();
+						$(this).html('(+)&nbsp;');
+					}
+
+					return false;
+				});
+
+				//TODO : SHOW ALL / COLLAPSE ALL
+				$("#show_all").click(function() {
+					$("[class^=batch_warehouse]").show();
+					$("[class^=collapse_batch]").html('(-)&nbsp;');
+					return false;
+				});
+
+				$("#hide_all").click(function() {
+					$("[class^=batch_warehouse]").hide();
+					$("[class^=collapse_batch]").html('(+)&nbsp;');
+					return false;
+				});
+
+			});
+		</script>
+
+		<?php
 	}
 
 
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 46b57e89243..54e145ad2ee 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -97,6 +97,8 @@ print '</td>';
 */
 
 $coldisplay++;
+// For BOM
+print '<td></td>';
 
 print '<td class="nobottom linecolqty right">';
 if (($line->info_bits & 2) != 2) {
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 623fdab1474..c869a617b2a 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -81,9 +81,9 @@ $coldisplay++;
 $tmpproduct = new Product($object->db);
 $tmpproduct->fetch($line->fk_product);
 $tmpbom = new BOM($object->db);
-$res = $tmpbom->fetch($line->fk_bom_child);
+$tmpbom->fetch($line->fk_bom_child);
 if (!empty($tmpbom->id)){
-	print '<a class="collapse_bom" id="bom' . $tmpbom->id . '" href="#">' . (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? '(+)' : '(-)') . '&nbsp;</a>';
+	print '<a class="collapse_bom" id="collapse-'.$line->id.'" href="#">' . (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? '(+)' : '(-)') . '&nbsp;</a>';
 }
 print $tmpproduct->getNomUrl(1);
 print ' - '.$tmpproduct->label;
@@ -193,15 +193,15 @@ if ($resql){
 		$sub_bom_line = new BOMLine($object->db);
 		$sub_bom_line->fetch($obj->rowid);
 
-		print '<tr id="sub_bom_'.$sub_bom_line->id.'">';
+		print '<tr style="display:none" parentid="'.$line->id.'">';
 
-		print '<td id="sub_bom_product_'.$sub_bom_line->id.'">'.$sub_bom_product->getNomUrl(1).'</td>';
+		print '<td id="sub_bom_product_'.$sub_bom_line->id.'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$sub_bom_product->getNomUrl(1).'</td>';
 		if ($sub_bom_line->fk_bom_child > 0) {
 			print '<td id="sub_bom_bom_'.$sub_bom_line->id.'">'.$sub_bom->getNomUrl(1).'</td>';
 		} else {
 			print '<td id="sub_bom_bom_'.$sub_bom_line->id.'">&nbsp;</td>';
 		}
-		print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty, 0, '', 0, 0).'</td>';
+		print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty * $line->qty, 0, '', 0, 0).'</td>';
 		if ($sub_bom_line->qty_frozen > 0) {
 			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">'.$sub_bom_line->qty_frozen.'</td>';
 		} else {
@@ -215,7 +215,7 @@ if ($resql){
 		}
 
 		print '<td class="linecolefficiency nowrap right" id="sub_bom_efficiency_'.$sub_bom_line->id.'">'.$sub_bom_line->efficiency.'</td>';
-		print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'">'.price($sub_bom_line->total_cost).'</td>';
+		print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'">'.price($sub_bom_line->total_cost * $line->qty).'</td>';
 		print '<td></td>';
 		print '<td></td>';
 		print '<td></td>';