diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 5b19de7c676..cf0c76002af 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1312,7 +1312,7 @@ class Form while ($i < $num) { $obj = $this->db->fetch_object($resql); - // Si traduction existe, on l'utilise, sinon on prend le libelle par default + // If a translation exists, we use is, otherwise, we take the label by default $label = ($obj->code != $langs->trans($obj->code) ? $langs->trans($obj->code) : $langs->trans($obj->label)); $this->cache_types_fees[$obj->code] = $label; $i++; @@ -2175,7 +2175,7 @@ class Form * * @param string $selected Id user preselected * @param string $htmlname Field name in form - * @param int<0,1> $show_empty 0=liste sans valeur nulle, 1=ajoute valeur inconnue + * @param int<0,1> $show_empty 0=list without null value, 1=add an unknown value * @param int[] $exclude Array list of users id to exclude * @param int<0,1> $disabled If select list must be disabled * @param int[]|''|'hierarchy'|'hierarchyme' $include Array list of users id to include. User '' for all users or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me @@ -3965,9 +3965,9 @@ class Form // mode=2 means suppliers products $urloption = ($socid > 0 ? 'socid=' . $socid . '&' : '') . 'htmlname=' . $htmlname . '&outjson=1&price_level=' . $price_level . '&type=' . $filtertype . '&mode=2&status=' . $status . '&finished=' . $finished . '&alsoproductwithnosupplierprice=' . $alsoproductwithnosupplierprice; - $s = ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/product/ajax/products.php', $urloption, getDolGlobalInt('PRODUIT_USE_SEARCH_TO_SELECT'), 0, $ajaxoptions); + $s = ($hidelabel ? '' : $langs->trans("RefOrLabel") . ' : ') . ''; - $s .= ($hidelabel ? '' : $langs->trans("RefOrLabel") . ' : ') . ''; + $s .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/product/ajax/products.php', $urloption, getDolGlobalInt('PRODUIT_USE_SEARCH_TO_SELECT'), 0, $ajaxoptions); } else { $s = $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', $status, 0, 0, $alsoproductwithnosupplierprice, $morecss, getDolGlobalInt('SUPPLIER_SHOW_STOCK_IN_PRODUCTS_COMBO'), $placeholder); } @@ -4593,7 +4593,7 @@ class Form while ($i < $num) { $obj = $this->db->fetch_object($resql); - // Si traduction existe, on l'utilise, sinon on prend le libelle par default + // If a translation exists, we use it, otherwise, we take the label by default $label = ($langs->trans("PaymentConditionShort" . $obj->code) != "PaymentConditionShort" . $obj->code ? $langs->trans("PaymentConditionShort" . $obj->code) : ($obj->label != '-' ? $obj->label : '')); $this->cache_conditions_paiements[$obj->rowid]['code'] = (string) $obj->code; $this->cache_conditions_paiements[$obj->rowid]['label'] = (string) $label; @@ -4676,7 +4676,7 @@ class Form while ($i < $num) { $obj = $this->db->fetch_object($resql); - // Si traduction existe, on l'utilise, sinon on prend le libelle par default + // If a translation exists, we use is, otherwise, we take the label by default $label = ($langs->trans("AvailabilityType" . $obj->code) != "AvailabilityType" . $obj->code ? $langs->trans("AvailabilityType" . $obj->code) : ($obj->label != '-' ? $obj->label : '')); $this->cache_availability[$obj->rowid]['code'] = (string) $obj->code; $this->cache_availability[$obj->rowid]['label'] = (string) $label; @@ -4758,7 +4758,7 @@ class Form while ($i < $num) { $obj = $this->db->fetch_object($resql); - // Si traduction existe, on l'utilise, sinon on prend le libelle par default + // If a translation exists, we use is, otherwise, we take the label by default $label = ($obj->label != '-' ? (string) $obj->label : ''); if ($langs->trans("DemandReasonType" . $obj->code) != "DemandReasonType" . $obj->code) { $label = $langs->trans("DemandReasonType" . $obj->code); // So translation key DemandReasonTypeSRC_XXX will work @@ -4861,7 +4861,7 @@ class Form while ($i < $num) { $obj = $this->db->fetch_object($resql); - // Si traduction existe, on l'utilise, sinon on prend le libelle par default + // If a translation exists, we use is, otherwise, we take the label by default $label = ($langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) != "PaymentTypeShort" . $obj->code ? $langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) : ($obj->label != '-' ? $obj->label : '')); $this->cache_types_paiements[$obj->id]['id'] = (int) $obj->id; $this->cache_types_paiements[$obj->id]['code'] = (string) $obj->code; @@ -10779,10 +10779,10 @@ class Form /** * Return list of export templates * - * @param string $selected Id modele pre-selectionne - * @param string $htmlname Name of HTML select - * @param string $type Type of searched templates - * @param int $useempty Affiche valeur vide dans liste + * @param string $selected Id of preselected template + * @param string $htmlname Name of HTML select + * @param string $type Type of searched templates + * @param int $useempty Show an empty value in list * @return void */ public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0) @@ -11290,16 +11290,16 @@ class Form * Return select list of user groups * * @param int|object|array $selected Id group or group(s) preselected - * @param string $htmlname Field name in form - * @param int<0,1> $show_empty 0=liste sans valeur nulle, 1=ajoute valeur inconnue - * @param string|int[] $exclude Array list of groups id to exclude - * @param int<0,1> $disabled If select list must be disabled - * @param string|int[] $include Array list of groups id to include - * @param int[] $enableonly Array list of groups id to be enabled. All other must be disabled - * @param string $force_entity '0' or Ids of environment to force - * @param bool $multiple add [] in the name of element and add 'multiple' attribute (not working with ajax_autocompleter) - * @param string $morecss More css to add to html component - * @return string HTML Componont to select a group + * @param string $htmlname Field name in form + * @param int<0,1> $show_empty 0=list without null value, 1=add an unknown value + * @param string|int[] $exclude Array list of groups id to exclude + * @param int<0,1> $disabled If select list must be disabled + * @param string|int[] $include Array list of groups id to include + * @param int[] $enableonly Array list of groups id to be enabled. All other must be disabled + * @param string $force_entity '0' or Ids of environment to force + * @param bool $multiple Add [] in the name of element and add 'multiple' attribute (not working with ajax_autocompleter) + * @param string $morecss More css to add to html component + * @return string HTML Componont to select a group * @see select_dolusers() */ public function select_dolgroups($selected = 0, $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = array(), $force_entity = '0', $multiple = false, $morecss = 'minwidth200')