From 73cf059a52f2a3b5dd57f6d8eeff3276a06a5ed9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Feb 2011 22:29:09 +0000 Subject: [PATCH] Fix: Do not show stat on reconciliation if there is no account to reconciliate --- htdocs/compta/bank/class/account.class.php | 10 ++++++---- htdocs/index.php | 17 ++++++++++------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 01f00c6bb51..655b59dfcd6 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -796,7 +796,7 @@ class Account extends CommonObject * Load indicators for dashboard (this->nbtodo and this->nbtodolate) * @param user Objet user * @param filteraccountid To get info for a particular account id - * @return int <0 if KO, >0 if OK + * @return int <0 if KO, 0=Nothing to show, >0 if OK */ function load_board($user,$filteraccountid=0) { @@ -809,8 +809,8 @@ class Account extends CommonObject $this->nbtodo=$this->nbtodolate=0; $sql = "SELECT b.rowid, b.datev as datefin"; - $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; - $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; + $sql.= " FROM ".MAIN_DB_PREFIX."bank as b,"; + $sql.= " ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.rappro=0"; $sql.= " AND b.fk_account = ba.rowid"; $sql.= " AND ba.entity = ".$conf->entity; @@ -821,12 +821,14 @@ class Account extends CommonObject $resql=$this->db->query($sql); if ($resql) { + $num=$this->db->num_rows($resql); while ($obj=$this->db->fetch_object($resql)) { $this->nbtodo++; if ($this->db->jdate($obj->datefin) < ($now - $conf->bank->rappro->warning_delay)) $this->nbtodolate++; + if ($obj->rappro) $foundaccounttoconciliate++; } - return 1; + return $num; } else { diff --git a/htdocs/index.php b/htdocs/index.php index afc32bac3d2..48ed2481243 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -425,13 +425,16 @@ if ($conf->banque->enabled && $user->rights->banque->lire && ! $user->societe_id include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); $board=new Account($db); - $board->load_board($user); - $board->warning_delay=$conf->bank->rappro->warning_delay/60/60/24; - $board->label=$langs->trans("TransactionsToConciliate"); - $board->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&mainmenu=bank'; - $board->img=img_object($langs->trans("TransactionsToConciliate"),"payment"); - $rowspan++; - $dashboardlines[]=$board; + $found=$board->load_board($user); + if ($found > 0) + { + $board->warning_delay=$conf->bank->rappro->warning_delay/60/60/24; + $board->label=$langs->trans("TransactionsToConciliate"); + $board->url=DOL_URL_ROOT.'/compta/bank/index.php?leftmenu=bank&mainmenu=bank'; + $board->img=img_object($langs->trans("TransactionsToConciliate"),"payment"); + $rowspan++; + $dashboardlines[]=$board; + } } // Number of cheque to send