diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index bd5a8147f1f..5fec8a9b2c4 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3272,7 +3272,7 @@ else } // Reopen a classified invoice - if ($fac->statut == 3 && // A abandoned invoice + if (($fac->statut == 2 || $fac->statut == 3) && // Closed invoice $fac->getIdReplacingInvoice() == 0 && // Not replaced by another invoice $fac->close_code != 'replaced') // Not replaced by another invoice { @@ -3315,7 +3315,6 @@ else if ($conf->global->FACTURE_SHOW_SEND_REMINDER) // For backward compatibility { - // Envoyer une relance if (($fac->statut == 1 || $fac->statut == 2) && $resteapayer > 0 && $user->rights->facture->envoyer) { if ($facidnext) diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 8da328be9b6..3b80212e792 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -300,7 +300,7 @@ if ($user->societe_id == 0 && $_GET['action'] == '') } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } } } diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 7a7c23f4b8a..c8b386f4627 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -352,6 +352,8 @@ PaymentInvoiceRef=Payment invoice %s ValidateInvoice=Validate invoice Cash=Cash Reported=Delayed +DisabledBecausePayments=Not possible since there is some payments +CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least on invoice classified payed ##### Types de contacts ##### TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice TypeContact_facture_external_BILLING=Customer invoice contact diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 116e461641a..014e83e90e2 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -354,6 +354,8 @@ Reported=Différé InvoiceDeposit=Facture d'acompte InvoiceDepositAsk=Facture d'acompte InvoiceDepositDesc=La facture d'acompte est le type de facture qui fait suite à réception d'un acompte, s'il n'est pas encore possible de saisir le paiement sur une facture définitive. +DisabledBecausePayments=Non disponible car il existe des paiements +CantRemovePaymentWithOneInvoicePaid=Suppression impossible quand il existe au moins une facture classée payée. ##### Types de contacts ##### TypeContact_facture_internal_SALESREPFOLL=Reponsable suivi facture client TypeContact_facture_external_BILLING=Contact client facturation