' . "\n";
+ print '';
+
+ // Login
+ print '| '.$langs->trans("Login").' | ';
+ if (!empty($object->ldap_sid) && $object->statut == 0) {
+ print '';
+ print $langs->trans("LoginAccountDisableInDolibarr");
+ print ' | ';
+ } else {
+ print '';
+ $addadmin = '';
+ if (property_exists($object, 'admin')) {
+ if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+ $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
+ } elseif (!empty($object->admin)) {
+ $addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');
+ }
+ }
+ print showValueWithClipboardCPButton($object->login).$addadmin;
+ print ' | ';
+ }
+ print '
'."\n";
+
$object->fields['label']['visible']=0; // Already in banner
- include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+ $object->fields['firstname']['visible']=0; // Already in banner
+ $object->fields['lastname']['visible']=0; // Already in banner
+ //include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+
+ // Ref employee
+ print '| '.$langs->trans("RefEmployee").' | ';
+ print '';
+ print showValueWithClipboardCPButton($object->ref_employee);
+ print ' | ';
+ print '
'."\n";
+
+ // National Registration Number
+ print '| '.$langs->trans("NationalRegistrationNumber").' | ';
+ print '';
+ print showValueWithClipboardCPButton($object->national_registration_number);
+ print ' | ';
+ print '
'."\n";
+
+ /*print '| '.$langs->trans("NbOfActiveNotifications").' | '; // Notification for this thirdparty
+ print '';
+ $nbofrecipientemails=0;
+ $notify=new Notify($db);
+ $tmparray = $notify->getNotificationsArray('', 0, null, $object->id, array('user'));
+ foreach($tmparray as $tmpkey => $tmpval)
+ {
+ $nbofrecipientemails++;
+ }
+ print $nbofrecipientemails;
+ print ' |
';*/
+
print '
';
+
print '';
+ print '';
+
print '
';
@@ -296,7 +351,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
print '';
if (!is_array($TSkillsJob) || empty($TSkillsJob)) {
- print '| ' . $langs->trans("NoRecordFound") . ' |
';
+ print '| ' . $langs->trans("NoRecordFound") . ' |
';
} else {
$sk = new Skill($db);
foreach ($TSkillsJob as $skillElement) {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 8dcd1f9f93d..d122e9ca7d1 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2112,7 +2112,7 @@ ResourceSetup=Configuration of Resource module
UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
DisabledResourceLinkUser=Disable feature to link a resource to users
DisabledResourceLinkContact=Disable feature to link a resource to contacts
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
ConfirmUnactivation=Confirm module reset
OnMobileOnly=On small screen (smartphone) only
DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index f4c6f3d3856..6926983915b 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -165,7 +165,7 @@ if (empty($reshook)) {
$objstat->errors[] = $objstat->error;
} else {
if ($db->num_rows($resql) > 0) {
- // already in use
+ // Resource already in use
$error++;
$objstat->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
while ($obj = $db->fetch_object($resql)) {
@@ -241,7 +241,7 @@ if (empty($reshook)) {
$object->errors[] = $object->error;
} else {
if ($db->num_rows($resql) > 0) {
- // already in use
+ // Resource already in use
$error++;
$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
while ($obj = $db->fetch_object($resql)) {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index ac7d0fbe8f8..fcdb2b64710 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1573,7 +1573,7 @@ table[summary="list_of_modules"] .fa-cog {
.minheight30 { min-height: 30px; }
.minheight40 { min-height: 40px; }
.titlefieldcreate { width: 20%; }
-.titlefield { /* width: 25%; */ min-width: 250px; }
+.titlefield { /* width: 25%; */ min-width: 250px; width: 25%; }
.titlefieldmiddle { width: 45%; }
.titlefieldmax45 { max-width: 45%; }
.imgmaxwidth180 { max-width: 180px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index bddb2dd5392..29349ce9858 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1662,7 +1662,7 @@ tr.nobottom td {
.minheight30 { min-height: 30px; }
.minheight40 { min-height: 40px; }
.titlefieldcreate { width: 20%; }
-.titlefield { /* width: 25%; */ min-width: 250px; }
+.titlefield { /* width: 25%; */ min-width: 250px; width: 25%; }
.titlefieldmiddle { width: 50%; }
.imgmaxwidth180 { max-width: 180px; }
.imgmaxheight50 { max-height: 50px; }
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 5921f7d84cd..b7d66d2677c 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -209,9 +209,9 @@ while ($i <= $MAXAGENDA) {
print ' | ';
// URL
$src_value = (GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key) ?GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key) : (empty($object->conf->$src) ? '' : $object->conf->$src));
- print ' | ';
+ print ' | ';
// Offset TZ
- $offsettz_value = (GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key) ? GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key) : (empty($object->conf->$offsettz) ? 0 : $object->conf->$offsettz));
+ $offsettz_value = (GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key) ? GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key) : (empty($object->conf->$offsettz) ? '' : $object->conf->$offsettz));
print ' | ';
// Color (Possible colors are limited by Google)
print '';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 57b5c11e853..cb76b25cc5a 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -365,8 +365,8 @@ class User extends CommonObject
'rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
'lastname'=>array('type'=>'varchar(50)', 'label'=>'LastName', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1),
'firstname'=>array('type'=>'varchar(50)', 'label'=>'FirstName', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
- 'ref_employee'=>array('type'=>'varchar(50)', 'label'=>'ref_employee', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>30, 'searchall'=>1),
- 'national_registration_number'=>array('type'=>'varchar(50)', 'label'=>'national_registration_number', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>40, 'searchall'=>1)
+ 'ref_employee'=>array('type'=>'varchar(50)', 'label'=>'RefEmployee', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>30, 'searchall'=>1),
+ 'national_registration_number'=>array('type'=>'varchar(50)', 'label'=>'NationalRegistrationNumber', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>40, 'searchall'=>1)
);
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index bb1320ecd0b..f92afe53a4f 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -234,6 +234,8 @@ if ($action == 'edit') {
dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+ print '';
+
print dol_get_fiche_end();
@@ -339,6 +341,8 @@ if ($action == 'edit') {
dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+ print '';
+
print dol_get_fiche_end();
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 6e28a77b5bc..889599e2fa9 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -253,7 +253,36 @@ if ($user->rights->user->user->lire || $user->admin) {
dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+print '';
+
print ' ';
+print ' ';
+
+// Login
+print '| '.$langs->trans("Login").' | ';
+if (!empty($object->ldap_sid) && $object->statut == 0) {
+ print '';
+ print $langs->trans("LoginAccountDisableInDolibarr");
+ print ' | ';
+} else {
+ print '';
+ $addadmin = '';
+ if (property_exists($object, 'admin')) {
+ if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+ $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
+ } elseif (!empty($object->admin)) {
+ $addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');
+ }
+ }
+ print showValueWithClipboardCPButton($object->login).$addadmin;
+ print ' | ';
+}
+print ' '."\n";
+
+print ' ';
+
+print ' |