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

Ajout option pour switcher vue afin de voir les comptes ferms.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-13 17:55:18 +00:00
parent e3e7fe7c41
commit 3c56248342
5 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,10 +22,10 @@
*/
/**
\file htdocs/compta/bank/index.php
\ingroup banque
\brief Page accueil banque
\version $Revision$
\file htdocs/compta/bank/index.php
\ingroup banque
\brief Page accueil banque
\version $Revision$
*/
@ -43,19 +43,27 @@ $user->getrights('banque');
if (!$user->rights->banque->lire)
accessforbidden();
$statut=isset($_GET["statut"])?$_GET["statut"]:'';
llxHeader();
print_titre($langs->trans("AccountsArea"));
$link='';
if ($statut == '') $link='<a href="'.$_SERVER["PHP_SELF"].'?statut=all">'.$langs->trans("IncludeClosedAccount").'</a>';
if ($statut == 'all') $link='<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("OnlyOpenedAccount").'</a>';
print_fiche_titre($langs->trans("AccountsArea"),$link);
print '<br>';
// On charge tableau des comptes financiers ouverts
// On n'affiche pas les comptes clos
// On charge tableau des comptes financiers (ouverts par defaut)
$accounts = array();
$sql = "SELECT rowid, courant";
$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
$sql .= " WHERE clos = 0";
if ($statut != 'all') {
$sql .= " WHERE clos = 0";
}
$sql .= " ORDER BY label";
$resql = $db->query($sql);
@ -78,8 +86,8 @@ if ($resql)
*/
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="30%">'.$langs->trans("CurrentAccounts").'</td>';
print '<td width="30%">'.$langs->trans("Bank").'</td>';
print '<td width="20%" align="left">'.$langs->trans("Numero").'</td><td align="right" width="120">'.$langs->trans("BankBalance").'</td><td align="center" width="80">'.$langs->trans("Closed").'</td>';
print '<td width="20%">'.$langs->trans("Bank").'</td>';
print '<td align="left">'.$langs->trans("Numero").'</td><td align="right" width="120">'.$langs->trans("BankBalance").'</td><td align="center" width="70">'.$langs->trans("Closed").'</td>';
print "</tr>\n";
$total = 0;
@ -96,8 +104,8 @@ foreach ($accounts as $key=>$type)
print '<tr '.$bc[$var].'><td width="30%">';
print '<a href="account.php?account='.$acc->id.'">'.$acc->label.'</a>';
print '</td><td width="30%">'.$acc->bank."</td><td>$acc->number</td>";
print '<td align="right">'.price($solde).'</td><td align="center">'.$yn[$acc->clos].'</td></tr>';
print '</td><td>'.$acc->bank."</td><td>$acc->number</td>";
print '<td align="right">'.price($solde).'</td><td align="center">'.yn($acc->clos).'</td></tr>';
$total += $solde;
}
@ -114,8 +122,8 @@ print '<tr><td colspan="5">&nbsp;</td></tr>';
* Comptes placements
*/
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="30%">'.$langs->trans("SavingAccounts").'</td><td width="30%">'.$langs->trans("Bank").'</td>';
print '<td width="20%" align="left">'.$langs->trans("Numero").'</td><td align="right" width="120">'.$langs->trans("BankBalance").'</td><td align="center" width="80">'.$langs->trans("Closed").'</td>';
print '<tr class="liste_titre"><td width="30%">'.$langs->trans("SavingAccounts").'</td><td width="20%">'.$langs->trans("Bank").'</td>';
print '<td align="left">'.$langs->trans("Numero").'</td><td align="right" width="120">'.$langs->trans("BankBalance").'</td><td align="center" width="70">'.$langs->trans("Closed").'</td>';
print "</tr>\n";
$total = 0;
@ -133,7 +141,7 @@ foreach ($accounts as $key=>$type)
print "<tr ".$bc[$var]."><td>";
print '<a href="account.php?account='.$acc->id.'">'.$acc->label.'</a>';
print "</td><td>$acc->bank</td><td>$acc->number</td>";
print '<td align="right">'.price($solde).'</td><td align="center">'.$yn[$acc->clos].'</td></tr>';
print '<td align="right">'.price($solde).'</td><td align="center">'.yn($acc->clos).'</td></tr>';
$total += $solde;
}
@ -150,8 +158,8 @@ print '<tr><td colspan="5">&nbsp;</td></tr>';
* Comptes caisse/liquide
*/
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("CashAccounts").'</td><td>&nbsp;</td>';
print '<td align="left">&nbsp;</td><td align="right" width="120">'.$langs->trans("BankBalance").'</td><td align="center" width="80">'.$langs->trans("Closed").'</td>';
print '<tr class="liste_titre"><td width="30%">'.$langs->trans("CashAccounts").'</td><td width="20%">&nbsp;</td>';
print '<td align="left">&nbsp;</td><td align="right" width="120">'.$langs->trans("BankBalance").'</td><td align="center" width="70">'.$langs->trans("Closed").'</td>';
print "</tr>\n";
$total = 0;
@ -169,7 +177,7 @@ foreach ($accounts as $key=>$type)
print "<tr ".$bc[$var]."><td>";
print '<a href="account.php?account='.$acc->id.'">'.$acc->label.'</a>';
print "</td><td>$acc->bank</td><td>&nbsp;</td>";
print '<td align="right">'.price($solde).'</td><td align="center">'.$yn[$acc->clos].'</td></tr>';
print '<td align="right">'.price($solde).'</td><td align="center">'.yn($acc->clos).'</td></tr>';
$total += $solde;
}

8
htdocs/langs/en_US/admin.lang
View File

@ -47,7 +47,7 @@ Module1Desc=Companies and contacts' management
Module2Name=Commercial
Module2Desc=Commercial management
Module10Name=Accountancy
Module10Desc=Accountancy management
Module10Desc=Simple accountancy management
Module20Name=Proposals
Module20Desc=Commercial proposals' management
Module22Name=Emailings
@ -88,6 +88,8 @@ Module85Name=Banks and cash
Module85Desc=Management of bank or cash accounts
Module86Name=OSCommerce
Module86Desc=Add interface with OSCommerce
Module130Name=Accountancy expert
Module130Desc=Accountancy management for experts
Module200Name=LDAP
Module200Desc=LDAP annuary synchronisation
Module210Name=PostNuke
@ -332,4 +334,6 @@ DonationsSetup=Donation module setup
##### Barcode #####
BarcodeSetup=Barcode setup
PaperFormatModule=Print' format module
BarcodeEncodeModule=Barcode' encodage type
BarcodeEncodeModule=Barcode' encodage type
##### Prelevements #####
WithdrawalsSetup=Withdrawal setup

4
htdocs/langs/en_US/banks.lang
View File

@ -60,4 +60,6 @@ ByCategories=By categories
SearchTransaction=Search transaction
TransactionsToConciliate=Transactions to conciliate
Rappro=Conciliate
Conciliate=Conciliate
Conciliate=Conciliate
IncludeClosedAccount=Include closed accounts
OnlyOpenedAccount=Only opened accounts

6
htdocs/langs/fr_FR/admin.lang
View File

@ -47,7 +47,7 @@ Module1Desc=Gestion des soci
Module2Name=Commercial
Module2Desc=Gestion commerciale
Module10Name=Comptabilité
Module10Desc=Gestion de la comptabilité et trésorerie
Module10Desc=Gestion simple de la comptabilité et trésorerie
Module20Name=Propositions commerciales
Module20Desc=Gestion des devis/propositions commerciales
Module22Name=Mailings
@ -88,6 +88,8 @@ Module85Name=Banques et caisses
Module85Desc=Gestion des comptes financiers de type Comptes bancaires, postaux ou Caisses liquides
Module86Name=OSCommerce
Module86Desc=Interface avec OSCommerce
Module130Name=Comptabilité expert
Module130Desc=Gestion expert de la comptabilité (doubles parties)
Module200Name=LDAP
Module200Desc=Synchronisation avec un annuaire LDAP
Module210Name=PostNuke
@ -334,3 +336,5 @@ BarcodeSetup=Configuration des codes barres
PaperFormatModule=Modules de format d'impression
BarcodeEncodeModule=Types d'encodages des codes barres
BarcodeEncodeModule=Modules d'encodage des codes barres
##### Prelevements #####
WithdrawalsSetup=Configuration du module prélèvement

4
htdocs/langs/fr_FR/banks.lang
View File

@ -60,4 +60,6 @@ ByCategories=Par cat
SearchTransaction=Recherche écriture
TransactionsToConciliate=Ecritures à rapprocher
Rappro=Rapprocher
Conciliate=Rapprocher
Conciliate=Rapprocher
IncludeClosedAccount=Inclure comptes fermés
OnlyOpenedAccount=Uniquement comptes ouverts