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

Suppression chaine traduction en double

Browse Source
This commit is contained in:
Laurent Destailleur 2007-03-17 00:15:52 +00:00
parent 0941ad4468
commit e5040c5ce8
8 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/compta/facture.php
View File

@ -2463,7 +2463,7 @@ else
{ {
if ($facidnext) if ($facidnext)
{ {
print '<span class="butActionRefused" alt="'.$langs->trans("DisabledBecauseReplacedInvoie").'">'.$langs->trans('SendByMail').'</span>'; print '<span class="butActionRefused" alt="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('SendByMail').'</span>';
} }
else else
{ {
@ -2476,7 +2476,7 @@ else
{ {
if ($facidnext) if ($facidnext)
{ {
print '<span class="butActionRefused" alt="'.$langs->trans("DisabledBecauseReplacedInvoie").'">'.$langs->trans('SendRemindByMail').'</span>'; print '<span class="butActionRefused" alt="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('SendRemindByMail').'</span>';
} }
else else
{ {
@ -2485,21 +2485,29 @@ else
} }
// Emettre paiement // 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) if ($facidnext)
{ {
print '<span class="butActionRefused" alt="'.$langs->trans("DisabledBecauseReplacedInvoie").'">'.$langs->trans('DoPaiement').'</span>'; print '<span class="butActionRefused" alt="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('DoPayment').'</span>';
} }
else else
{ {
print '<a class="butAction" href="paiement.php?facid='.$fac->id.'&amp;action=create">'.$langs->trans('DoPaiement').'</a>'; print '<a class="butAction" href="paiement.php?facid='.$fac->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a>';
} }
} }
// Emettre remboursement
/* Pas encore géré
if ($fac->type == 2 && $fac->statut == 1 && $fac->paye == 0 && $user->rights->facture->paiement)
{
print '<a class="butAction" href="paiement.php?facid='.$fac->id.'&amp;action=create">'.$langs->trans('DoPaymentBack').'</a>';
}
*/
// Classer 'payé' // Classer 'payé'
if ($fac->statut == 1 && $fac->paye == 0 && $user->rights->facture->paiement if ($fac->statut == 1 && $fac->paye == 0 && $user->rights->facture->paiement &&
&& $resteapayer <= 0) (($fac->type != 2 && $resteapayer <= 0) || ($fac->type == 2 && $resteapayer >= 0)) )
{ {
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$fac->id.'&amp;action=payed">'.$langs->trans('ClassifyPayed').'</a>'; print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$fac->id.'&amp;action=payed">'.$langs->trans('ClassifyPayed').'</a>';
} }

2
htdocs/compta/sociales/charges.php
View File

@ -256,7 +256,7 @@ if ($chid > 0)
// Emettre paiement // Emettre paiement
if ($cha->paye == 0 && round($resteapayer) > 0 && $user->rights->tax->charges->creer) if ($cha->paye == 0 && round($resteapayer) > 0 && $user->rights->tax->charges->creer)
{ {
print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT."/compta/paiement_charge.php?id=$cha->id&amp;action=create\">".$langs->trans("DoPaiement")."</a>"; print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT."/compta/paiement_charge.php?id=$cha->id&amp;action=create\">".$langs->trans("DoPayment")."</a>";
} }
// Classer 'payé' // Classer 'payé'

2
htdocs/fourn/facture/fiche.php
View File

@ -787,7 +787,7 @@ else
if ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0) if ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0)
{ {
print '<a class="butAction" href="paiement.php?facid='.$fac->id.'&amp;action=create">'.$langs->trans('DoPaiement').'</a>'; print '<a class="butAction" href="paiement.php?facid='.$fac->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a>';
} }
if ($fac->statut == 1 && price($resteapayer) <= 0 && $fac->paye == 0 && $user->societe_id == 0) if ($fac->statut == 1 && price($resteapayer) <= 0 && $fac->paye == 0 && $user->societe_id == 0)

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

@ -66,8 +66,8 @@ SearchABill=Search an invoice
CancelBill=Cancel an invoice CancelBill=Cancel an invoice
SendByMail=EMail SendByMail=EMail
SendRemindByMail=EMail reminder SendRemindByMail=EMail reminder
DoPaiement=Do payment
DoPayment=Do payment DoPayment=Do payment
DoPaymentBack=Do payment back
EnterPaymentReceivedFromCustomer=Enter payment received from customer EnterPaymentReceivedFromCustomer=Enter payment received from customer
EnterPaymentDueToCustomer=Make payment due to customer EnterPaymentDueToCustomer=Make payment due to customer
VAT=VAT VAT=VAT

1
htdocs/langs/fr_BE/bills.lang
View File

@ -60,7 +60,6 @@ SearchABill=Rechercher une facture
CancelBill=Annuler une facture CancelBill=Annuler une facture
SendByMail=E-mail SendByMail=E-mail
SendRemindByMail=Rappel e-mail SendRemindByMail=Rappel e-mail
DoPaiement=Effectuer paiement
DoPayment=Émettre paiement DoPayment=Émettre paiement
EnterPaymentReceivedFromCustomer=Entrer le paiement reçu du client EnterPaymentReceivedFromCustomer=Entrer le paiement reçu du client
EnterPaymentDueToCustomer=Faire le paiement dû au client EnterPaymentDueToCustomer=Faire le paiement dû au client

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

@ -21,7 +21,7 @@ ReplaceInvoice=Remplace la facture %s
ReplacementInvoice=Remplacement facture ReplacementInvoice=Remplacement facture
ReplacedByInvoice=Remplacée par la facture %s ReplacedByInvoice=Remplacée par la facture %s
ReplacementByInvoice=Remplacée par facture ReplacementByInvoice=Remplacée par facture
CorrectInvoice=Corrige facture %s CorrectInvoice=Correction facture %s
CorrectionInvoice=Correction facture CorrectionInvoice=Correction facture
NoReplacableInvoice=Pas de factures remplacables NoReplacableInvoice=Pas de factures remplacables
NoInvoiceToCorrect=Pas de factures à corriger NoInvoiceToCorrect=Pas de factures à corriger
@ -66,8 +66,8 @@ SearchABill=Rechercher une facture
CancelBill=Annuler une facture CancelBill=Annuler une facture
SendByMail=Envoyer SendByMail=Envoyer
SendRemindByMail=Envoyer rappel SendRemindByMail=Envoyer rappel
DoPaiement=Émettre réglement
DoPayment=Émettre réglement DoPayment=Émettre réglement
DoPaymentBack=Émettre remboursement
EnterPaymentReceivedFromCustomer=Saisie d'un réglement reçu du client EnterPaymentReceivedFromCustomer=Saisie d'un réglement reçu du client
EnterPaymentDueToCustomer=Réaliser réglement d'avoirs dus au client EnterPaymentDueToCustomer=Réaliser réglement d'avoirs dus au client
VAT=TVA VAT=TVA

1
htdocs/langs/nl_BE/bills.lang
View File

@ -59,7 +59,6 @@ SearchABill=Zoek een factuur
CancelBill=Annuleer een factuur CancelBill=Annuleer een factuur
SendByMail=EMail SendByMail=EMail
SendRemindByMail=EMail herinnering SendRemindByMail=EMail herinnering
DoPaiement=Doe betaling
DoPayment=Doe betaling DoPayment=Doe betaling
EnterPaymentReceivedFromCustomer=Voeg betaling in ontvangen van klant EnterPaymentReceivedFromCustomer=Voeg betaling in ontvangen van klant
EnterPaymentDueToCustomer=Make payment due to customer EnterPaymentDueToCustomer=Make payment due to customer

1
htdocs/langs/pt_PT/bills.lang
View File

@ -19,7 +19,6 @@ DeleteBill=Apagar conta
SearchABill=Procurar uma conta SearchABill=Procurar uma conta
Send=Enviar Send=Enviar
SendRemind=Enviar lembrete SendRemind=Enviar lembrete
DoPaiement=Efectuar pagamento
DoPayment=Efectuar pagamento DoPayment=Efectuar pagamento
BuildPDF=Criar PDF BuildPDF=Criar PDF
RebuildPDF=Refazer PDF RebuildPDF=Refazer PDF