From d8a09e992a009dbd42e5f50ea24c2fd1bbf03bfa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 17 Sep 2005 13:57:39 +0000
Subject: [PATCH] =?UTF-8?q?N'inclue=20que=20les=20comptes=20rapprochables?=
 =?UTF-8?q?=20dans=20le=20comptage=20des=20=E9critures=20=E0=20rapprocher?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/bank/account.class.php |  5 +++--
 htdocs/compta/bank/account.php       | 25 +++++++++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/bank/account.class.php b/htdocs/compta/bank/account.class.php
index 883d1341469..f743357d00e 100644
--- a/htdocs/compta/bank/account.class.php
+++ b/htdocs/compta/bank/account.class.php
@@ -496,8 +496,9 @@ class Account
 
         $this->nbtodo=$this->nbtodolate=0;
         $sql = "SELECT b.rowid,".$this->db->pdate("b.datev")." as datefin";
-        $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
-        $sql.= " WHERE b.rappro=0";
+        $sql.= " FROM ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba";
+        $sql.= " WHERE b.rappro=0 AND b.fk_account = ba.rowid";
+        $sql.= " AND ba.rappro = 1";
         $resql=$this->db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 7d00d347e8e..bc74f79b0f2 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -307,7 +307,14 @@ if ($account > 0)
     $result = $db->query($sql);
     if ($result)
     {
-        _print_lines($db, $result, $sql, $acct);
+        $total = _print_lines($db, $result, $sql, $acct);
+        if ($page == 0) 
+        {
+            print '<tr class="liste_total"><td align="right" colspan="6">'.$langs->trans("Balance").'</td>';
+            print '<td align="right" nowrap>'.price($total).'</td>';
+            print '<td>&nbsp;</td>';
+            print '</tr>';
+        }
         $db->free($result);
     }
  
@@ -348,13 +355,21 @@ $db->close();
 llxFooter('$Date$ - $Revision$');
 
 
-/*
- *
+/**
+ *      \brief      Affiche ligne ecriture
+ *      \param      db          Handler d'accès base
+ *      \param      result      Resultset du select
+ *      \param      sql         Requete sql
+ *      \param      acct        Compte
+ *      \return     Renvoi total solde
  */
 function _print_lines($db,$result,$sql,$acct)
 {
     global $bc, $nbline, $viewline, $user, $page;
-    $var=True;
+    
+    $var=true;
+    $total=0;
+    
     $num = $db->num_rows($result);
     $i = 0; $total = 0; $sep = 0;
     
@@ -381,6 +396,7 @@ function _print_lines($db,$result,$sql,$acct)
             print "<td nowrap>&nbsp;".dolibarr_print_date($objp->dv,"%d/%m/%y")."</td>\n";
             print "<td nowrap>&nbsp;".$objp->fk_type." ".($objp->num_chq?$objp->num_chq:"")."</td>\n";
             print "<td><a href=\"ligne.php?rowid=$objp->rowid&amp;account=$acct->id\">$objp->label</a>";
+
             /*
              * Ajout les liens
              */
@@ -451,5 +467,6 @@ function _print_lines($db,$result,$sql,$acct)
         $i++;
     }
 
+    return $total;
 }
 ?>