@@ -, +, @@
---
circ/pendingreserves.pl | 21 ++++++++++++-------
.../prog/en/modules/circ/pendingreserves.tt | 10 +++++++--
2 files changed, 22 insertions(+), 9 deletions(-)
--- a/circ/pendingreserves.pl
+++ a/circ/pendingreserves.pl
@@ -302,14 +302,21 @@ foreach my $bibnum ( @biblionumbers ){
push @holds_info, $hold_info;
}
+my $cancel_notify_templates = Koha::Notice::Templates->search({ module => 'reserves', code => 'HOLD_CANCELLATION' });
+my $cancel_notice_branches;
+while ( my $notice = $cancel_notify_templates->next ) {
+ $cancel_notice_branches->{$notice->branchcode} = 1;
+}
+
$template->param(
- todaysdate => $today,
- from => $startdate,
- to => $enddate,
- holds_info => \@holds_info,
- HoldsToPullStartDate => C4::Context->preference('HoldsToPullStartDate') || PULL_INTERVAL,
- HoldsToPullEndDate => C4::Context->preference('ConfirmFutureHolds') || 0,
- messages => \@messages,
+ cancel_notice_branches => $cancel_notice_branches,
+ todaysdate => $today,
+ from => $startdate,
+ to => $enddate,
+ holds_info => \@holds_info,
+ HoldsToPullStartDate => C4::Context->preference('HoldsToPullStartDate') || PULL_INTERVAL,
+ messages => \@messages,
+ HoldsToPullEndDate => C4::Context->preference('ConfirmFutureHolds') || 0,
);
output_html_with_http_headers $input, $cookie, $template->output;
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -199,8 +199,14 @@
[% END %]
-
-
+ [% IF cancel_notice_branches.size %]
+ [% SET bc = hold.patron.branchcode %]
+ [% SET all_bc = "" %]
+ [% IF cancel_notice_branches.$bc || cancel_notice_branches.$all_bc %]
+
+
+ [% END %]
+ [% END %]
[% END %]
--