[Koha-patches] [PATCH] [SIGNED-OFF] Bug 2394: Use syspref canreservefromotherbranches in CanItemBeReserved

[Srdjan]

From: Julian Maurice <julian.maurice at biblibre.com>

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Reserves.pm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 5ff12e4..182af1a 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -491,11 +491,22 @@ sub CanItemBeReserved{
     }
     
     # we check if it's ok or not
-    if( $reservecount < $allowedreserves ){
-        return 1;
-    }else{
+    if( $reservecount >= $allowedreserves ){
         return 0;
     }
+
+    # If reservecount is ok, we check item branch if IndependentBranches is ON
+    # and canreservefromotherbranches is OFF
+    if ( C4::Context->preference('IndependentBranches')
+        and !C4::Context->preference('canreservefromotherbranches') )
+    {
+        my $itembranch = $item->{homebranch};
+        if ($itembranch ne $borrower->{branchcode}) {
+            return 0;
+        }
+    }
+
+    return 1;
 }
 #--------------------------------------------------------------------------------
 =head2 GetReserveCount
-- 
1.8.1.2