diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 1a74b279524..7a0cac6543b 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -33,6 +33,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Des erreurs ont ErrorConfigParameterNotDefined=Le parametre %s n'est pas défini dans le fichier de configuration Dolibarr conf.php. ErrorCantLoadUserFromDolibarrDatabase=Impossible de trouver l'utilisateur %s dans la base Dolibarr. DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr est configuré en mode authentification %s dans son fichier de configuration conf.php.
Cela signifie que la base des mots de passe est externe à Dolibarr, aussi toute modification de ce champ peut s'avérer sans effet. +PasswordForgotten=Mot de passe oublié ? SeeAbove=Voir ci-dessus HomeArea=Espace accueil LastConnexion=Dernière connexion diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index cee5f4bb014..c5f816e3efb 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -1127,7 +1127,7 @@ function dol_loginfunction($notused,$pearstatus) print "\n"; print "\n"; print ''."\n"; // Evite indexation par robots - print "Dolibarr Authentification\n"; + print "Dolibarr Authentification\n"; print ''."\n"; @@ -1169,7 +1169,7 @@ function dol_loginfunction($notused,$pearstatus) print $_SERVER["QUERY_STRING"]?'?'.$_SERVER["QUERY_STRING"]:''; print '">'; - print ''; + print '
'; if (file_exists(DOL_DOCUMENT_ROOT.'/logo.png')) @@ -1182,15 +1182,15 @@ function dol_loginfunction($notused,$pearstatus) print ''; } - print'
Dolibarr '.DOL_VERSION.'
+ print '
- +
- + '; @@ -1207,14 +1207,20 @@ function dol_loginfunction($notused,$pearstatus) print ' - - + + + '; +if ($conf->global->MAIN_SECURITY_ALLOWFORGETPASSWORD) +{ + print ''; +} + print '
 
  '.$langs->trans("Login").'  

  '.$langs->trans("Login").'  
  '.$langs->trans("Password").'   -
  '.$langs->trans("Password").'   '; +print '

('.$langs->trans("PasswordForgotten").')
diff --git a/mysql/data/data.sql b/mysql/data/data.sql index 76750694a89..bb39e760ba0 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -65,7 +65,6 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_SMTP insert into llx_const (name, value, type, note, visible) values ('MAIN_UPLOAD_DOC','2048','chaine','Max size for file upload (0 means no upload allowed)',0); insert into llx_const(name,value,type,visible,note) values('MAIN_ENABLE_DEVELOPMENT','0','yesno',1,'Make development modules visible'); -insert into llx_const(name,value,type,visible,note) values('PRODUCT_SHOW_WHEN_CREATE','0','yesno',1,'Add products list in first step of proposal, invoice, order creation'); insert into llx_const(name,value,type,visible,note) values('MAIN_FASTSEARCH_COMPANY','1','yesno',0,'Show form for quick company search'); insert into llx_const(name,value,type,visible,note) values('MAIN_FASTSEARCH_CONTACT','1','yesno',0,'Show form for quick contact search'); @@ -198,6 +197,12 @@ insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SET insert into llx_const (name, value, type, visible, note) VALUES ('PROPALE_VALIDITY_DURATION', '15', 'chaine', 0, 'Durée de validitée des propales'); +-- +-- Product +-- +insert into llx_const(name,value,type,visible,note) values('PRODUCT_SHOW_WHEN_CREATE','0','yesno',1,'Add products list in first step of proposal, invoice, order creation'); + + -- -- Descriptif des plans comptables FR PCG99-ABREGE --