From c340745b789248201a9c6b2981bce59f915f7a1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Apr 2016 11:05:15 +0200
Subject: [PATCH] FIX Option "showstock" was not effective into warehouse list

---
 htdocs/expedition/card.php                      | 3 ++-
 htdocs/product/class/html.formproduct.class.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index df79fd358c9..b3b889f7822 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -907,7 +907,8 @@ if ($action == 'create')
 								$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):$warehouse_id;
 								if ($line->fk_product > 0)
 								{
-									print $formproduct->selectWarehouses($tmpentrepot_id,'entl'.$indiceAsked,'',1,0,$line->fk_product);
+								    print '<!-- Show warehouse selection -->';
+									print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1);
 									if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id)
 									{
 										//print $stock.' '.$quantityToBeDelivered;
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 6b64b625e53..24a7506882b 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -165,7 +165,7 @@ class FormProduct
 			if ($selected == $id || ($selected == 'ifone' && $nbofwarehouses == 1)) $out.=' selected';
 			$out.='>';
 			$out.=$arraytypes['label'];
-			if (($fk_product || ($showstock > 0)) && ($arraytypes['stock'] != 0)) $out.='('.$langs->trans("Stock").':'.$arraytypes['stock'].')';
+			if (($fk_product || ($showstock > 0)) && ($arraytypes['stock'] != 0 || ($showstock > 0))) $out.=' ('.$langs->trans("Stock").':'.$arraytypes['stock'].')';
 			$out.='</option>';
 		}
 		$out.='</select>';