diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index f6aebb09703..19eb19ad00f 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3939,7 +3939,7 @@ else if ($id > 0 || ! empty($ref))
}
// Send by mail
- if (($object->statut == 1 || $object->statut == 2) || ! empty($conf->global->FACTURE_SENDBYEMAIL_FOR_ALL_STATUS)) {
+ if (($object->statut == Facture::STATUS_VALIDATED || $object->statut == Facture::STATUS_CLOSED) || ! empty($conf->global->FACTURE_SENDBYEMAIL_FOR_ALL_STATUS)) {
if ($objectidnext) {
print '
' . $langs->trans('SendByMail') . '
';
} else {
@@ -3950,21 +3950,27 @@ else if ($id > 0 || ! empty($ref))
}
}
- // deprecated. Useless because now we can use templates
- if (! empty($conf->global->FACTURE_SHOW_SEND_REMINDER)) // For backward compatibility
+ // Request a direct debit order
+ if ($object->statut > Facture::STATUS_DRAFT && $object->paye == 0 && $num == 0)
{
- if (($object->statut == 1 || $object->statut == 2) && $resteapayer > 0) {
- if ($objectidnext) {
- print '' . $langs->trans('SendRemindByMail') . '
';
- } else {
- if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send) {
- print '';
- } else
- print '';
- }
- }
+ if ($resteapayer > 0)
+ {
+ if ($user->rights->prelevement->bons->creer)
+ {
+ $langs->load("withdrawals");
+ print ''.$langs->trans("MakeWithdrawRequest").'';
+ }
+ else
+ {
+ //print ''.$langs->trans("MakeWithdrawRequest").'';
+ }
+ }
+ else
+ {
+ //print ''.$langs->trans("MakeWithdrawRequest").'';
+ }
}
-
+
// Create payment
if ($object->type != Facture::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement) {
if ($objectidnext) {
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 548bc370004..0e591ad880a 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -102,8 +102,8 @@ SearchACustomerInvoice=Search for a customer invoice
SearchASupplierInvoice=Search for a supplier invoice
CancelBill=Cancel an invoice
SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
ConvertToReduc=Convert into future discount
EnterPaymentReceivedFromCustomer=Enter payment received from customer
EnterPaymentDueToCustomer=Make payment due to customer
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index a0706fe11a9..1e7f42c2f51 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -76,8 +76,8 @@ RUM=UMR
RUMLong=Unique Mandate Reference
RUMWillBeGenerated=UMR number will be generated once bank account information are saved
WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
SepaMandate=SEPA Direct Debit Mandate
SepaMandateShort=SEPA Mandate
PleaseReturnMandate=Please return this mandate form by email to %s or by mail to