From 74e8738ca774138df1a76942ea3e3064704efab6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 24 Dec 2015 11:24:56 +0100 Subject: [PATCH] Fix: if option to select thirdparties using a combo box after n chars was on, it was no more possible to clear the filter. --- htdocs/core/class/html.form.class.php | 1 + htdocs/langs/en_US/main.lang | 1 + 2 files changed, 2 insertions(+) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index bcdcdea6147..d4f0a1e4691 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1016,6 +1016,7 @@ class Form // Do not use textempty = ' ' or ' ' here, or search on key will search on ' key'. //$textifempty=' '; //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty=''; + if (! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $textifempty.=$langs->trans("NoFilter"); if ($showempty) $out.= ''."\n"; $num = $this->db->num_rows($resql); diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 49d45dd154e..435dfe5f78b 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -106,6 +106,7 @@ NotePrivate=Note (private) PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to %s decimals. DoTest=Test ToFilter=Filter +NoFilter=No filter WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay. yes=yes Yes=Yes