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

Minor change in translation

Browse Source
This commit is contained in:
Laurent Destailleur 2009-02-13 22:50:58 +00:00
parent 05e6299b21
commit 31f4821f76
5 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/compta/facture.php
View File

@ -2937,7 +2937,7 @@ else
} }
} }
// Valider // Validate
if ($fac->statut == 0 && $num_lignes > 0 && (($fac->type < 2 && $fac->total_ttc >= 0) || ($fac->type == 2 && $fac->total_ttc <= 0))) if ($fac->statut == 0 && $num_lignes > 0 && (($fac->type < 2 && $fac->total_ttc >= 0) || ($fac->type == 2 && $fac->total_ttc <= 0)))
{ {
if ($user->rights->facture->valider) if ($user->rights->facture->valider)
@ -2959,7 +2959,7 @@ else
} }
} }
// Envoyer // Send by mail
if (($fac->statut == 1 || $fac->statut == 2) && $user->rights->facture->envoyer) if (($fac->statut == 1 || $fac->statut == 2) && $user->rights->facture->envoyer)
{ {
if ($facidnext) if ($facidnext)
@ -2972,19 +2972,22 @@ else
} }
} }
// Envoyer une relance if ($conf->global->FACTURE_SHOW_SEND_REMINDER)
if (($fac->statut == 1 || $fac->statut == 2) && $resteapayer > 0 && $user->rights->facture->envoyer)
{ {
if ($facidnext) // Envoyer une relance
if (($fac->statut == 1 || $fac->statut == 2) && $resteapayer > 0 && $user->rights->facture->envoyer)
{ {
print '<span class="butActionRefused" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('SendRemindByMail').'</span>'; if ($facidnext)
} {
else print '<span class="butActionRefused" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('SendRemindByMail').'</span>';
{ }
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$fac->id.'&amp;action=prerelance&amp;mode=init">'.$langs->trans('SendRemindByMail').'</a>'; else
{
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$fac->id.'&amp;action=prerelance&amp;mode=init">'.$langs->trans('SendRemindByMail').'</a>';
}
} }
} }
// Emettre paiement // Emettre paiement
if ($fac->type != 2 && $fac->statut == 1 && $fac->paye == 0 && $user->rights->facture->paiement) if ($fac->type != 2 && $fac->statut == 1 && $fac->paye == 0 && $user->rights->facture->paiement)
{ {

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

@ -73,8 +73,8 @@ DeleteBill=Delete invoice
SearchACustomerInvoice=Search a customer invoice SearchACustomerInvoice=Search a customer invoice
SearchASupplierInvoice=Search a supplier invoice SearchASupplierInvoice=Search a supplier invoice
CancelBill=Cancel an invoice CancelBill=Cancel an invoice
SendByMail=EMail SendByMail=Send by EMail
SendRemindByMail=EMail reminder SendRemindByMail=Send reminder by EMail
DoPayment=Do payment DoPayment=Do payment
DoPaymentBack=Do payment back DoPaymentBack=Do payment back
ConvertToReduc=Convert into future discount ConvertToReduc=Convert into future discount

4
htdocs/langs/en_US/users.lang
View File

@ -7,8 +7,8 @@ NoContactCard=No card among contacts
Permission=Permission Permission=Permission
Permissions=Permissions Permissions=Permissions
EditPassword=Edit password EditPassword=Edit password
SendNewPassword=Send new password SendNewPassword=Regenerate and send password
ReinitPassword=Generate new password ReinitPassword=Regenerate password
PasswordChangedTo=Password changed to: %s PasswordChangedTo=Password changed to: %s
SubjectNewPassword=Your new password for Dolibarr SubjectNewPassword=Your new password for Dolibarr
AvailableRights=Available permissions AvailableRights=Available permissions

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

@ -73,7 +73,7 @@ DeleteBill=Supprimer facture
SearchACustomerInvoice=Rechercher une facture client SearchACustomerInvoice=Rechercher une facture client
SearchASupplierInvoice=Rechercher une facture fournisseur SearchASupplierInvoice=Rechercher une facture fournisseur
CancelBill=Annuler une facture CancelBill=Annuler une facture
SendByMail=Envoyer SendByMail=Envoyer par mail
SendRemindByMail=Envoyer rappel SendRemindByMail=Envoyer rappel
DoPayment=Émettre réglement DoPayment=Émettre réglement
DoPaymentBack=Émettre remboursement DoPaymentBack=Émettre remboursement

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

@ -7,8 +7,8 @@ NoContactCard=Pas de fiche parmi les contacts
Permission=Droit Permission=Droit
Permissions=Droits Permissions=Droits
EditPassword=Modifier mot de passe EditPassword=Modifier mot de passe
SendNewPassword=Envoyer nouveau mot de passe SendNewPassword=Regénérer et envoyer mot de passe
ReinitPassword=Générer nouveau mot de passe ReinitPassword=Regénérer mot de passe
PasswordChangedTo=Mot de passe modifié en: %s PasswordChangedTo=Mot de passe modifié en: %s
SubjectNewPassword=Votre mot de passe pour Dolibarr SubjectNewPassword=Votre mot de passe pour Dolibarr
AvailableRights=Permissions disponibles AvailableRights=Permissions disponibles