diff --git a/htdocs/mrp/ajax/ajax_bom.php b/htdocs/mrp/ajax/ajax_bom.php
index 7f5a2040403..761a54876ee 100644
--- a/htdocs/mrp/ajax/ajax_bom.php
+++ b/htdocs/mrp/ajax/ajax_bom.php
@@ -43,9 +43,12 @@ $action = GETPOST('action', 'alpha');
 
 $object = new BOM($db);
 $result=$object->fetch($idbom);
-if ($result)
+if ($result > 0)
 {
- 	echo json_encode($result);
+	// We remove properties we don't need in answer
+	unset ($object->fields);
+	unset ($object->db);
+	echo json_encode($object);
 }
 else
 {
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index f15b45b96e5..15a1aeff0a1 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -1,6 +1,5 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -204,16 +203,37 @@ if ($action == 'create')
 
 	dol_fiche_end();
 
-	print '
+	?>
 	<script>
      	$(document).ready(function () {
-			jQuery("#fk_bom").change(function() {
-				console.log("We change value of BOM");
-				/* TODO */
+			jQuery('#fk_bom').change(function() {
+				console.log('We change value of BOM with BOM of id '+jQuery('#fk_bom').val());
+
+				$.getJSON('<?php echo DOL_URL_ROOT ?>/mrp/ajax/ajax_bom.php?action=getBoms&idbom='+jQuery('#fk_bom').val(), function(data) {
+					console.log(data);
+					if (typeof data.rowid != "undefined") {
+						console.log("New BOM loaded, we set values in form");
+						$('#qty').val(data.qty);
+						$("#fk_product").val(data.fk_product);
+						$('#fk_product').trigger('change'); // Notify any JS components that the value changed
+						$('#note_private').val(data.description);
+						$('#note_private').trigger('change'); // Notify any JS components that the value changed
+						if (typeof CKEDITOR != "undefined") {
+							if (typeof CKEDITOR.instances != "undefined") {
+								if (typeof CKEDITOR.instances.note_private != "undefined") {
+									console.log(CKEDITOR.instances.note_private);
+									CKEDITOR.instances.note_private.setData(data.description);
+								}
+							}
+						}
+					} else {
+						console.log("Failed to get BOM");
+					}
+				});
  	        });
 		})
 	</script>
-	';
+	<?php
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 09f34ae583e..351274de4b8 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -1,6 +1,5 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 2f32058a41f..81cb781ccff 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -1,6 +1,5 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index a006f79a609..d7429a4da86 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -1,6 +1,5 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by