Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0

Dolibarr · Sep 3, 2019 · 1a8f271 · 1a8f271
2 parents 4a76dfa + 8a4ac2c
commit 1a8f271
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
@@ -1878,6 +1878,15 @@ function select_produits($selected='', $htmlname='productid', $filtertype='', $l
 		$price_level = (! empty($price_level) ? $price_level : 0);
 		if (is_null($ajaxoptions)) $ajaxoptions=array();
 
+		if(strval($filtertype) === '' && (!empty($conf->product->enabled) || !empty($conf->service->enabled))){
+			if(!empty($conf->product->enabled) && empty($conf->service->enabled)){
+				$filtertype = '0';
+			}
+			elseif(empty($conf->product->enabled) && !empty($conf->service->enabled)){
+				$filtertype = '1';
+			}
+		}
+
 		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
 		{
 			$placeholder='';