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 ''.$langs->trans("Balance").''; + print ''.price($total).''; + print ' '; + print ''; + } $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 " ".dolibarr_print_date($objp->dv,"%d/%m/%y")."\n"; print " ".$objp->fk_type." ".($objp->num_chq?$objp->num_chq:"")."\n"; print "rowid&account=$acct->id\">$objp->label"; + /* * Ajout les liens */ @@ -451,5 +467,6 @@ function _print_lines($db,$result,$sql,$acct) $i++; } + return $total; } ?>