diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 6677f7f8dce..48f46860717 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -312,9 +312,9 @@ class FormCompany extends Form
$out .= '';
} else {
if (!$country || $country != $obj->country) {
- // Affiche la rupture si on est en mode liste multipays
+ // Show break if we are in list with multiple countries
if (!$country_codeid && $obj->country_code) {
- $out .= '\n";
+ $out .= '\n";
$country = $obj->country;
}
}
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 4108724236d..8874b96eda5 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -454,8 +454,10 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
templateResult: function (data, container) { /* Format visible output into combo list */
/* Code to add class of origin OPTION propagated to the new select2
tag */
if (data.element) { $(container).addClass($(data.element).attr("class")); }
- //console.log(data.html);
- if (data.id == -1) return \' \';
+ console.log($(data.element).attr("data-html"));
+ if (data.id == -1 && $(data.element).attr("data-html") == undefined) {
+ return \' \';
+ }
if ($(data.element).attr("data-html") != undefined) return htmlEntityDecodeJs($(data.element).attr("data-html")); // If property html set, we decode html entities and use this
return data.text;
},
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index dc2a83f2015..8fea1ffd839 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -503,9 +503,11 @@ By=By
From=From
FromDate=From
FromLocation=From
-at=at
to=to
To=to
+ToDate=to
+ToLocation=to
+at=at
and=and
or=or
Other=Other
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 727773a9606..d84257b69ad 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -12,6 +12,7 @@ PasswordChangedTo=Password changed to: %s
SubjectNewPassword=Your new password for %s
GroupRights=Group permissions
UserRights=User permissions
+Credentials=Credentials
UserGUISetup=User Display Setup
DisableUser=Disable
DisableAUser=Disable a user
@@ -115,7 +116,7 @@ DateOfEmployment=Employment date
DateEmployment=Employment
DateEmploymentstart=Employment Start Date
DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Date range of login validity
+RangeOfLoginValidity=Access validity date range
CantDisableYourself=You can't disable your own user record
ForceUserExpenseValidator=Force expense report validator
ForceUserHolidayValidator=Force leave request validator
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 12d9677c4b5..3622d77de2f 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1354,6 +1354,9 @@ table[summary="list_of_modules"] .fa-cog {
.width125 { width: 125px; }
.width150 { width: 150px; }
.width200 { width: 200px; }
+.width300 { width: 300px; }
+.width400 { width: 400px; }
+.width500 { width: 500px; }
.maxwidth25 { max-width: 25px; }
.maxwidth50 { max-width: 50px; }
.maxwidth75 { max-width: 75px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 87a9d6b1b47..7b49acc63b5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1390,6 +1390,9 @@ table[summary="list_of_modules"] .fa-cog {
.width125 { width: 125px; }
.width150 { width: 150px; }
.width200 { width: 200px; }
+.width300 { width: 300px; }
+.width400 { width: 400px; }
+.width500 { width: 500px; }
.maxwidth25 { max-width: 25px; }
.maxwidth50 { max-width: 50px; }
.maxwidth75 { max-width: 75px; }
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 57d5c44615f..9d2039a4678 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -839,54 +839,6 @@ if ($action == 'create' || $action == 'adduserldap') {
}
$password = (GETPOSTISSET('password') ?GETPOST('password') : $generated_password);
- // Password
- print '
'.$langs->trans("Password").'
';
- print '
';
- $valuetoshow = '';
- if (preg_match('/ldap/', $dolibarr_main_authentication)) {
- $valuetoshow .= ($valuetoshow ? ', ' : '').$langs->trans("PasswordOfUserInLDAP");
- }
- if (preg_match('/http/', $dolibarr_main_authentication)) {
- $valuetoshow .= ($valuetoshow ? ', ' : '').$langs->trans("HTTPBasicPassword");
- }
- if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
- if (!empty($ldap_pass)) { // For very old system comaptibilty. Now clear password can't be viewed from LDAP read
- $valuetoshow .= ($valuetoshow ? ', ' : '').''; // Dolibarr password is preffiled with LDAP known password
- $valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
- } else {
- // We do not use a field password but a field text to show new password to use.
- $valuetoshow .= ($valuetoshow ? ', ' : '').'';
- }
- }
-
- // Other form for user password
- $parameters = array('valuetoshow' => $valuetoshow, 'password' => $password);
- $reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- if ($reshook > 0) {
- $valuetoshow = $hookmanager->resPrint; // to replace
- } else {
- $valuetoshow .= $hookmanager->resPrint; // to add
- }
-
- print $valuetoshow;
- print '
';
-
- if (!empty($conf->api->enabled)) {
- // API key
- //$generated_password = getRandomPassword(false);
- print '
';
+ $valuetoshow = '';
+ if (preg_match('/ldap/', $dolibarr_main_authentication)) {
+ $valuetoshow .= ($valuetoshow ? ', ' : '').$langs->trans("PasswordOfUserInLDAP");
+ }
+ if (preg_match('/http/', $dolibarr_main_authentication)) {
+ $valuetoshow .= ($valuetoshow ? ', ' : '').$langs->trans("HTTPBasicPassword");
+ }
+ if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
+ if (!empty($ldap_pass)) { // For very old system comaptibilty. Now clear password can't be viewed from LDAP read
+ $valuetoshow .= ($valuetoshow ? ', ' : '').''; // Dolibarr password is preffiled with LDAP known password
+ $valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
+ } else {
+ // We do not use a field password but a field text to show new password to use.
+ $valuetoshow .= ($valuetoshow ? ', ' : '').'';
+ }
+ }
+
+ // Other form for user password
+ $parameters = array('valuetoshow' => $valuetoshow, 'password' => $password);
+ $reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ if ($reshook > 0) {
+ $valuetoshow = $hookmanager->resPrint; // to replace
+ } else {
+ $valuetoshow .= $hookmanager->resPrint; // to add
+ }
+
+ print $valuetoshow;
+ print '
';
+
+ if (!empty($conf->api->enabled)) {
+ // API key
+ //$generated_password = getRandomPassword(false);
+ print '
'."\n";
// TODO Move this into tab RH, visible when salarie or RH is visible (HierarchicalResponsible must be on both tab)
@@ -1604,20 +1545,6 @@ if ($action == 'create' || $action == 'adduserldap') {
print '';
print "\n";
- // Date login validity
- print '