From dbf1c685d4671ff8d05f11a4506d7672aee7380e Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 8 Jan 2011 08:18:29 +0000
Subject: [PATCH] Withdrawals: Visual enhancements
---
htdocs/compta/prelevement/factures.php | 10 +++++-----
htdocs/compta/prelevement/fiche-rejet.php | 8 ++++----
htdocs/compta/prelevement/fiche-stat.php | 9 ++++-----
htdocs/compta/prelevement/fiche.php | 8 ++++----
htdocs/compta/prelevement/ligne.php | 9 ++++++---
htdocs/compta/prelevement/lignes.php | 10 ++++------
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index f10c66363b4..37a5649cd4d 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -51,7 +51,7 @@ if ($_GET["id"])
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
- print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'dayhour').'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
@@ -72,8 +72,8 @@ if ($_GET["id"])
$muser->fetch($bon->user_trans);
print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
- print dol_print_date($bon->date_trans,'dayhour');
- print ' / '.$muser->getFullName($langs).'</td></tr>';
+ print dol_print_date($bon->date_trans,'day');
+ print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
print $bon->methodes_trans[$bon->method_trans];
print '</td></tr>';
@@ -81,10 +81,10 @@ if ($_GET["id"])
if($bon->date_credit <> 0)
{
print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
- print dol_print_date($bon->date_credit,'dayhour');
+ print dol_print_date($bon->date_credit,'day');
print '</td></tr>';
}
-
+
print '</table>';
print '</div>';
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 7a720c2b2aa..510e42ffdab 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -54,7 +54,7 @@ if ($_GET["id"])
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
- print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'dayhour').'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
@@ -75,8 +75,8 @@ if ($_GET["id"])
$muser->fetch($bon->user_trans);
print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
- print dol_print_date($bon->date_trans,'dayhour');
- print ' / '.$muser->getFullName($langs).'</td></tr>';
+ print dol_print_date($bon->date_trans,'day');
+ print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
print $bon->methodes_trans[$bon->method_trans];
print '</td></tr>';
@@ -84,7 +84,7 @@ if ($_GET["id"])
if($bon->date_credit <> 0)
{
print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
- print dol_print_date($bon->date_credit,'dayhour');
+ print dol_print_date($bon->date_credit,'day');
print '</td></tr>';
}
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 95244694886..f85a11ddef6 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -56,7 +56,7 @@ if ($prev_id)
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
- print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'dayhour').'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
@@ -77,8 +77,8 @@ if ($prev_id)
$muser->fetch($bon->user_trans);
print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
- print dol_print_date($bon->date_trans,'dayhour');
- print ' / '.$muser->getFullName($langs).'</td></tr>';
+ print dol_print_date($bon->date_trans,'day');
+ print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
print $bon->methodes_trans[$bon->method_trans];
print '</td></tr>';
@@ -86,11 +86,10 @@ if ($prev_id)
if($bon->date_credit <> 0)
{
print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
- print dol_print_date($bon->date_credit,'dayhour');
+ print dol_print_date($bon->date_credit,'day');
print '</td></tr>';
}
-
print '</table>';
print '</div>';
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 '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
- print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'dayhour').'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
@@ -157,8 +157,8 @@ if ($_GET["id"])
$muser->fetch($bon->user_trans);
print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
- print dol_print_date($bon->date_trans,'dayhour');
- print ' / '.$muser->getFullName($langs).'</td></tr>';
+ print dol_print_date($bon->date_trans,'day');
+ print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
print $bon->methodes_trans[$bon->method_trans];
print '</td></tr>';
@@ -166,7 +166,7 @@ if ($_GET["id"])
if($bon->date_credit <> 0)
{
print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
- print dol_print_date($bon->date_credit,'dayhour');
+ print dol_print_date($bon->date_credit,'day');
print '</td></tr>';
}
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 '<a href="fiche.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>';
print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Status").'</td><td>';
- print '<img src="./img/statut'.$lipre->statut.'.png"> ';
- print $langs->trans($lipre->statuts[$lipre->statut]).'</td></tr>';
+
+ print $lipre->LibStatut($lipre->statut,1).'</td></tr>';
+
+ /*print '<img src="./img/statut'.$lipre->statut.'.png"> ';
+ print $langs->trans($lipre->statuts[$lipre->statut]).'</td></tr>';*/
if ($lipre->statut == 3)
{
@@ -191,7 +194,7 @@ if ($_GET["id"])
foreach($rej->motifs as $key => $value)
{
- print '<option value="'.$key.'">'.$value.'</option>';
+ print '<option value="'.$key.'">'.$value.'</option>';
}
print '</select>';
print '</td>';
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 '<table class="border" width="100%">';
- //print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
- print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'dayhour').'</td></tr>';
+ print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
@@ -80,8 +79,8 @@ if ($_GET["id"])
$muser->fetch($bon->user_trans);
print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
- print dol_print_date($bon->date_trans,'dayhour');
- print ' / '.$muser->getFullName($langs).'</td></tr>';
+ print dol_print_date($bon->date_trans,'day');
+ print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
print $bon->methodes_trans[$bon->method_trans];
print '</td></tr>';
@@ -89,11 +88,10 @@ if ($_GET["id"])
if($bon->date_credit <> 0)
{
print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
- print dol_print_date($bon->date_credit,'dayhour');
+ print dol_print_date($bon->date_credit,'day');
print '</td></tr>';
}
-
print '</table>';
print '</div>';
--
GitLab