diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 11f9b3d2b68..6566f2a1561 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2937,7 +2937,7 @@ else
}
}
- // Valider
+ // Validate
if ($fac->statut == 0 && $num_lignes > 0 && (($fac->type < 2 && $fac->total_ttc >= 0) || ($fac->type == 2 && $fac->total_ttc <= 0)))
{
if ($user->rights->facture->valider)
@@ -2959,7 +2959,7 @@ else
}
}
- // Envoyer
+ // Send by mail
if (($fac->statut == 1 || $fac->statut == 2) && $user->rights->facture->envoyer)
{
if ($facidnext)
@@ -2972,19 +2972,22 @@ else
}
}
- // Envoyer une relance
- if (($fac->statut == 1 || $fac->statut == 2) && $resteapayer > 0 && $user->rights->facture->envoyer)
+ if ($conf->global->FACTURE_SHOW_SEND_REMINDER)
{
- if ($facidnext)
+ // Envoyer une relance
+ if (($fac->statut == 1 || $fac->statut == 2) && $resteapayer > 0 && $user->rights->facture->envoyer)
{
- print ''.$langs->trans('SendRemindByMail').'';
- }
- else
- {
- print ''.$langs->trans('SendRemindByMail').'';
+ if ($facidnext)
+ {
+ print ''.$langs->trans('SendRemindByMail').'';
+ }
+ else
+ {
+ print ''.$langs->trans('SendRemindByMail').'';
+ }
}
}
-
+
// Emettre paiement
if ($fac->type != 2 && $fac->statut == 1 && $fac->paye == 0 && $user->rights->facture->paiement)
{
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 48226535cae..410565dcbd0 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -73,8 +73,8 @@ DeleteBill=Delete invoice
SearchACustomerInvoice=Search a customer invoice
SearchASupplierInvoice=Search a supplier invoice
CancelBill=Cancel an invoice
-SendByMail=EMail
-SendRemindByMail=EMail reminder
+SendByMail=Send by EMail
+SendRemindByMail=Send reminder by EMail
DoPayment=Do payment
DoPaymentBack=Do payment back
ConvertToReduc=Convert into future discount
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index f881b8091e4..5df8a96303e 100755
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -7,8 +7,8 @@ NoContactCard=No card among contacts
Permission=Permission
Permissions=Permissions
EditPassword=Edit password
-SendNewPassword=Send new password
-ReinitPassword=Generate new password
+SendNewPassword=Regenerate and send password
+ReinitPassword=Regenerate password
PasswordChangedTo=Password changed to: %s
SubjectNewPassword=Your new password for Dolibarr
AvailableRights=Available permissions
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 00a19922369..9aa3d4b40e6 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -73,7 +73,7 @@ DeleteBill=Supprimer facture
SearchACustomerInvoice=Rechercher une facture client
SearchASupplierInvoice=Rechercher une facture fournisseur
CancelBill=Annuler une facture
-SendByMail=Envoyer
+SendByMail=Envoyer par mail
SendRemindByMail=Envoyer rappel
DoPayment=Émettre réglement
DoPaymentBack=Émettre remboursement
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index ff3e2c109dc..d85e8d2abba 100755
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -7,8 +7,8 @@ NoContactCard=Pas de fiche parmi les contacts
Permission=Droit
Permissions=Droits
EditPassword=Modifier mot de passe
-SendNewPassword=Envoyer nouveau mot de passe
-ReinitPassword=Générer nouveau mot de passe
+SendNewPassword=Regénérer et envoyer mot de passe
+ReinitPassword=Regénérer mot de passe
PasswordChangedTo=Mot de passe modifié en: %s
SubjectNewPassword=Votre mot de passe pour Dolibarr
AvailableRights=Permissions disponibles