diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 2b599b1e60d..edd0f35c442 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -666,10 +666,10 @@ if ($resql)
print '
'.$langs->trans("Numero").' | ';
//if (! $search_account > 0)
//{
- print ''.$langs->trans("BankAccount").' | ';
+ print ''.$langs->trans("BankAccount").' | ';
//}
- print ''.$langs->trans("Debit").' | ';
- print ''.$langs->trans("Credit").' | ';
+ print ''.$langs->trans("Debit").' | ';
+ print ''.$langs->trans("Credit").' | ';
/*if (! empty($conf->accounting->enabled))
{
print '';
@@ -700,7 +700,7 @@ if ($resql)
print ' | ';
//if (! $search_account > 0)
//{
- print '';
+ print ' | ';
$form->select_comptes(GETPOST('add_account', 'int')?GETPOST('add_account', 'int'):$search_account, 'add_account', 0, '', 1, ($id > 0 || ! empty($ref)?' disabled="disabled"':''));
print ' | ';
//}
@@ -955,11 +955,11 @@ if ($resql)
if (! empty($arrayfields['type']['checked'])) print_liste_field_titre($arrayfields['type']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="center"', $sortfield, $sortorder);
if (! empty($arrayfields['b.num_chq']['checked'])) print_liste_field_titre($arrayfields['b.num_chq']['label'], $_SERVER['PHP_SELF'], 'b.num_chq', '', $param, 'align="center"', $sortfield, $sortorder);
if (! empty($arrayfields['bu.label']['checked'])) print_liste_field_titre($arrayfields['bu.label']['label'], $_SERVER['PHP_SELF'], 'bu.label', '', $param, '', $sortfield, $sortorder);
- if (! empty($arrayfields['ba.ref']['checked'])) print_liste_field_titre($arrayfields['ba.ref']['label'], $_SERVER['PHP_SELF'], 'ba.ref', '', $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['b.debit']['checked'])) print_liste_field_titre($arrayfields['b.debit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['b.credit']['checked'])) print_liste_field_titre($arrayfields['b.credit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['balancebefore']['checked'])) print_liste_field_titre($arrayfields['balancebefore']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
- if (! empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
+ if (! empty($arrayfields['ba.ref']['checked'])) print_liste_field_titre($arrayfields['ba.ref']['label'], $_SERVER['PHP_SELF'], 'ba.ref', '', $param, 'class="right"', $sortfield, $sortorder);
+ if (! empty($arrayfields['b.debit']['checked'])) print_liste_field_titre($arrayfields['b.debit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, 'class="right"', $sortfield, $sortorder);
+ if (! empty($arrayfields['b.credit']['checked'])) print_liste_field_titre($arrayfields['b.credit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, 'class="right"', $sortfield, $sortorder);
+ if (! empty($arrayfields['balancebefore']['checked'])) print_liste_field_titre($arrayfields['balancebefore']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+ if (! empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
if (! empty($arrayfields['b.num_releve']['checked'])) print_liste_field_titre($arrayfields['b.num_releve']['label'], $_SERVER['PHP_SELF'], 'b.num_releve', '', $param, 'align="center"', $sortfield, $sortorder);
if (! empty($arrayfields['b.conciliated']['checked'])) print_liste_field_titre($arrayfields['b.conciliated']['label'], $_SERVER['PHP_SELF'], 'b.rappro', '', $param, 'align="center"', $sortfield, $sortorder);
// Extra fields
@@ -968,7 +968,7 @@ if ($resql)
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'align="right"', $sortfield, $sortorder, 'maxwidthsearch ');
+ print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'class="right"', $sortfield, $sortorder, 'maxwidthsearch ');
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
print "\n";
@@ -1355,7 +1355,7 @@ if ($resql)
// Debit
if (! empty($arrayfields['b.debit']['checked']))
{
- print '';
+ print ' | ';
if ($objp->amount < 0)
{
print price($objp->amount * -1);
@@ -1396,7 +1396,7 @@ if ($resql)
}
else
{
- print ' | - | ';
+ print '- | ';
}
if (! $i) $totalarray['nbfield']++;
}
@@ -1411,12 +1411,12 @@ if ($resql)
}
else
{
- print ' '.price($balance).' | ';
+ print ' '.price($balance).' | ';
}
}
else
{
- print '- | ';
+ print '- | ';
}
if (! $i) $totalarray['nbfield']++;
}
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 0333bfa52ed..6aac94532df 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -394,7 +394,7 @@ print $hookmanager->resPrint;
if (! empty($arrayfields['b.datec']['checked'])) print_liste_field_titre($arrayfields['b.datec']['label'], $_SERVER["PHP_SELF"], "b.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
if (! empty($arrayfields['b.tms']['checked'])) print_liste_field_titre($arrayfields['b.tms']['label'], $_SERVER["PHP_SELF"], "b.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
if (! empty($arrayfields['b.clos']['checked'])) print_liste_field_titre($arrayfields['b.clos']['label'], $_SERVER["PHP_SELF"], 'b.clos', '', $param, 'align="center"', $sortfield, $sortorder);
-if (! empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'align="right"', $sortfield, $sortorder);
+if (! empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
print "\n";
@@ -550,7 +550,7 @@ foreach ($accounts as $key=>$type)
// Balance
if (! empty($arrayfields['balance']['checked']))
{
- print '';
+ print ' | ';
print ''.price($solde, 0, $langs, 0, -1, -1, $obj->currency_code).'';
print ' | ';
if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 140df3be2fd..6c6a8447c5a 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -766,15 +766,15 @@ else
if ($objp->amount < 0)
{
$totald = $totald + abs($objp->amount);
- print ''.price($objp->amount * -1)." | | \n";
+ print ''.price($objp->amount * -1)." | | \n";
}
else
{
$totalc = $totalc + abs($objp->amount);
- print ' | '.price($objp->amount)." | \n";
+ print ' | '.price($objp->amount)." | \n";
}
- print ''.price(price2num($total, 'MT'))." | \n";
+ print ''.price(price2num($total, 'MT'))." | \n";
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{
@@ -793,7 +793,7 @@ else
}
// Line Total
- print "\n".'| '.$langs->trans("Total")." : | ".price($totald)." | ".price($totalc)." | | |
";
+ print "\n".'| '.$langs->trans("Total")." : | ".price($totald)." | ".price($totalc)." | | |
";
// Line Balance
print "\n";