lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ajout info nb critures rapprocher sur page synthse des comptes

Browse Source
This commit is contained in:
Laurent Destailleur 2007-11-04 21:35:24 +00:00
parent 15f6585fe9
commit 861f8a3a55
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/bank/account.class.php
View File

@ -670,10 +670,11 @@ class Account
/** /**
* \brief Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord * \brief Charge indicateurs this->nbtodo et this->nbtodolate de tableau de bord
* \param user Objet user * \param user Objet user
* \return int <0 si ko, >0 si ok * \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; global $conf;
@ -684,6 +685,7 @@ class Account
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba"; $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.= " WHERE b.rappro=0 AND b.fk_account = ba.rowid";
$sql.= " AND ba.rappro = 1"; // Compte rapprochable $sql.= " AND ba.rappro = 1"; // Compte rapprochable
if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid;
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {

15
htdocs/compta/bank/index.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -85,7 +84,7 @@ print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="30%">'.$langs->trans("CurrentAccounts").'</td>'; print '<tr class="liste_titre"><td width="30%">'.$langs->trans("CurrentAccounts").'</td>';
print '<td width="20%">'.$langs->trans("Bank").'</td>'; print '<td width="20%">'.$langs->trans("Bank").'</td>';
print '<td align="left">'.$langs->trans("AccountIdShort").'</td>'; print '<td align="left">'.$langs->trans("AccountIdShort").'</td>';
print '<td align="center" width="100">'.$langs->trans("Conciliable").'</td>'; print '<td align="center">'.$langs->trans("TransactionsToConciliate").'</td>';
print '<td align="center" width="70">'.$langs->trans("Status").'</td>'; print '<td align="center" width="70">'.$langs->trans("Status").'</td>';
print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>'; print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>';
print "</tr>\n"; print "</tr>\n";
@ -106,7 +105,15 @@ foreach ($accounts as $key=>$type)
print '<td width="30%">'.$acc->getNomUrl(1).'</td>'; print '<td width="30%">'.$acc->getNomUrl(1).'</td>';
print '<td>'.$acc->bank.'</td>'; print '<td>'.$acc->bank.'</td>';
print '<td>'.$acc->number.'</td>'; print '<td>'.$acc->number.'</td>';
print '<td align="center">'.yn($acc->rappro).'</td>'; print '<td align="center">';
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 '</td>';
print '<td align="center">'.$acc->getLibStatut(2).'</td>'; print '<td align="center">'.$acc->getLibStatut(2).'</td>';
print '<td align="right">'; print '<td align="right">';
print '<a href="account.php?account='.$acc->id.'">'.price($solde).'</a>'; print '<a href="account.php?account='.$acc->id.'">'.price($solde).'</a>';

2
htdocs/langs/en_US/main.lang
View File

@ -389,6 +389,8 @@ Refresh=Refresh
BackToList=Back to list BackToList=Back to list
CanBeModifiedIfOk=Can be modified if valid CanBeModifiedIfOk=Can be modified if valid
CanBeModifiedIfKo=Can be modified if not valid CanBeModifiedIfKo=Can be modified if not valid
NotManaged=Not managed
FeatureDisabled=Feature disabled
# Week day # Week day
Monday=Monday Monday=Monday
Tuesday=Tuesday Tuesday=Tuesday

2
htdocs/langs/fr_FR/main.lang
View File

@ -390,6 +390,8 @@ Refresh=Rafraichir
BackToList=Retour liste BackToList=Retour liste
CanBeModifiedIfOk=Peut être modifié si valide CanBeModifiedIfOk=Peut être modifié si valide
CanBeModifiedIfKo=Peut être modifié si invalide CanBeModifiedIfKo=Peut être modifié si invalide
NotManaged=Non géré
FeatureDisabled=Fonction désactivée
# Week day # Week day
Monday=Lundi Monday=Lundi
Tuesday=Mardi Tuesday=Mardi