|
@@ -1982,7 +1982,7 @@ class Form
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- print $this->select_produits_list($selected,$htmlname,$filtertype,$limit,$price_level,'',$status,$finished,0,$socid,$showempty,$forcecombo,$morecss,$hidepriceinlabel, $warehouseStatus);
|
|
|
|
|
|
+ print $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2175,6 +2175,10 @@ class Form
|
|
if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty);
|
|
if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty);
|
|
else $textifempty.=$langs->trans("All");
|
|
else $textifempty.=$langs->trans("All");
|
|
}
|
|
}
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ if ($showempty && ! is_numeric($showempty)) $textifempty=$langs->trans($showempty);
|
|
|
|
+ }
|
|
if ($showempty) $out.='<option value="0" selected>'.$textifempty.'</option>';
|
|
if ($showempty) $out.='<option value="0" selected>'.$textifempty.'</option>';
|
|
|
|
|
|
$i = 0;
|
|
$i = 0;
|