diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index 6725f0dc852..47a08ba2094 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -108,12 +108,13 @@ if ($_GET["facid"] > 0)
print '
';
print ''.$soc->nom.' | ';
- print "Conditions de réglement : " . $fac->cond_reglement ." | ";
+ print "Conditions de réglement | " . $fac->cond_reglement ." | ";
print '| '.$langs->trans("Date").' | ';
- print "".strftime("%A %d %B %Y",$fac->date)." | \n";
- print "Date limite de réglement : " . strftime("%d %B %Y",$fac->date_lim_reglement) ." |
";
-
+ print "".dolibarr_print_date($fac->date,"%A %d %B %Y")." | \n";
+ print ''.$langs->trans("DateClosing").' | ' . dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y");
+ if ($fac->paye == 0 && $fac->date_lim_reglement < (time() - $warning_delay)) print img_warning($langs->trans("Late"));
+ print " | ";
print '';
if ($conf->projet->enabled)
{
@@ -136,7 +137,7 @@ if ($_GET["facid"] > 0)
print '| | ';
print " | ";
}
- print '';
+ print ' | ';
/*
* Documents
@@ -229,7 +230,7 @@ if ($_GET["facid"] > 0)
print ' |
| '.$langs->trans("AmountHT").' | ';
print ''.price($fac->total_ht).' | ';
- print ''.$conf->monnaie.' |
';
+ print ''.$langs->trans("Currency".$conf->monnaie).' | ';
print "
";
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index e460dc15992..2e8a61a3ff9 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -21,7 +21,8 @@
*
*/
-/** \file htdocs/compta/facture/note.php
+/**
+ \file htdocs/compta/facture/note.php
\ingroup facture
\brief Fiche de notes sur une facture
\version $Revision$
@@ -110,8 +111,8 @@ if ($_GET["facid"])
print "Conditions de réglement | " . $facture->cond_reglement ." | ";
print '| '.$langs->trans("Date").' | ';
- print "".strftime("%A %d %B %Y",$facture->date)." | \n";
- print "Date limite de réglement | " . strftime("%d %B %Y",$facture->date_lim_reglement) ." |
";
+ print ''.dolibarr_print_date($facture->date,"%A %d %B %Y")." | \n";
+ print ''.$langs->trans("DateClosing").' | '.dolibarr_print_date($facture->date_lim_reglement,"%A %d %B %Y") ." | ";
print '| '.$langs->trans("Note").' : |
';
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 05ff7b39855..4d87b495dee 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -127,18 +127,18 @@ if ($_GET["facid"] > 0)
print "Conditions de réglement : " . $fac->cond_reglement ." | ";
print '| '.$langs->trans("Date").' | ';
- print "".strftime("%A %d %B %Y",$fac->date)." | \n";
- print "Date limite de réglement : " . strftime("%d %B %Y",$fac->date_lim_reglement) ." |
";
+ print "".dolibarr_print_date($fac->date,"%A %d %B %Y")." | \n";
+ print ''.$langs->trans("DateClosing").dolibarr_print_date($fac->date_lim_reglement,"%A %d %B %Y").' | ';
print '| '.$langs->trans("Author").' | '.$author->fullname.' |
';
print '| '.$langs->trans("AmountHT").' | ';
print ''.price($fac->total_ht).' | ';
- print ''.$conf->monnaie.' | |
';
+ print ''.$langs->trans("Currency".$conf->monnaie).' | | ';
print '| '.$langs->trans("AmountTTC").' | ';
print ''.price($fac->total_ttc).' | ';
- print ''.$conf->monnaie.' | |
';
+ print ''.$langs->trans("Currency".$conf->monnaie).' | | ';
print '| RIB | ';
print $soc->display_rib();
@@ -176,7 +176,7 @@ if ($_GET["facid"] > 0)
{
if ($user->rights->facture->creer)
{
- print 'Faire une demande de prélèvement';
+ print 'Faire une demande de prélèvement';
}
}
print " ";
@@ -189,7 +189,7 @@ if ($_GET["facid"] > 0)
print ' |
';
print '| Date demande | ';
print 'Date traitement | ';
- print 'Montant | ';
+ print ''.$langs->trans("Amount").' | ';
print 'Bon prélèvement | ';
print ''.$langs->trans("User").' | | | ';
print '
';
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 726ed759655..161d5add771 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -82,3 +82,4 @@ SendBillByMail=Send bill by email
SendReminderBillByMail=Send reminder by email
RelatedCommercialProposals=Related commercial proposals
MenuToValid=To valid
+DateClosing=Closing date
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 961cb61098c..ae5e5a8373b 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -85,3 +85,4 @@ SendBillByMail=Envoyer la facture par mail
SendReminderBillByMail=Envoyer une relance par mail
RelatedCommercialProposals=Propositions commerciales associées
MenuToValid=A valider
+DateClosing=Date limite réglement
\ No newline at end of file