diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 04efa858041..8a5ee797727 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1049,11 +1049,11 @@ if ($action == 'create' || $action == 'adduserldap') {
// Date validity
print '
| '.$langs->trans("RangeOfLoginValidity").' | ';
print '';
- print $form->selectDate($datestartvalidity, 'datestartvalidity', 0, 0, 1, 'formdatestartvalidity', 1, 1);
+ print $form->selectDate($datestartvalidity, 'datestartvalidity', 0, 0, 1, 'formdatestartvalidity', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("from"));
print ' ';
- print $form->selectDate($dateendvalidity, 'dateendvalidity', 0, 0, 1, 'formdateendvalidity', 1, 0);
+ print $form->selectDate($dateendvalidity, 'dateendvalidity', 0, 0, 1, 'formdateendvalidity', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
print ' | ';
print "
\n";
@@ -1344,7 +1344,7 @@ if ($action == 'create' || $action == 'adduserldap') {
// Salary
print '| '.$langs->trans("Salary").' | ';
print '';
- print img_picto('', 'salary', 'class="pictofixedwidth paddingright"').' '.$langs->getCurrencySymbol($conf->currency);
+ print img_picto('', 'salary', 'class="pictofixedwidth paddingright"').' '.$langs->getCurrencySymbol($conf->currency);
print ' | ';
print "
\n";
}
@@ -1359,11 +1359,11 @@ if ($action == 'create' || $action == 'adduserldap') {
// Date employment
print '| '.$langs->trans("DateOfEmployment").' | ';
print '';
- print $form->selectDate($dateemployment, 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 1);
+ print $form->selectDate($dateemployment, 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 1, 0, '', '', '', '', 1, '', $langs->trans("from"));
print ' - ';
- print $form->selectDate($dateemploymentend, 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0);
+ print $form->selectDate($dateemploymentend, 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
print ' | ';
print "
\n";
@@ -2210,7 +2210,7 @@ if ($action == 'create' || $action == 'adduserldap') {
$langs->load("admin");
print '';
print ''.yn($object->admin);
- print ' ('.$langs->trans("ExternalUser").')';
+ print ' ('.$langs->trans("ExternalUser").')';
print ' | ';
} else {
print '';
@@ -2417,18 +2417,14 @@ if ($action == 'create' || $action == 'adduserldap') {
print ' | | '.$langs->trans("RangeOfLoginValidity").' | ';
print '';
if ($caneditfield) {
- print $form->selectDate($datestartvalidity ? $datestartvalidity : $object->datestartvalidity, 'datestartvalidity', 0, 0, 1, 'formdatestartvalidity', 1, 1, 0, '', '', '', '', 1, '', '');
+ print $form->selectDate($datestartvalidity ? $datestartvalidity : $object->datestartvalidity, 'datestartvalidity', 0, 0, 1, 'formdatestartvalidity', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("from"));
} else {
print dol_print_date($object->datestartvalidity, 'day');
}
-
- /*if ($datestartvalidity && $dateendvalidity) {
- print ' - ';
- }*/
print ' ';
if ($caneditfield) {
- print $form->selectDate($dateendvalidity ? $datendevalidity : $object->dateendvalidity, 'dateendvalidity', 0, 0, 1, 'formdateendvalidity', 1, 0, 0, '', '', '', '', 1, '', '');
+ print $form->selectDate($dateendvalidity ? $dateendvalidity : $object->dateendvalidity, 'dateendvalidity', 0, 0, 1, 'formdateendvalidity', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
} else {
print dol_print_date($object->dateendvalidity, 'day');
}
@@ -2859,7 +2855,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print ' |
| '.$langs->trans("DateEmployment").' | ';
print '';
if ($caneditfield) {
- print $form->selectDate($dateemployment ? $dateemployment : $object->dateemployment, 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 1);
+ print $form->selectDate($dateemployment ? $dateemployment : $object->dateemployment, 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 1, 0, '', '', '', '', 1, '', $langs->trans("from"));
} else {
print dol_print_date($object->dateemployment, 'day');
}
@@ -2869,7 +2865,7 @@ if ($action == 'create' || $action == 'adduserldap') {
}
if ($caneditfield) {
- print $form->selectDate($dateemploymentend ? $dateemploymentend : $object->dateemploymentend, 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0);
+ print $form->selectDate($dateemploymentend ? $dateemploymentend : $object->dateemploymentend, 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
} else {
print dol_print_date($object->dateemploymentend, 'day');
}
|