diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index bed5376064f..db3dc3a0aae 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -55,7 +55,7 @@ $langs->load("bank");
$langs->load('bills');
$langs->load("accountancy");
-$id_accountancy_journal = GETPOST('id_account');
+$id_accountancy_journal = GETPOST('id_account','int');
$date_startmonth = GETPOST('date_startmonth');
$date_startday = GETPOST('date_startday');
@@ -66,17 +66,12 @@ $date_endyear = GETPOST('date_endyear');
$action = GETPOST('action');
// Security check
-if ($user->societe_id > 0)
+if ($user->societe_id > 0 && empty($id_accountancy_journal))
accessforbidden();
/*
* View
*/
-if (empty($id_accountancy_journal))
-{
- accessforbidden();
-}
-
$year_current = strftime("%Y", dol_now());
$pastmonth = strftime("%m", dol_now()) - 1;
$pastmonthyear = $year_current;
@@ -431,7 +426,7 @@ if ($action == 'export_csv') {
dol_print_error($this->db);
return -1;
}
- //$journal = $conf->global->ACCOUNTING_BANK_JOURNAL;
+ $journal = $conf->global->ACCOUNTING_BANK_JOURNAL;
header('Content-Type: text/csv');
header('Content-Disposition: attachment;filename=journal_banque.csv');
@@ -559,14 +554,15 @@ if ($action == 'export_csv') {
} else {
$form = new Form($db);
- llxHeader('', $langs->trans("BankJournal"));
+ llxHeader('', $langs->trans("FinanceJournal"));
- $namereport = $langs->trans("BankJournal");
- $namereport.= " " . $journal;
- $description = $langs->trans("DescBankJournal");
+ $nom = $langs->trans("FinanceJournal");
+ $builddate = time();
+ $description = $langs->trans("DescFinanceJournal") . '
';
$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
-
- // Report
+ //report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '');
+
+ // Report header
$h=0;
$head[$h][0] = $_SERVER["PHP_SELF"].'?id_account='.$id_accountancy_journal;
$head[$h][1] = $langs->trans("Report");
@@ -575,33 +571,37 @@ if ($action == 'export_csv') {
dol_fiche_head($head, 'report');
print '