diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 2b055f2368f..d51ec804614 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -2118,12 +2118,12 @@ else
         		// Create bill and Classify billed
         		if ($conf->facture->enabled && $object->statut > 0  && ! $object->billed)
         		{
-        			if ($user->rights->facture->creer)
+        			if ($user->rights->facture->creer && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER))
         			{
         				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
         			}
 
-        			if ($user->rights->commande->creer && $object->statut > 2)
+        			if ($user->rights->commande->creer && $object->statut > 2 && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER))
         			{
         				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
         			}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 03588f22f2c..abf670e58ce 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2069,9 +2069,9 @@ function info_admin($text,$infoonimgalt=0)
  *	Toutefois, il faut essayer de ne l'appeler qu'au sein de pages php, les classes devant
  *	renvoyer leur erreur par l'intermediaire de leur propriete "error".
  *
- *	@param	DoliDB	$db      	Database handler
+ *	@param	 DoliDB	$db      	Database handler
  *	@param  string	$error		String or array of errors strings to show
- *	@return	void
+ *	@return void
  *  @see    dol_htmloutput_errors
  */
 function dol_print_error($db='',$error='')
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index fe66e772f3d..b07a02e1dc0 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -122,8 +122,9 @@ if ($action == 'add')
             {
                 $ent = "entl".$i;
                 $idl = "idl".$i;
-                $entrepot_id = GETPOST($ent,'int')?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
-
+                $entrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
+				if ($entrepot_id < 0) $entrepot_id='';
+                
                 $ret=$object->addline($entrepot_id,GETPOST($idl,'int'),GETPOST($qty,'int'));
                 if ($ret < 0)
                 {
@@ -779,21 +780,19 @@ if ($action == 'create')
                     print '<td align="left">';
                     if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
                     {
-                        // Show warehous
-                        if (GETPOST('entrepot_id','int'))
+                        // Show warehouse combo list
+                    	$ent = "entl".$indiceAsked;
+                    	$idl = "idl".$indiceAsked;
+                    	$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
+                        print $formproduct->selectWarehouses($tmpentrepot_id,'entl'.$indiceAsked,'',1,0,$line->fk_product);
+                    	if ($tmpentrepot_id && $tmpentrepot_id == GETPOST('entrepot_id','int'))
                         {
-                            print $formproduct->selectWarehouses(GETPOST('entrepot_id','int'),'entl'.$indiceAsked,'',1,0,$line->fk_product);
                             //print $stock.' '.$quantityToBeDelivered;
-                            //if ($stock >= 0 && $stock < $quantityToBeDelivered)
                             if ($stock < $quantityToBeDelivered)
                             {
-                                print ' '.img_warning($langs->trans("StockTooLow"));
+                                print ' '.img_warning($langs->trans("StockTooLow"));	// Stock too low for entrepot_id but we may have change warehouse
                             }
                         }
-                        else
-                        {
-                            print $formproduct->selectWarehouses('','entl'.$indiceAsked,'',1,0,$line->fk_product);
-                        }
                     }
                     else
                     {
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 337db1219a7..aec1d5f65ea 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -120,7 +120,7 @@ class FormProduct
 		$this->loadWarehouses($fk_product);
 
 		$out='<select class="flat"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.($htmlname.($disabled?'_disabled':'')).'">';
-		if ($empty) $out.='<option value="">&nbsp;</option>';
+		if ($empty) $out.='<option value="-1">&nbsp;</option>';
 		foreach($this->cache_warehouses as $id => $arraytypes)
 		{
 			$out.='<option value="'.$id.'"';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 196cfcfc264..ab68d73a8db 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1042,7 +1042,7 @@ class Product extends CommonObject
 		// Check parameters
 		if (! $id && ! $ref && ! $ref_ext)
 		{
-			$this->error=$langs->trans('ErrorWrongParameters');
+			$this->error='ErrorWrongParameters';
 			dol_print_error(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
 		}
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 42fdcf93c0b..c2afa0950d0 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -56,7 +56,7 @@ class MouvementStock
 	 *	@param		int		$price			Unit price HT of product
 	 *	@param		string	$label			Label of stock movement
 	 *	@param		string	$datem			Force date of movement
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						<0 if KO, 0 if fk_product is null, >0 if OK
 	 */
 	function _create($user, $fk_product, $entrepot_id, $qty, $type, $price=0, $label='', $datem='')
 	{
@@ -65,13 +65,15 @@ class MouvementStock
 		$error = 0;
 		dol_syslog("MouvementStock::_create start userid=$user->id, fk_product=$fk_product, warehouse=$entrepot_id, qty=$qty, type=$type, price=$price label=$label");
 
+		if (empty($fk_product)) return 0;
+		
 		$now=(! empty($datem) ? $datem : dol_now());
 
 		$this->db->begin();
 
 		$product = new Product($this->db);
 		$result=$product->fetch($fk_product);
-		if (! $result > 0)
+		if ($result < 0)
 		{
 			dol_print_error('',"Failed to fetch product");
 			return -1;