From 39762da92f45856fa4e46764494b64b045e30010 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 21 Aug 2019 13:39:14 +0000 Subject: [PATCH] Bug 23484: Update pendingreserves.pl to use circulation_rules Signed-off-by: Fridolin Somers Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize (cherry picked from commit c21a9cf0b0b8fc03629837c8651c10781ddfe3c7) Signed-off-by: Fridolin Somers --- circ/pendingreserves.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index 4fdfdacbd1..0b9744fa22 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -210,7 +210,7 @@ my $strsth = LEFT JOIN branchtransfers ON items.itemnumber=branchtransfers.itemnumber LEFT JOIN issues ON items.itemnumber=issues.itemnumber LEFT JOIN borrowers ON reserves.borrowernumber=borrowers.borrowernumber - LEFT JOIN default_branch_item_rules ON items.itype=default_branch_item_rules.itemtype + LEFT JOIN circulation_rules ON items.itype=circulation_rules.itemtype AND rule_name = 'holdallowed' AND circulation_rules.branchcode IS NULL AND circulation_rules.categorycode IS NULL WHERE reserves.found IS NULL $sqldatewhere @@ -221,7 +221,7 @@ my $strsth = AND reserves.priority <> 0 AND reserves.suspend = 0 AND notforloan = 0 AND itemlost = 0 AND withdrawn = 0 - AND ( default_branch_item_rules.holdallowed IS NULL OR default_branch_item_rules.holdallowed != 0 ) + AND ( circulation_rules.rule_value IS NULL OR circulation_rules.rule_value != 0 ) "; # GROUP BY reserves.biblionumber allows only items that are not checked out, else multiples occur when # multiple patrons have a hold on an item -- 2.39.5