diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 0cc0490f540..617b3af95c6 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -212,7 +212,8 @@ if (empty($reshook)) } // Conciliation -if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && $user->rights->banque->consolidate) +if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && $user->rights->banque->consolidate + && (GETPOST('pageplusone') == GETPOST('pageplusoneold'))) { $error = 0; @@ -277,11 +278,11 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier) { $error = 0; - if (price2num($_POST["addcredit"]) > 0) + if (price2num(GETPOST("addcredit")) > 0) { - $amount = price2num($_POST["addcredit"]); + $amount = price2num(GETPOST("addcredit")); } else { - $amount = - price2num($_POST["adddebit"]); + $amount = - price2num(GETPOST("adddebit")); } $operation = GETPOST("operation", 'alpha'); @@ -785,11 +786,12 @@ if ($resql) } } - $morehtml = '
'; + /*$morehtml = '
'; $morehtml .= ' "; // ' Page '; $morehtml .= ''; $morehtml .= '/'.$nbtotalofpages.' '; $morehtml .= '
'; + */ if ($action != 'addline' && $action != 'reconcile') { @@ -801,7 +803,7 @@ if ($resql) $picto = 'bank_account'; if ($id > 0 || !empty($ref)) $picto = ''; - print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit); + print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit, 0, 0, 1); // We can add page now to param if ($page != '') $param .= '&page='.urlencode($page); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 512d88ad9fa..552ed8c4f4f 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4376,6 +4376,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', // Right print ''; + print ''; if ($sortfield) $options .= "&sortfield=".urlencode($sortfield); if ($sortorder) $options .= "&sortorder=".urlencode($sortorder); // Show navigation bar