From f42492764d9a6e8821cf6938025c68426dadf3dc Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Sun, 3 May 2020 17:16:25 +0200
Subject: [PATCH 1/3] Update html.formproduct.class.php

DEFAULT_WAREHOUSE is not select in sherch
---
 htdocs/product/class/html.formproduct.class.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index efde996b927..d6ae705b651 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -253,10 +253,12 @@ class FormProduct
 			$comboenhancement = ajax_combobox($htmlname, $events);
 			$out .= $comboenhancement;
 		}
-
-		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $selected = $conf->global->MAIN_DEFAULT_WAREHOUSE;
-		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $selected = $user->fk_warehouse;
-
+		
+		if ($htmlname != 'search_warehouse'){
+			if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $selected = $conf->global->MAIN_DEFAULT_WAREHOUSE;
+			if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $selected = $user->fk_warehouse;
+		}
+		
 		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled' : '').' id="'.$htmlname.'" name="'.($htmlname.($disabled ? '_disabled' : '')).'">';
 		if ($empty) $out .= '<option value="-1">'.($empty_label ? $empty_label : '&nbsp;').'</option>';
 		foreach ($this->cache_warehouses as $id => $arraytypes)

From 080db7629f4418a285b8edfb0f874193fb231731 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 3 May 2020 15:21:00 +0000
Subject: [PATCH 2/3] Fixing style errors.

---
 htdocs/product/class/html.formproduct.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index d6ae705b651..4887f749d60 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -253,12 +253,12 @@ class FormProduct
 			$comboenhancement = ajax_combobox($htmlname, $events);
 			$out .= $comboenhancement;
 		}
-		
+
 		if ($htmlname != 'search_warehouse'){
 			if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $selected = $conf->global->MAIN_DEFAULT_WAREHOUSE;
 			if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $selected = $user->fk_warehouse;
 		}
-		
+
 		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled' : '').' id="'.$htmlname.'" name="'.($htmlname.($disabled ? '_disabled' : '')).'">';
 		if ($empty) $out .= '<option value="-1">'.($empty_label ? $empty_label : '&nbsp;').'</option>';
 		foreach ($this->cache_warehouses as $id => $arraytypes)

From 33669b6fd8e2300c64e3a6abec008309915739a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 May 2020 21:15:23 +0200
Subject: [PATCH 3/3] Update html.formproduct.class.php

---
 htdocs/product/class/html.formproduct.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 4887f749d60..0eeddd15c07 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -254,7 +254,7 @@ class FormProduct
 			$out .= $comboenhancement;
 		}
 
-		if ($htmlname != 'search_warehouse'){
+		if (strpos($htmlname, 'search_') !== 0) {
 			if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $selected = $conf->global->MAIN_DEFAULT_WAREHOUSE;
 			if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $selected = $user->fk_warehouse;
 		}