diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 0a7bd785875..1dd7acb68d9 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * Copytight (C) 2004 Christophe Combelles * * This program is free software; you can redistribute it and/or modify @@ -23,7 +23,8 @@ * */ -/** \file htdocs/compta/bank/account.php +/** + \file htdocs/compta/bank/account.php \ingroup banque \brief Page de détail des transactions bancaires \version $Revision$ @@ -202,7 +203,7 @@ if ($account > 0) */ print ''; - print ''.$langs->trans("Date").'Valeur'.$langs->trans("Type").''.$langs->trans("Description").''; + print ''.$langs->trans("Date").''.$langs->trans("Value").''.$langs->trans("Type").''.$langs->trans("Description").''; print ''.$langs->trans("Debit").''.$langs->trans("Credit").'Solde'; print ''.$langs->trans("AccountStatement").''; @@ -211,7 +212,7 @@ if ($account > 0) print ''; print ''; print ' '; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 85cafff553e..f67d36e44fa 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,13 @@ * $Source$ */ +/** + \file htdocs/compta/bank/search.php + \ingroup banque + \brief Page de recherche de transactions bancaires + \version $Revision$ +*/ + require("./pre.inc.php"); require("./bank.lib.php"); @@ -40,13 +47,13 @@ if ($vline) { print_titre("Recherche écriture bancaire"); print '
'; -print ''; +print '
'; print ""; print ''; -print ""; -print ""; +print ''; +print ''; print ""; -print ""; +print ''; print "\n"; ?> @@ -54,13 +61,13 @@ print "\n"; \n"; @@ -145,31 +152,33 @@ if ($result) $var=!$var; print ""; - print "\n"; + print "\n"; print "\n"; + print "\n"; } else { - print "\n"; + print "\n"; } - print "\n"; + print "\n"; - print "\n"; + print "\n"; print ""; $i++; } $db->free(); -} else { - print $db->error() .'
' . $sql .'
'; +} +else +{ + dolibarr_print_error($db); } print "
Date'.$langs->trans("Description").'DebitCredit'.$langs->trans("Debit").''.$langs->trans("Credit").'".$langs->trans("Type")."Compte'.$langs->trans("Account").'
  -> +> -> +> -> +>
-"> +">
".strftime("%d %b %y",$objp->do)."".strftime("%d %b %y",$objp->do)."rowid&account=$objp->fk_account\">$objp->label "; if ($objp->amount < 0) { - print "".price($objp->amount * -1)." ".price($objp->amount * -1)."  ".price($objp->amount)." ".price($objp->amount)."".$objp->fk_type."".$objp->fk_type."".$objp->labelaccount."".$objp->labelaccount."
"; @@ -182,5 +191,5 @@ if ($_POST["submit"] && ! $num) { $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index fa03f822908..47ba5b3913d 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ * */ -/*! +/** \file htdocs/compta/bank/virement.php \ingroup banque \brief Page de saisie d'un virement @@ -101,7 +101,7 @@ print ''; print ''.$langs->trans("From").''.$langs->trans("To").''.$langs->trans("Date").''.$langs->trans("Description").''.$langs->trans("Amount").''; print ''; print ""; -print ""; $sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_account"; $result = $db->query($sql); if ($result) @@ -119,7 +119,7 @@ if ($result) } print "\n"; -print ""; $sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_account"; $result = $db->query($sql); if ($result) @@ -140,16 +140,16 @@ print "\n"; print ""; $html->select_date(); print "\n"; -print ''; -print ''; +print ''; +print ''; print ""; -print '

'; +print '

'; print ""; $db->close(); -llxFooter(" - Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?>