From f30e13d62617e961e98c925d98ccfc796e5d166e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 26 Jan 2004 22:42:35 +0000
Subject: [PATCH] =?UTF-8?q?Les=20factures=20brouillons=20et=20non=20valid?=
 =?UTF-8?q?=E9es=20ne=20sont=20pas=20incluses=20dans=20le=20r=E9sultat.=20?=
 =?UTF-8?q?Le=20lien=20societe=20est=20clicable=20dans=20les=20factures=20?=
 =?UTF-8?q?clients=20comme=20dans=20les=20factures=20fournisseurs.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/resultat/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 0700801d61c..7dcf61f0cd0 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -40,8 +40,8 @@ print '<td width="10%">&nbsp;</td><TD>El
 print "<TD align=\"right\">Montant</td>";
 print "</tr>\n";
 
-$sql = "SELECT s.nom,sum(f.amount) as amount";
-$sql .= " FROM llx_societe as s,llx_facture as f WHERE f.fk_soc = s.idp"; 
+$sql = "SELECT s.nom,s.idp,sum(f.amount) as amount";
+$sql .= " FROM llx_societe as s,llx_facture as f WHERE f.fk_soc = s.idp AND f.fk_statut = 1 AND f.fk_user_valid is not NULL"; 
 
 $sql .= " GROUP BY s.nom ASC";
 
@@ -60,7 +60,7 @@ if ($result) {
       $var=!$var;
             
       print "<TR $bc[$var]><td>&nbsp</td>";
-      print "<td>Factures <a href=\"../facture.php?facid=$objp->facid\">$objp->facnumber</a> $objp->nom</TD>\n";
+      print "<td>Factures  <a href=\"../facture.php?socidp=$objp->idp\">$objp->nom</TD>\n";
       
       print "<TD align=\"right\">".price($objp->amount)."</TD>\n";