From 861f8a3a55316232432683975dd6da1e265f7ed3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 4 Nov 2007 21:35:24 +0000 Subject: [PATCH] =?UTF-8?q?Ajout=20info=20nb=20=E9critures=20=E0=20rapproc?= =?UTF-8?q?her=20sur=20page=20synth=E8se=20des=20comptes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/compta/bank/account.class.php | 8 +++++--- htdocs/compta/bank/index.php | 15 +++++++++++---- htdocs/langs/en_US/main.lang | 2 ++ htdocs/langs/fr_FR/main.lang | 2 ++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/htdocs/compta/bank/account.class.php b/htdocs/compta/bank/account.class.php index 163f346493a..f70c4f07f5d 100644 --- a/htdocs/compta/bank/account.class.php +++ b/htdocs/compta/bank/account.class.php @@ -670,10 +670,11 @@ class Account /** * \brief Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord - * \param user Objet user - * \return int <0 si ko, >0 si ok + * \param user Objet user + * \param filteraccountid To get info for a particular account id + * \return int <0 si ko, >0 si ok */ - function load_board($user) + function load_board($user,$filteraccountid=0) { global $conf; @@ -684,6 +685,7 @@ class Account $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"; // Compte rapprochable + if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid; $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index a44e9ed368a..1765c5b8cd9 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004-2007 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -85,7 +84,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print "\n"; @@ -106,7 +105,15 @@ foreach ($accounts as $key=>$type) print ''; print ''; print ''; - print ''; + print ''; print ''; print '
'.$langs->trans("CurrentAccounts").''.$langs->trans("Bank").''.$langs->trans("AccountIdShort").''.$langs->trans("Conciliable").''.$langs->trans("TransactionsToConciliate").''.$langs->trans("Status").''.$langs->trans("BankBalance").'
'.$acc->getNomUrl(1).''.$acc->bank.''.$acc->number.''.yn($acc->rappro).''; + if ($acc->rappro) + { + $result=$acc->load_board($user,$acc->id); + print $acc->nbtodo; + if ($acc->nbtodolate) print ' ('.$acc->nbtodolate.img_warning($langs->trans("Late")).')'; + } + else print $langs->trans("FeatureDisabled"); + print ''.$acc->getLibStatut(2).''; print ''.price($solde).''; diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 582be224974..7364000af0e 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -389,6 +389,8 @@ Refresh=Refresh BackToList=Back to list CanBeModifiedIfOk=Can be modified if valid CanBeModifiedIfKo=Can be modified if not valid +NotManaged=Not managed +FeatureDisabled=Feature disabled # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index ae919c7a935..a91d62e48a8 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -390,6 +390,8 @@ Refresh=Rafraichir BackToList=Retour liste CanBeModifiedIfOk=Peut être modifié si valide CanBeModifiedIfKo=Peut être modifié si invalide +NotManaged=Non géré +FeatureDisabled=Fonction désactivée # Week day Monday=Lundi Tuesday=Mardi