diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index e9d782ae09c..2bf9aab80f7 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -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=''.$langs->trans("IncludeClosedAccount").''; +if ($statut == 'all') $link=''.$langs->trans("OnlyOpenedAccount").''; +print_fiche_titre($langs->trans("AccountsArea"),$link); print '
'; -// 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 ''; print ''; -print ''; -print ''; +print ''; +print ''; print "\n"; $total = 0; @@ -96,8 +104,8 @@ foreach ($accounts as $key=>$type) print '"; - print ''; + print '"; + print ''; $total += $solde; } @@ -114,8 +122,8 @@ print ''; * Comptes placements */ print '
'.$langs->trans("CurrentAccounts").''.$langs->trans("Bank").''.$langs->trans("Numero").''.$langs->trans("BankBalance").''.$langs->trans("Closed").''.$langs->trans("Bank").''.$langs->trans("Numero").''.$langs->trans("BankBalance").''.$langs->trans("Closed").'
'; print ''.$acc->label.''; - print ''.$acc->bank."$acc->number'.price($solde).''.$yn[$acc->clos].'
'.$acc->bank."$acc->number'.price($solde).''.yn($acc->clos).'
 
'; -print ''; -print ''; +print ''; +print ''; print "\n"; $total = 0; @@ -133,7 +141,7 @@ foreach ($accounts as $key=>$type) print ""; - print ''; + print ''; $total += $solde; } @@ -150,8 +158,8 @@ print ''; * Comptes caisse/liquide */ print '
'.$langs->trans("SavingAccounts").''.$langs->trans("Bank").''.$langs->trans("Numero").''.$langs->trans("BankBalance").''.$langs->trans("Closed").'
'.$langs->trans("SavingAccounts").''.$langs->trans("Bank").''.$langs->trans("Numero").''.$langs->trans("BankBalance").''.$langs->trans("Closed").'
"; print ''.$acc->label.''; print "$acc->bank$acc->number'.price($solde).''.$yn[$acc->clos].'
'.price($solde).''.yn($acc->clos).'
 
'; -print ''; -print ''; +print ''; +print ''; print "\n"; $total = 0; @@ -169,7 +177,7 @@ foreach ($accounts as $key=>$type) print ""; - print ''; + print ''; $total += $solde; } diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index ac6dd906765..0b31771072e 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -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 \ No newline at end of file +BarcodeEncodeModule=Barcode' encodage type +##### Prelevements ##### +WithdrawalsSetup=Withdrawal setup \ No newline at end of file diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index a704ca5fee5..4fda3dc3376 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -60,4 +60,6 @@ ByCategories=By categories SearchTransaction=Search transaction TransactionsToConciliate=Transactions to conciliate Rappro=Conciliate -Conciliate=Conciliate \ No newline at end of file +Conciliate=Conciliate +IncludeClosedAccount=Include closed accounts +OnlyOpenedAccount=Only opened accounts \ No newline at end of file diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 187ca695430..a8c193881d1 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -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 diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang index feb3d269245..ad9f71ced68 100644 --- a/htdocs/langs/fr_FR/banks.lang +++ b/htdocs/langs/fr_FR/banks.lang @@ -60,4 +60,6 @@ ByCategories=Par cat SearchTransaction=Recherche écriture TransactionsToConciliate=Ecritures à rapprocher Rappro=Rapprocher -Conciliate=Rapprocher \ No newline at end of file +Conciliate=Rapprocher +IncludeClosedAccount=Inclure comptes fermés +OnlyOpenedAccount=Uniquement comptes ouverts \ No newline at end of file
'.$langs->trans("CashAccounts").'  '.$langs->trans("BankBalance").''.$langs->trans("Closed").'
'.$langs->trans("CashAccounts").'  '.$langs->trans("BankBalance").''.$langs->trans("Closed").'
"; print ''.$acc->label.''; print "$acc->bank '.price($solde).''.$yn[$acc->clos].'
'.price($solde).''.yn($acc->clos).'