From 368b34c5c2f074f221b001964c9baffbf1dc3006 Mon Sep 17 00:00:00 2001
From: fuhraih <55843623+fuhraih@users.noreply.github.com>
Date: Tue, 8 Oct 2019 15:34:35 +0200
Subject: [PATCH 1/3] FIX #11835

FIX #11835 edit Bank Statements in second Page and so on not working
---
 htdocs/compta/bank/releve.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index cca8f6ea9ef..51609acfa7b 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -263,7 +263,8 @@ if (empty($numref))
 
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], "&account=".$object->id, $sortfield, $sortorder, '', $numrows, $totalnboflines, '');
 
-		print '<form name="aaa" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		if ($page==0)	print '<form name="aaa" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		else			print '<form name="aaa" action="'.$_SERVER["PHP_SELF"].'?page='.$page.'" method="POST">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="confirm_editbankreceipt">';
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
@@ -335,7 +336,7 @@ if (empty($numref))
 
 				print '<td class="center">';
 				if ($user->rights->banque->consolidate && $action != 'editbankreceipt') {
-					print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$object->id.'&action=editbankreceipt&brref='.$objp->numr.'">'.img_edit().'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$object->id.'&page='.$page.'&action=editbankreceipt&brref='.$objp->numr.'">'.img_edit().'</a>';
 				}
 				print '</td>';
 

From d6bf0fa483d107f64e0891aa38197feec5a4f29c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Oct 2019 15:47:47 +0200
Subject: [PATCH 2/3] Update releve.php

---
 htdocs/compta/bank/releve.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 51609acfa7b..02ba62097c2 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -263,12 +263,12 @@ if (empty($numref))
 
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], "&account=".$object->id, $sortfield, $sortorder, '', $numrows, $totalnboflines, '');
 
-		if ($page==0)	print '<form name="aaa" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		else			print '<form name="aaa" action="'.$_SERVER["PHP_SELF"].'?page='.$page.'" method="POST">';
+		print '<form name="aaa" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="confirm_editbankreceipt">';
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 		print '<input type="hidden" name="account" value="'.$object->id.'">';
+		print '<input type="hidden" name="page" value="'.$page.'">';
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';

From 5970ea5b7976952da52108eb63306eb74bd7da31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 8 Oct 2019 15:48:29 +0200
Subject: [PATCH 3/3] Update releve.php

---
 htdocs/compta/bank/releve.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 02ba62097c2..ae01b761b1b 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -336,7 +336,7 @@ if (empty($numref))
 
 				print '<td class="center">';
 				if ($user->rights->banque->consolidate && $action != 'editbankreceipt') {
-					print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$object->id.'&page='.$page.'&action=editbankreceipt&brref='.$objp->numr.'">'.img_edit().'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$object->id.($page > 0 ? '&page='.$page : '').'&action=editbankreceipt&brref='.$objp->numr.'">'.img_edit().'</a>';
 				}
 				print '</td>';