Add, modify and view patron information
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index 170abbc27b..1a5e055fa4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -58,7 +58,11 @@
|
Clear all
[% IF CAN_user_tools_manage_patron_lists %]
-
+ [% END %]
+ [% IF CAN_user_borrowers_merge_borrowers %]
+
+
+
[% END %]
[% IF CAN_user_tools_manage_patron_lists %]
diff --git a/members/merge-patrons.pl b/members/merge-patrons.pl
index 5318ff6ff5..2c95b4c63d 100755
--- a/members/merge-patrons.pl
+++ b/members/merge-patrons.pl
@@ -30,10 +30,10 @@ my $cgi = CGI->new;
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
{
- template_name => "members/merge-patrons.tt",
- query => $cgi,
- type => "intranet",
- flagsrequired => { borrowers => 'edit_borrowers' },
+ template_name => "members/merge-patrons.tt",
+ query => $cgi,
+ type => "intranet",
+ flagsrequired => { borrowers => 'merge_borrowers' },
}
);
diff --git a/t/Koha/Auth/Permissions.t b/t/Koha/Auth/Permissions.t
index 5fd840770a..80f55afe53 100755
--- a/t/Koha/Auth/Permissions.t
+++ b/t/Koha/Auth/Permissions.t
@@ -123,6 +123,7 @@ subtest 'superlibrarian tests' => sub {
'CAN_user_acquisition_vendors_manage' => 1,
'CAN_user_acquisition' => 1,
'CAN_user_borrowers_delete_borrowers' => 1,
+ 'CAN_user_borrowers_merge_borrowers' => 1,
'CAN_user_borrowers_edit_borrowers' => 1,
'CAN_user_borrowers_view_borrower_infos_from_any_libraries' => 1,
'CAN_user_borrowers' => 1,