';
print '| '.$langs->trans("Ref").' | '.$bon->getNomUrl(1).' |
';
- print '| '.$langs->trans("Date").' | '.dol_print_date($bon->datec,'dayhour').' |
';
+ print '| '.$langs->trans("Date").' | '.dol_print_date($bon->datec,'day').' |
';
print '| '.$langs->trans("Amount").' | '.price($bon->amount).' |
';
print '| '.$langs->trans("File").' | ';
@@ -77,8 +77,8 @@ if ($prev_id)
$muser->fetch($bon->user_trans);
print ' |
| '.$langs->trans("TransData").' | ';
- print dol_print_date($bon->date_trans,'dayhour');
- print ' / '.$muser->getFullName($langs).' |
';
+ print dol_print_date($bon->date_trans,'day');
+ print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'';
print '| '.$langs->trans("TransMetod").' | ';
print $bon->methodes_trans[$bon->method_trans];
print ' |
';
@@ -86,11 +86,10 @@ if ($prev_id)
if($bon->date_credit <> 0)
{
print '| '.$langs->trans('CreditDate').' | ';
- print dol_print_date($bon->date_credit,'dayhour');
+ print dol_print_date($bon->date_credit,'day');
print ' |
';
}
-
print '
';
print '';
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index 2fec434d714..069a952d8a6 100644
--- a/htdocs/compta/prelevement/fiche.php
+++ b/htdocs/compta/prelevement/fiche.php
@@ -136,7 +136,7 @@ if ($_GET["id"])
print '';
print '| '.$langs->trans("Ref").' | '.$bon->getNomUrl(1).' |
';
- print '| '.$langs->trans("Date").' | '.dol_print_date($bon->datec,'dayhour').' |
';
+ print '| '.$langs->trans("Date").' | '.dol_print_date($bon->datec,'day').' |
';
print '| '.$langs->trans("Amount").' | '.price($bon->amount).' |
';
print '| '.$langs->trans("File").' | ';
@@ -157,8 +157,8 @@ if ($_GET["id"])
$muser->fetch($bon->user_trans);
print ' |
| '.$langs->trans("TransData").' | ';
- print dol_print_date($bon->date_trans,'dayhour');
- print ' / '.$muser->getFullName($langs).' |
';
+ print dol_print_date($bon->date_trans,'day');
+ print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'';
print '| '.$langs->trans("TransMetod").' | ';
print $bon->methodes_trans[$bon->method_trans];
print ' |
';
@@ -166,7 +166,7 @@ if ($_GET["id"])
if($bon->date_credit <> 0)
{
print '| '.$langs->trans('CreditDate').' | ';
- print dol_print_date($bon->date_credit,'dayhour');
+ print dol_print_date($bon->date_credit,'day');
print ' |
';
}
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 25933ad1368..c5a503c2bc6 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -110,8 +110,11 @@ if ($_GET["id"])
print ''.$lipre->bon_ref.'';
print '| '.$langs->trans("Amount").' | '.price($lipre->amount).' |
';
print '| '.$langs->trans("Status").' | ';
- print ' ';
- print $langs->trans($lipre->statuts[$lipre->statut]).' |
';
+
+ print $lipre->LibStatut($lipre->statut,1).'';
+
+ /*print '
';
+ print $langs->trans($lipre->statuts[$lipre->statut]).'';*/
if ($lipre->statut == 3)
{
@@ -191,7 +194,7 @@ if ($_GET["id"])
foreach($rej->motifs as $key => $value)
{
- print '';
+ print '';
}
print '';
print '';
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index a02a8ac307d..49ca0fdfbca 100644
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@@ -57,9 +57,8 @@ if ($_GET["id"])
print '';
- //print '| '.$langs->trans("Ref").' | '.$bon->getNomUrl(1).' |
';
print '| '.$langs->trans("Ref").' | '.$bon->getNomUrl(1).' |
';
- print '| '.$langs->trans("Date").' | '.dol_print_date($bon->datec,'dayhour').' |
';
+ print '| '.$langs->trans("Date").' | '.dol_print_date($bon->datec,'day').' |
';
print '| '.$langs->trans("Amount").' | '.price($bon->amount).' |
';
print '| '.$langs->trans("File").' | ';
@@ -80,8 +79,8 @@ if ($_GET["id"])
$muser->fetch($bon->user_trans);
print ' |
| '.$langs->trans("TransData").' | ';
- print dol_print_date($bon->date_trans,'dayhour');
- print ' / '.$muser->getFullName($langs).' |
';
+ print dol_print_date($bon->date_trans,'day');
+ print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'';
print '| '.$langs->trans("TransMetod").' | ';
print $bon->methodes_trans[$bon->method_trans];
print ' |
';
@@ -89,11 +88,10 @@ if ($_GET["id"])
if($bon->date_credit <> 0)
{
print '| '.$langs->trans('CreditDate').' | ';
- print dol_print_date($bon->date_credit,'dayhour');
+ print dol_print_date($bon->date_credit,'day');
print ' |
';
}
-
print '
';
print '';