diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 3074b68756a..1a697e7f652 100755 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -77,4 +77,6 @@ MyInformations=My informations ExportDataset_user_1=Dolibarr's users and properties DomainUser=Domain user Reactivate=Reactivate -ThirdParty=Third party \ No newline at end of file +ThirdParty=Third party +CreateInternalUserDesc=This form allows you to creat an user internal to your company/fundation. To creat an external user (customer, supplier, ...), use button 'Create Dolibarr user' from third party's contact card. +InternalExternalDesc=An internal user is a user that is part of your company/fundation.
An external user is a customer, supplier or other.

In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display) diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang index 5ffdcf2a87b..87a8888110f 100755 --- a/htdocs/langs/fr_FR/users.lang +++ b/htdocs/langs/fr_FR/users.lang @@ -77,4 +77,6 @@ MyInformations=Mes informations ExportDataset_user_1=Utilisateurs Dolibarr et attributs DomainUser=Utilisateur du domaine Reactivate=Réactiver -ThirdParty=Tiers \ No newline at end of file +ThirdParty=Tiers +CreateInternalUserDesc=Cet écran permet de créer un utilisateur interne à votre société/institution. Pour créer un utilisateur externe (client, fournisseur, ...), utiliser le bouton 'Créer utilisateur Dolibarr' qui se trouve sur la fiche contact du tiers en question. +InternalExternalDesc=Un utilisateur interne est un utilisateur appartenant à votre société/institution.
Un utilisateur externe est un utilisateur client, fournisseur ou autre.

Dans les 2 cas, les permissions utilisateurs définissent les droits d'accès mais l'utilisateur externe peut en plus avoir un gestionnaire de menu différent de l'utilisateur interne (Voir Accueil - Configuration - Affichage) diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index dc4806b728f..5fbabee1e39 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -333,8 +333,12 @@ if ((($_POST["action"] == 'confirm_password' && $_POST["confirm"] == 'yes') + + llxHeader('',$langs->trans("UserCard")); +$html = new Form($db); + if (($action == 'create') || ($action == 'adduserldap')) { /* ************************************************************************** */ @@ -344,8 +348,12 @@ if (($action == 'create') || ($action == 'adduserldap')) /* ************************************************************************** */ print_titre($langs->trans("NewUser")); - print "
"; + + print $langs->trans("CreateInternalUserDesc"); + print "
"; + print "
"; + if ($message) { print $message.'
'; } /* @@ -440,7 +448,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print ''; print "".''; - print ''; print ''; - print ''; print ''; - print ''; - print ''; - print '\n"; } + print ''; + print ''; + + print ''; - print ''; print ''; - print ''; print ''; - print ''; print ''; - print ''; print '\n"; // Autres caractéristiques issus des autres modules if ($conf->webcal->enabled) { print "".''; - print ''; + print ''; } print "".''; @@ -661,7 +675,6 @@ else */ if ($action == 'password') { - $html = new Form($db); $html->form_confirm("fiche.php?id=$fuser->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$fuser->login),"confirm_password"); print '
'; } @@ -671,7 +684,6 @@ else */ if ($action == 'passwordsend') { - $html = new Form($db); $html->form_confirm("fiche.php?id=$fuser->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$fuser->login),"confirm_passwordsend"); print '
'; } @@ -681,7 +693,6 @@ else */ if ($action == 'disable') { - $html = new Form($db); $html->form_confirm("fiche.php?id=$fuser->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$fuser->login),"confirm_disable"); print '
'; } @@ -691,7 +702,6 @@ else */ if ($action == 'delete') { - $html = new Form($db); $html->form_confirm("fiche.php?id=$fuser->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$fuser->login),"confirm_delete"); print '
'; } @@ -705,7 +715,7 @@ else print '
'.$langs->trans("Lastname").''; + print ''; if ($ldap_nom) { print ''; @@ -453,7 +461,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print '
'.$langs->trans("Firstname").''; + print ''; if ($ldap_prenom) { print ''; @@ -466,7 +474,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print '
'.$langs->trans("Login").''; + print ''; if ($ldap_login) { print ''; @@ -493,7 +501,7 @@ if (($action == 'create') || ($action == 'adduserldap')) } print '
'.$langs->trans("Password").''; + print ''; if ($ldap_SID) { print 'mot de passe du domaine'; @@ -507,13 +515,19 @@ if (($action == 'create') || ($action == 'adduserldap')) if ($user->admin) { print '
'.$langs->trans("Administrator").''; + print ''; $form->selectyesnonum('admin',0); print "
'.$langs->trans("Type").''; + print $html->textwithhelp($langs->trans("Internal"),$langs->trans("InternalExternalDesc")); + print '
'.$langs->trans("Phone").''; + print ''; if ($ldap_phone) { print ''; @@ -526,7 +540,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print '
'.$langs->trans("Fax").''; + print ''; if ($ldap_fax) { print ''; @@ -539,7 +553,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print '
'.$langs->trans("Mobile").''; + print ''; if ($ldap_mobile) { print ''; @@ -552,7 +566,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print '
'.$langs->trans("EMail").''; + print ''; if ($ldap_mail) { print ''; @@ -565,14 +579,14 @@ if (($action == 'create') || ($action == 'adduserldap')) print '
'.$langs->trans("Note").''; - print "
'.$langs->trans("LoginWebcal").'
'; print ''; - print ''; + print ''; print ''; print ''; - print ''; + print ''; print "\n"; print ''; if ($fuser->login) { - print '\n"; // Administrateur print ''; - print ''; print "\n"; - // Source - print ''; - print ''; + print ''; // Company / Contact print ''; - print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print "\n"; print ''; - print ''; + print ''; print "\n"; print ''; - print ''; + print ''; print "\n"; print ''; - print ''; + print ''; print "\n"; print ''; - print ''; + print ''; print "\n"; print "".''; - print ''; + print ''; print "\n"; // Autres caractéristiques issus des autres modules @@ -1029,7 +1039,7 @@ else $rowspan=12; print ''; - print ''; @@ -1076,7 +1086,7 @@ else } else { - print '\n"; @@ -1084,13 +1094,13 @@ else print "".''; if ($fuser->societe_id > 0) { - print ''; } else { - print ''; } - // Source - print ''; - print ''; + print ''; - print '".'".''; - print ''; diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 98812907f75..237df04e712 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -159,7 +159,7 @@ if ($action == 'create') print ''; print "".'\n"; print "".''; @@ -378,7 +378,7 @@ else print ''; print "\n"; print ''; - print ''; + print ''; print "\n"; print ''; print "
'.$langs->trans("Lastname").''.$fuser->nom.''.$fuser->nom.''; if (file_exists($conf->users->dir_output."/".$fuser->id.".jpg")) { @@ -718,13 +728,13 @@ else print '
'.$langs->trans("Firstname").''.$fuser->prenom.''.$fuser->prenom.'
'.$langs->trans("Login").''.$fuser->login; + print ''.$fuser->login; } else if ($fuser->ldap_sid) { @@ -755,23 +765,23 @@ else } else { - print ''.eregi_replace('.','*',$fuser->pass); + print ''.eregi_replace('.','*',$fuser->pass); } print "
'.$langs->trans("Administrator").''.yn($fuser->admin); + print ''.yn($fuser->admin); if ($fuser->admin) print ' '.img_picto($langs->trans("Administrator"),"star"); print '
'.$langs->trans("Source").''; + // Type + print '
'.$langs->trans("Type").''; if ($fuser->societe_id) { - print $langs->trans("External"); + print $html->textwithhelp($langs->trans("External"),$langs->trans("InternalExternalDesc")); } else if ($fuser->ldap_sid) { @@ -779,13 +789,13 @@ else } else { - print $langs->trans("Internal"); + print $html->textwithhelp($langs->trans("Internal"),$langs->trans("InternalExternalDesc")); } print '
'.$langs->trans("Company").' / '.$langs->trans("Contact").''; + print ''; if ($fuser->societe_id > 0) { $societe = new Societe($db); @@ -807,34 +817,34 @@ else // Tel, fax, portable print '
'.$langs->trans("Phone").''.$fuser->office_phone.''.$fuser->office_phone.'
'.$langs->trans("Fax").''.$fuser->office_fax.''.$fuser->office_fax.'
'.$langs->trans("Mobile").''.$fuser->user_mobile.''.$fuser->user_mobile.'
'.$langs->trans("EMail").''.$fuser->email.''.$fuser->email.'
'.$langs->trans("DateCreation").''.dolibarr_print_date($fuser->datec,"%d/%m/%Y %H:%M:%S").''.dolibarr_print_date($fuser->datec,"%d/%m/%Y %H:%M:%S").'
'.$langs->trans("DateModification").''.dolibarr_print_date($fuser->datem,"%d/%m/%Y %H:%M:%S").''.dolibarr_print_date($fuser->datem,"%d/%m/%Y %H:%M:%S").'
'.$langs->trans("LastConnexion").''.dolibarr_print_date($fuser->datelastlogin,"%d/%m/%Y %H:%M:%S").''.dolibarr_print_date($fuser->datelastlogin,"%d/%m/%Y %H:%M:%S").'
'.$langs->trans("PreviousConnexion").''.dolibarr_print_date($fuser->datepreviouslogin,"%d/%m/%Y %H:%M:%S").''.dolibarr_print_date($fuser->datepreviouslogin,"%d/%m/%Y %H:%M:%S").'
'.$langs->trans("Note").''.nl2br($fuser->note).' '.nl2br($fuser->note).' 
'.$langs->trans("Lastname").''; + print ''; if ($caneditfield) print ''; else print $fuser->nom; print ''.eregi_replace('.','*',$fuser->pass); + print ''.eregi_replace('.','*',$fuser->pass); } print "
'.$langs->trans("Administrator").''; + print ''; print ''.yn($fuser->admin); print '
'; + print ''; if ($user->admin) { $form->selectyesnonum('admin',$fuser->admin); @@ -1102,9 +1112,9 @@ else print '
'.$langs->trans("Source").''; + // Type + print '
'.$langs->trans("Type").''; if ($fuser->societe_id) { print $langs->trans("External"); @@ -1121,7 +1131,7 @@ else // Company / Contact print '
'.$langs->trans("Company").' / '.$langs->trans("Contact").''; + print ''; if ($fuser->societe_id > 0) { $societe = new Societe($db); @@ -1169,7 +1179,7 @@ else print "
'.$langs->trans("Note").''; if ($caneditfield) { - print ''; } @@ -1184,7 +1194,7 @@ else { $langs->load("other"); print "
'.$langs->trans("LoginWebcal").''; + print ''; if ($caneditfield) print ''; else print $fuser->webcal_login; print '
'.$langs->trans("Note").''; - print "
'.$langs->trans("Note").'
\n";