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 653b065..f5a9be7 100755 (executable)
--- a/C4/HoldsQueue.pm
+++ b/C4/HoldsQueue.pm
@@ -29,7 +29,6 @@ use C4::Branch;
 use C4::Circulation;
 use C4::Members;
 use C4::Biblio;
-use C4::Dates qw/format_date/;
 
 use List::Util qw(shuffle);
 use List::MoreUtils qw(any);
@@ -447,7 +446,7 @@ sub MapItemsToHoldRequests {
                 }
             }
             else {
-                warn "No transport costs for $pickup_branch";
+                next;
             }
         }
 
@@ -458,6 +457,8 @@ sub MapItemsToHoldRequests {
             } else {
                 $pull_branches = [keys %items_by_branch];
             }
+
+            # Try picking items where the home and pickup branch match first
             PULL_BRANCHES:
             foreach my $branch (@$pull_branches) {
                 my $holding_branch_items = $items_by_branch{$branch}
@@ -474,6 +475,7 @@ sub MapItemsToHoldRequests {
                 }
             }
 
+            # Now try items from the least cost branch based on the transport cost matrix or StaticHoldsQueueWeight
             unless ( $itemnumber ) {
                 foreach my $current_item ( @{ $items_by_branch{$holdingbranch} } ) {
                     if ( $holdingbranch && ( $current_item->{holdallowed} == 2 || $request->{borrowerbranch} eq $current_item->{homebranch} ) ) {
@@ -482,6 +484,23 @@ sub MapItemsToHoldRequests {
                     }
                 }
             }
+
+            # Now try for items for any item that can fill this hold
+            unless ( $itemnumber ) {
+                PULL_BRANCHES2:
+                foreach my $branch (@$pull_branches) {
+                    my $holding_branch_items = $items_by_branch{$branch}
+                      or next;
+
+                    foreach my $item (@$holding_branch_items) {
+                        next if ( $item->{holdallowed} == 1 && $item->{homebranch} ne $request->{borrowerbranch} );
+
+                        $itemnumber = $item->{itemnumber};
+                        $holdingbranch = $branch;
+                        last PULL_BRANCHES2;
+                    }
+                }
+            }
         }
 
         if ($itemnumber) {
@@ -599,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