From c42fe1672f7b5af5cb41076d4174cc5c63c31f93 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Oct 2005 14:34:51 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Affichage=20TVA=20r=E9cup=E9r=E9e=20en?= =?UTF-8?q?=20mode=20recettes-d=E9penses=20incorrect=20sur=20=E9tat=20par?= =?UTF-8?q?=20soci=E9t=E9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/resultat/clientfourn.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index e48bc48e258..3435c54ef90 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /** @@ -293,6 +292,7 @@ if ($modecompta == 'CREANCES-DETTES') if ($modecompta == 'CREANCES-DETTES') print "".price($amount)."\n"; print "".price($amount)."\n"; print "\n"; + // TVA à récupérer $amount=0; $sql = "SELECT sum(f.total_tva) as amount, date_format(f.datef,'%Y-%m') as dm"; @@ -361,6 +361,7 @@ else $i++; } } + $db->free($result); } else { dolibarr_print_error($db); } @@ -369,6 +370,7 @@ else if ($modecompta == 'CREANCES-DETTES') print "".price($amount)."\n"; print "".price($amount)."\n"; print "\n"; + // TVA récupérée $amount=0; $sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm"; @@ -397,13 +399,14 @@ else $i++; } } + $db->free($result); } else { dolibarr_print_error($db); } print " "; print "".$langs->trans("VATCollected")."\n"; - if ($modecompta == 'CREANCES-DETTES') print "".price($obj->amount)."\n"; - print "".price($obj->amount)."\n"; + if ($modecompta == 'CREANCES-DETTES') print "".price($amount)."\n"; + print "".price($amount)."\n"; print "\n"; } print '';