diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 54150556791..46e83975498 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -308,10 +308,12 @@ if ($action == 'edit' || $action == 'updateedit')
print '
';
@@ -531,7 +533,7 @@ if ($action == 'edit' || $action == 'updateedit')
// Object of the company
$var=!$var;
print ' | ';
- print ' |
';
+ print '';
print '';
print '';
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index e6043167b22..5ba06842c30 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -89,8 +89,7 @@ if ($_POST["action"] == 'add')
$account->proprio = trim($_POST["proprio"]);
$account->owner_address = trim($_POST["owner_address"]);
- if (GETPOST('account_number') <= 0) { $accountancy_code_number = ''; } else { $accountancy_code_number = GETPOST('account_number'); }
- $account->account_number = $accountancy_code_number;
+ $account->account_number = GETPOST('account_number');
$account->accountancy_journal = trim($_POST["accountancy_journal"]);
$account->solde = $_POST["solde"];
@@ -172,8 +171,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"])
$account->proprio = trim($_POST["proprio"]);
$account->owner_address = trim($_POST["owner_address"]);
- if (GETPOST('account_number') <= 0) { $accountancy_code_number = ''; } else { $accountancy_code_number = GETPOST('account_number'); }
- $account->account_number = $accountancy_code_number;
+ $account->account_number = GETPOST('account_number');
$account->accountancy_journal = trim($_POST["accountancy_journal"]);
$account->currency_code = trim($_POST["account_currency_code"]);
@@ -287,7 +285,7 @@ if ($action == 'create')
// Ref
print '| '.$langs->trans("Ref").' | ';
- print 'ref).'" maxlength="12"> |
';
+ print 'ref).'" maxlength="12"> | ';
// Label
print '| '.$langs->trans("LabelBankCashAccount").' | ';
@@ -393,10 +391,10 @@ if ($action == 'create')
print '
';
print '| '.$langs->trans("BalanceMinimalAllowed").' | ';
- print 'min_allowed).'"> |
';
+ print 'min_allowed).'"> | ';
print '| '.$langs->trans("BalanceMinimalDesired").' | ';
- print 'min_desired).'"> |
';
+ print 'min_desired).'"> | ';
print '';
print '
';
@@ -407,7 +405,7 @@ if ($action == 'create')
// If bank account
print '| '.$langs->trans("BankName").' | ';
- print ' | ';
+ print ' | ';
print '
';
// Show fields of bank account
@@ -431,7 +429,7 @@ if ($action == 'create')
}
print ''.$langs->trans($val).' | ';
- print ' | ';
+ print ' | ';
print '';
}
$ibankey = FormBank::getIBANLabel($account);
@@ -440,23 +438,23 @@ if ($action == 'create')
// IBAN
print '| '.$langs->trans($ibankey).' | ';
- print ' |
';
+ print ' | ';
print '| '.$langs->trans($bickey).' | ';
- print ' |
';
+ print ' | ';
print '| '.$langs->trans("BankAccountDomiciliation").' | ';
print " |
";
print '| '.$langs->trans("BankAccountOwner").' | ';
- print '';
+ print ' | ';
print ' |
';
print '| '.$langs->trans("BankAccountOwnerAddress").' | ';
print " |
";
print '';
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 34cec22fb54..a5038fc2e78 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -45,16 +45,9 @@ $statut=GETPOST('statut');
* View
*/
-$help_url='EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas';
-llxHeader('',$langs->trans('AccountsArea'),$help_url);
+$title=$langs->trans('BankAccounts');
-$link='';
-if ($statut == '') $link=''.$langs->trans("IncludeClosedAccount").'';
-if ($statut == 'all') $link=''.$langs->trans("OnlyOpenedAccount").'';
-print load_fiche_titre($langs->trans("AccountsArea"),$link, 'title_bank.png');
-
-
-// On charge tableau des comptes financiers (ouverts par defaut)
+// Load array of financial accounts (opened by default)
$accounts = array();
$sql = "SELECT rowid, courant, rappro";
@@ -66,17 +59,30 @@ $sql.= $db->order('label', 'ASC');
$resql = $db->query($sql);
if ($resql)
{
- $num = $db->num_rows($resql);
- $i = 0;
- while ($i < $num)
- {
- $objp = $db->fetch_object($resql);
- $accounts[$objp->rowid] = $objp->courant;
- $i++;
- }
- $db->free($resql);
+ $num = $db->num_rows($resql);
+ $i = 0;
+ while ($i < $num)
+ {
+ $objp = $db->fetch_object($resql);
+ $accounts[$objp->rowid] = $objp->courant;
+ $i++;
+ }
+ $db->free($resql);
}
+$nbtotalofrecords = $num;
+
+
+$help_url='EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas';
+llxHeader('',$title,$help_url);
+
+$link='';
+if ($statut == '') $link=''.$langs->trans("IncludeClosedAccount").'';
+if ($statut == 'all') $link=''.$langs->trans("OnlyOpenedAccount").'';
+
+print_barre_liste($title,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$link,$num,$nbtotalofrecords,'title_bank.png',0,'','',$limit, 1);
+
+
/*
* Comptes courants (courant = 1)
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 3e02aa67131..e812d9919fd 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1058,6 +1058,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$newmenu->add("/compta/bank/index.php?leftmenu=bank&mainmenu=bank",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire, '', $mainmenu, 'bank');
$newmenu->add("/compta/bank/card.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer);
+ $newmenu->add("/compta/bank/index.php?leftmenu=bank&mainmenu=bank",$langs->trans("List"),1,$user->rights->banque->lire, '', $mainmenu, 'bank');
$newmenu->add("/compta/bank/search.php",$langs->trans("ListTransactions"),1,$user->rights->banque->lire);
$newmenu->add("/compta/bank/budget.php",$langs->trans("ListTransactionsByCategory"),1,$user->rights->banque->lire);