Merge pull request #11760 from atm-john/FIX_module_product_disabled

FIX: remove disabled product type from product list
Dolibarr · Aug 27, 2019 · 8a4ac2c · 8a4ac2c
2 parents 60b8982 + c2f570a
commit 8a4ac2c
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
@@ -1785,6 +1785,15 @@ function select_produits($selected='', $htmlname='productid', $filtertype='', $l
 
 		$price_level = (! empty($price_level) ? $price_level : 0);
 
+		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='';