Include calculated 0-prox locations in the stalling interval for op capture

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Conflicts:
	Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index f3bc1e5..4d7b1ee 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@ -548,7 +548,7 @@ sub nearest_hold {
                                ON ( csp.id = ausp.standing_penalty AND csp.block_list LIKE '%CAPTURE%' )
             $addl_join
                  WHERE hm.target_copy = ?
-                       AND (AGE(NOW(),h.request_time) >= CAST(? AS INTERVAL) OR p.prox = 0)
+                       AND (AGE(NOW(),h.request_time) >= CAST(? AS INTERVAL) OR hm.proximiity = 0 OR p.prox = 0)
                        AND h.capture_time IS NULL
                        AND h.cancel_time IS NULL
                        AND (h.expire_time IS NULL OR h.expire_time > NOW())