Bug 15530 - Editing a course item via a disabled course disables it even if it is...

[koha-ffzg.git] / C4 / HoldsQueue.pm

diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm
index bae6f82..f5a9be7 100755 (executable)
--- a/C4/HoldsQueue.pm
+++ b/C4/HoldsQueue.pm
@@ -446,7 +446,7 @@ sub MapItemsToHoldRequests {
                 }
             }
             else {
-                warn "No transport costs for $pickup_branch";
+                next;
             }
         }
 
@@ -492,7 +492,6 @@ sub MapItemsToHoldRequests {
                     my $holding_branch_items = $items_by_branch{$branch}
                       or next;
 
-                    $holdingbranch ||= $branch;
                     foreach my $item (@$holding_branch_items) {
                         next if ( $item->{holdallowed} == 1 && $item->{homebranch} ne $request->{borrowerbranch} );
 
@@ -619,7 +618,7 @@ sub least_cost_branch {
 
     # Nothing really spectacular: supply to branch, a list of potential from branches
     # and find the minimum from - to value from the transport_cost_matrix
-    return $from->[0] if @$from == 1;
+    return $from->[0] if ( @$from == 1 && $transport_cost_matrix->{$to}{$from->[0]}->{disable_transfer} != 1 );
 
     # If the pickup library is in the list of libraries to pull from,
     # return that library right away, it is obviously the least costly