diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 2be2436d0dc..ac377165e4a 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2463,7 +2463,7 @@ else
{
if ($facidnext)
{
- print ''.$langs->trans('SendByMail').'';
+ print ''.$langs->trans('SendByMail').'';
}
else
{
@@ -2476,7 +2476,7 @@ else
{
if ($facidnext)
{
- print ''.$langs->trans('SendRemindByMail').'';
+ print ''.$langs->trans('SendRemindByMail').'';
}
else
{
@@ -2485,21 +2485,29 @@ else
}
// Emettre paiement
- if ($fac->statut == 1 && $fac->paye == 0 && $user->rights->facture->paiement)
+ if ($fac->type != 2 && $fac->statut == 1 && $fac->paye == 0 && $user->rights->facture->paiement)
{
if ($facidnext)
{
- print ''.$langs->trans('DoPaiement').'';
+ print ''.$langs->trans('DoPayment').'';
}
else
{
- print ''.$langs->trans('DoPaiement').'';
+ print ''.$langs->trans('DoPayment').'';
}
}
+ // Emettre remboursement
+/* Pas encore géré
+ if ($fac->type == 2 && $fac->statut == 1 && $fac->paye == 0 && $user->rights->facture->paiement)
+ {
+ print ''.$langs->trans('DoPaymentBack').'';
+ }
+*/
+
// Classer 'payé'
- if ($fac->statut == 1 && $fac->paye == 0 && $user->rights->facture->paiement
- && $resteapayer <= 0)
+ if ($fac->statut == 1 && $fac->paye == 0 && $user->rights->facture->paiement &&
+ (($fac->type != 2 && $resteapayer <= 0) || ($fac->type == 2 && $resteapayer >= 0)) )
{
print ''.$langs->trans('ClassifyPayed').'';
}
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index d8383a1ae82..6ecda7a8973 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -256,7 +256,7 @@ if ($chid > 0)
// Emettre paiement
if ($cha->paye == 0 && round($resteapayer) > 0 && $user->rights->tax->charges->creer)
{
- print "id&action=create\">".$langs->trans("DoPaiement")."";
+ print "id&action=create\">".$langs->trans("DoPayment")."";
}
// Classer 'payé'
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index d0edc9b02cf..c42c2f15d4c 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -787,7 +787,7 @@ else
if ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0)
{
- print ''.$langs->trans('DoPaiement').'';
+ print ''.$langs->trans('DoPayment').'';
}
if ($fac->statut == 1 && price($resteapayer) <= 0 && $fac->paye == 0 && $user->societe_id == 0)
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index b48498a655a..b66a37e13d4 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -66,8 +66,8 @@ SearchABill=Search an invoice
CancelBill=Cancel an invoice
SendByMail=EMail
SendRemindByMail=EMail reminder
-DoPaiement=Do payment
DoPayment=Do payment
+DoPaymentBack=Do payment back
EnterPaymentReceivedFromCustomer=Enter payment received from customer
EnterPaymentDueToCustomer=Make payment due to customer
VAT=VAT
diff --git a/htdocs/langs/fr_BE/bills.lang b/htdocs/langs/fr_BE/bills.lang
index ef927536687..060b8b8eeca 100644
--- a/htdocs/langs/fr_BE/bills.lang
+++ b/htdocs/langs/fr_BE/bills.lang
@@ -60,7 +60,6 @@ SearchABill=Rechercher une facture
CancelBill=Annuler une facture
SendByMail=E-mail
SendRemindByMail=Rappel e-mail
-DoPaiement=Effectuer paiement
DoPayment=Émettre paiement
EnterPaymentReceivedFromCustomer=Entrer le paiement reçu du client
EnterPaymentDueToCustomer=Faire le paiement dû au client
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 737d3504bd7..b2bb6162917 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -21,7 +21,7 @@ ReplaceInvoice=Remplace la facture %s
ReplacementInvoice=Remplacement facture
ReplacedByInvoice=Remplacée par la facture %s
ReplacementByInvoice=Remplacée par facture
-CorrectInvoice=Corrige facture %s
+CorrectInvoice=Correction facture %s
CorrectionInvoice=Correction facture
NoReplacableInvoice=Pas de factures remplacables
NoInvoiceToCorrect=Pas de factures à corriger
@@ -66,8 +66,8 @@ SearchABill=Rechercher une facture
CancelBill=Annuler une facture
SendByMail=Envoyer
SendRemindByMail=Envoyer rappel
-DoPaiement=Émettre réglement
DoPayment=Émettre réglement
+DoPaymentBack=Émettre remboursement
EnterPaymentReceivedFromCustomer=Saisie d'un réglement reçu du client
EnterPaymentDueToCustomer=Réaliser réglement d'avoirs dus au client
VAT=TVA
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index a24ff93042b..92869f03975 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -59,7 +59,6 @@ SearchABill=Zoek een factuur
CancelBill=Annuleer een factuur
SendByMail=EMail
SendRemindByMail=EMail herinnering
-DoPaiement=Doe betaling
DoPayment=Doe betaling
EnterPaymentReceivedFromCustomer=Voeg betaling in ontvangen van klant
EnterPaymentDueToCustomer=Make payment due to customer
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index fb5b0bd8223..197fdbb8b5d 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -19,7 +19,6 @@ DeleteBill=Apagar conta
SearchABill=Procurar uma conta
Send=Enviar
SendRemind=Enviar lembrete
-DoPaiement=Efectuar pagamento
DoPayment=Efectuar pagamento
BuildPDF=Criar PDF
RebuildPDF=Refazer PDF