diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index fa825bcb84d..ba3ff77d394 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -57,7 +57,8 @@ class FormOther
 	}
 
 	/**
-	 * Return HTML code for scanner tool
+	 * Return HTML code for scanner tool.
+	 * This must be called into an existing <form>
 	 *
 	 * @param	string	$jstoexecuteonadd		Name of javascript function to call
 	 * @return	string						HTML component
@@ -68,7 +69,6 @@ class FormOther
 
 		$out = '';
 
-		$out .= '<form name="barcodescanner" method="POST">';
 		$out .= '<!-- Popup for mass barcode scanning -->'."\n";
 		$out .= '<div class="div-for-modal-topright" style="padding: 15px">';
 		$out .= '<center><strong>Barcode scanner tool...</strong></center><br>';
@@ -98,7 +98,6 @@ class FormOther
 
 		$out .= '</center>';
 		$out .= '</div>';
-		$out .= '</form>';
 
 		return $out;
 	}
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 970676c34b6..2abc830eb7c 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -99,6 +99,10 @@ $now = dol_now();
  * Actions
  */
 
+if ($cancel) {
+	$action = '';
+}
+
 if ($action == 'cancel_record' && $permissiontoadd) {
 	$object->setCanceled($user);
 }