lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trad missing

Browse Source
This commit is contained in:
Laurent Destailleur 2010-02-04 20:05:41 +00:00
parent 8a37c13365
commit 064da109df
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/compta/facture.php
View File

@ -3272,7 +3272,7 @@ else
} }
// Reopen a classified invoice // 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->getIdReplacingInvoice() == 0 && // Not replaced by another invoice
$fac->close_code != 'replaced') // 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 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 (($fac->statut == 1 || $fac->statut == 2) && $resteapayer > 0 && $user->rights->facture->envoyer)
{ {
if ($facidnext) if ($facidnext)

2
htdocs/compta/paiement/fiche.php
View File

@ -300,7 +300,7 @@ if ($user->societe_id == 0 && $_GET['action'] == '')
} }
else else
{ {
print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovedPaiementWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>'; print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
} }
} }
} }

2
htdocs/langs/en_US/bills.lang
View File

@ -352,6 +352,8 @@ PaymentInvoiceRef=Payment invoice %s
ValidateInvoice=Validate invoice ValidateInvoice=Validate invoice
Cash=Cash Cash=Cash
Reported=Delayed 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 ##### ##### Types de contacts #####
TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
TypeContact_facture_external_BILLING=Customer invoice contact TypeContact_facture_external_BILLING=Customer invoice contact

2
htdocs/langs/fr_FR/bills.lang
View File

@ -354,6 +354,8 @@ Reported=Différé
InvoiceDeposit=Facture d'acompte InvoiceDeposit=Facture d'acompte
InvoiceDepositAsk=Facture d'acompte InvoiceDepositAsk=Facture d'acompte
InvoiceDepositDesc=La <b>facture d'acompte</b> 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. InvoiceDepositDesc=La <b>facture d'acompte</b> 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 ##### ##### Types de contacts #####
TypeContact_facture_internal_SALESREPFOLL=Reponsable suivi facture client TypeContact_facture_internal_SALESREPFOLL=Reponsable suivi facture client
TypeContact_facture_external_BILLING=Contact client facturation TypeContact_facture_external_BILLING=Contact client facturation