diff --git a/htdocs/compta/bank/bilan.php3 b/htdocs/compta/bank/bilan.php3 index 375963ad985..55b3ec05c6b 100644 --- a/htdocs/compta/bank/bilan.php3 +++ b/htdocs/compta/bank/bilan.php3 @@ -1,8 +1,5 @@ - * - * $Id$ - * $Source$ +/* Copyright (C) 2001-2003 Rodolphe Quiedeville * * 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 @@ -18,6 +15,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * $Id$ + * $Source$ + * */ require("./pre.inc.php3"); @@ -42,29 +42,26 @@ function valeur($sql) print_titre("Bilan"); print ""; -print ""; -print ""; -print "\n"; $var=!$var; $sql = "SELECT sum(amount) FROM llx_paiement"; $paiem = valeur($sql); -print ""; +print ""; $var=!$var; $sql = "SELECT sum(amount) FROM llx_bank WHERE amount > 0"; $credits = valeur($sql); -print ""; +print ""; $var=!$var; $sql = "SELECT sum(amount) FROM llx_bank WHERE amount < 0"; $debits = valeur($sql); -print ""; +print ""; $var=!$var; $sql = "SELECT sum(amount) FROM llx_bank "; $solde = valeur($sql); -print ""; +print ""; print "
DescriptionMontantfrancs
Somme des paiements".price($paiem)."".francs($paiem)."
Somme des paiements".price($paiem)."
Somme des credits".price($credits)."".francs($credits)."
Somme des credits".price($credits)."
Somme des debits".price($debits)."".francs($debits)."
Somme des debits".price($debits)."
Solde compte".price($solde)."".francs($solde)."
Solde compte".price($solde)."
"; diff --git a/htdocs/compta/bank/budget.php3 b/htdocs/compta/bank/budget.php3 index 00fc31fd9a8..0c44bf1af4d 100644 --- a/htdocs/compta/bank/budget.php3 +++ b/htdocs/compta/bank/budget.php3 @@ -124,15 +124,12 @@ else print "rowid\">$objp->label"; print "".price(abs($objp->amount)).""; - print "".francs(abs($objp->amount)).""; - print ""; $i++; $total = $total + $objp->amount; } $db->free(); print "Total".price(abs($total))."euros"; - print "soit".francs(abs($total))."francs\n"; } else { diff --git a/htdocs/compta/stats/exercices.php b/htdocs/compta/stats/exercices.php index 34c4b93a1af..8baa55fd9a4 100644 --- a/htdocs/compta/stats/exercices.php +++ b/htdocs/compta/stats/exercices.php @@ -84,7 +84,7 @@ function propals ($db, $year, $month) { } print "Total : ".price($subtotal)."\n"; print "Euros HT\n"; - print "Total ~ ".francs($total) ." FF HT"; + print ""; print "Total : ".price($total).""; print "Euros HT"; print ""; @@ -142,8 +142,7 @@ function factures ($db, $year, $month, $paye) { $i++; } - print "Total ~ ".francs($total)." FF HT"; - print "Total : ".price($total).""; + print "Total : ".price($total).""; print ""; $db->free(); }