From 98d0f42f6649e65391d269caef164f73263febc0 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 5 Jan 2021 08:10:33 +0100 Subject: [PATCH] Bug 27332: Use the branchcode from the subscription when renewing Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit 6aa9f78258444a5db6ba9997491865f13ff96404) Signed-off-by: Fridolin Somers (cherry picked from commit c1558803c7f359389d8e3ac2a339607cbf1906ba) Signed-off-by: Andrew Fuerste-Henry --- .../prog/en/modules/serials/subscription-renew.tt | 5 ++--- serials/subscription-renew.pl | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt index 13222ad04f..614a21afc4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt @@ -1,3 +1,4 @@ +[% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] [% IF subscription %] @@ -64,9 +65,7 @@ [% END %] [% IF CAN_user_serials_superserials %] - [% FOREACH library IN libraries %] - - [% END %] + [% PROCESS options_for_libraries libraries => Branches.all(selected => subscription.branchcode) %] [% END %] (select a library) diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl index 4589f97da4..bc639e7490 100755 --- a/serials/subscription-renew.pl +++ b/serials/subscription-renew.pl @@ -129,11 +129,8 @@ if ( $op eq "renew" ) { ); } -my $libraries = Koha::Libraries->search( {}, { order_by => ['branchcode'] }, ); - $template->param( op => $op, - libraries => $libraries, ); output_html_with_http_headers $query, $cookie, $template->output; -- 2.39.5