diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 000f14ee59f..cb8bc2ee872 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -701,13 +701,13 @@ class Form
                 	$selected_input_value=$product->ref;
                 }
 =======
-				if ($selected && empty($selected_input_value))
-                {
-                	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-                	$product = new Product($this->db);
-                	$product->fetch($selected);
-                	$selected_input_value=$product->ref;
-                }
+				if ($selected && empty($selected_input_value))
+                {
+                	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+                	$product = new Product($this->db);
+                	$product->fetch($selected);
+                	$selected_input_value=$product->ref;
+                }
 >>>>>>> refs/remotes/origin/3.3
                 // mode=1 means customers products
                 $ajaxoptions=array();
@@ -1657,8 +1657,8 @@ class Form
                     {
     	                $opt.= price($objp->fprice).' '.$currencytext."/".$objp->quantity;
 	                    $outval.= price($objp->fprice).' '.$currencytextnoent."/".$objp->quantity;
-                    	$opt.= $langs->trans("Units");	// Do not use strtolower because it breaks utf8 encoding
-                        $outval.=$langs->transnoentities("Units");
+                    	$opt.= ' '.$langs->trans("Units");	// Do not use strtolower because it breaks utf8 encoding
+                        $outval.= ' '.$langs->transnoentities("Units");
                     }
 
                     if ($objp->quantity >= 1)
diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php
index 23ac16e75fe..8ba84f6fc76 100644
--- a/htdocs/ecm/docmine.php
+++ b/htdocs/ecm/docmine.php
@@ -132,6 +132,7 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
 	}
 	else
 	{
+		$langs->load('errors');
 		setEventMessage($langs->trans($ecmdir->error,$ecmdir->label), 'errors');
 	}
 }
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 1bb3fa405af..8bdd44adcf3 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -1109,7 +1109,7 @@ elseif (! empty($object->id))
 					//'text' => $langs->trans("ConfirmClone"),
 					//array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
 					//array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1),
-					array('type' => 'other', 'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"),   'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))
+					array('type' => 'other', 'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockIncrease"),   'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))
 			);
 		}