From c17fa6e0fd44dbe501bdd8ceb8c50f4420fb9b2e Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Thu, 7 May 2026 16:46:49 +0000
Subject: [PATCH] Bug 41879: Disallow moves to invalid pickup locations for
 next available holds

Signed-off-by: Eric Phetteplace <phette23@gmail.com>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 Koha/Hold.pm                                  | 20 +++++++++++++++++--
 .../prog/en/modules/reserve/request.tt        |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Koha/Hold.pm b/Koha/Hold.pm
index 9a06833193..cad3cfb385 100644
--- a/Koha/Hold.pm
+++ b/Koha/Hold.pm
@@ -214,6 +214,7 @@ sub move_hold {
         $new_itemnumber   = $item->itemnumber;
         $new_biblionumber = $item->biblionumber;
 
+        # need to make sure the item is being moved to a valid pickup location
         my $branchitemrule = C4::Circulation::GetBranchItemRule(
             Koha::Policy::Holds->holds_control_library( $item, $patron ),
             $item->effective_itemtype
@@ -228,13 +229,28 @@ sub move_hold {
     } elsif ( $args->{new_biblionumber} ) {
         $new_biblionumber = $args->{new_biblionumber};
 
+        # for record level holds we must check to make sure there is at least 1 item on the record that can fulfill the new hold
+        my @items             = Koha::Items->search( { biblionumber => $new_biblionumber } )->as_list;
+        my $valid_pickup_item = 0;
+        foreach my $candidate_item (@items) {
+            my $branchitemrule = C4::Circulation::GetBranchItemRule(
+                Koha::Policy::Holds->holds_control_library( $candidate_item, $patron ),
+                $candidate_item->effective_itemtype
+            );
+            my $policy = $branchitemrule->{hold_fulfillment_policy};
+            next
+                if ( $policy eq 'homebranch' || $policy eq 'holdingbranch' )
+                && $self->branchcode ne $candidate_item->$policy;
+            $valid_pickup_item = 1;
+            last;
+        }
+        return { success => 0, error => 'invalidPickupBranch' } unless $valid_pickup_item;
+
         $canReserve = C4::Reserves::CanBookBeReserved(
             $patron->borrowernumber, $new_biblionumber, $self->branchcode,
             { ignore_hold_counts => 1 }
         );
 
-        # for record level holds we must check to make sure there is an item on the record that can fufill the new hold
-
     } else {
         return { success => 0, error => 'Missing itemnumber or biblionumber' };
     }
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 8d65a9123c..187080a02e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -226,7 +226,7 @@
                         [% CASE 'damaged' %]
                             <span>Target item is damaged</span>
                         [% CASE 'invalidPickupBranch' %]
-                            <span>Target item is an invalid pickup location</span>
+                            <span>Target item/record is an invalid pickup location</span>
                         [% CASE %]
                             <span>Error: [% fail.error | html %]</span>
                         [% END %]