From 1697c8adcf942ca5a9fdf69fc41fd16814648d86 Mon Sep 17 00:00:00 2001 From: Thibaud Guillot Date: Mon, 5 Feb 2024 12:59:06 +0100 Subject: [PATCH] Bug 35573: Revert "Bug 30687: Allow pickup location to be forced when override is allowed" This reverts commit ab93008da7eb61b697e4586c679b88c2eebaacd0. Signed-off-by: David Nind Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer (cherry picked from commit 33da81f9feb145e357647d456ae3bad0644f6963) Signed-off-by: Fridolin Somers (cherry picked from commit aa149ff575e43c2662d21268d7119906a3e2a938) Signed-off-by: Lucas Gass --- .../prog/en/modules/reserve/request.tt | 4 +- reserve/request.pl | 52 ++++++++++++------- 2 files changed, 35 insertions(+), 21 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index f45868f7fd..67f854104d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -789,7 +789,7 @@ [% END # /IF force_hold_level %] - [% IF (itemloo.pickup_locations_count > 0) || itemloo.override %] + [% IF (itemloo.pickup_locations_count > 0) %]