lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #11256

Browse Source
This commit is contained in:
AXeL-dev 2019-06-01 15:00:15 +00:00
parent 7e678f3d83
commit d2c853c47b
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/core/class/html.form.class.php
View File

@ -1914,6 +1914,16 @@ class Form
$selected_input_value=$producttmpselect->ref; $selected_input_value=$producttmpselect->ref;
unset($producttmpselect); unset($producttmpselect);
} }
// handle case where product or service module is disabled + no filter specified
if (empty($filtertype))
{
if (empty($conf->product->enabled)) { // when product module is disabled, show services only
$filtertype = 1;
}
elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
$filtertype = 0;
}
}
// mode=1 means customers products // mode=1 means customers products
$urloption='htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus; $urloption='htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
//Price by customer //Price by customer
@ -2165,7 +2175,14 @@ class Form
{ {
$sql.= " AND p.tosell = ".$status; $sql.= " AND p.tosell = ".$status;
} }
if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$filtertype; // Filter by product type
if (strval($filtertype) != '') $sql.= " AND p.fk_product_type = ".$filtertype;
elseif (empty($conf->product->enabled)) { // when product module is disabled, show services only
$sql.= " AND p.fk_product_type = 1";
}
elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
$sql.= " AND p.fk_product_type = 0";
}
// Add criteria on ref/label // Add criteria on ref/label
if ($filterkey != '') if ($filterkey != '')
{ {