From srdjan at catalyst.net.nz  Wed Dec  3 03:59:03 2014
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed,  3 Dec 2014 15:59:03 +1300
Subject: [Koha-patches] [PATCH] bug_5786, bug_5787: Holds rewrite
Message-ID: <1417575543-7265-1-git-send-email-srdjan@catalyst.net.nz>

bug_5786: moved AllowOnShelfHolds to issuingrules
bug_5787: moved OPACItemHolds to issuingrules

C4::Reserves:
* Added OnShelfHoldsAllowed() to check issuingrules
* Added OPACItemHoldsAllowed() to check issuingrules
* IsAvailableForItemLevelRequest() changed interface, now takes
  $item_record,$borrower_record; calls OnShelfHoldsAllowed()

opac/opac-reserve.pl and opac/opac-search.pl:
* rewrote hold allowed rule to use OPACItemHoldsAllowed()
* also use OnShelfHoldsAllowed() through
* IsAvailableForItemLevelRequest()

templates:
* Removed AllowOnShelfHolds and OPACItemHolds global flags, they now
  only have meaning per item type

Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>

I have tested this patch left, right and upside down for the last
several months. All tests have passed.
---
 C4/Auth.pm                                         |   1 -
 C4/Circulation.pm                                  |   8 +-
 C4/ILSDI/Services.pm                               |   2 +-
 C4/Items.pm                                        |   2 +
 C4/Reserves.pm                                     | 233 ++++++++++++++-------
 C4/UsageStats.pm                                   |   2 -
 C4/VirtualShelves/Page.pm                          |   4 +-
 admin/smart-rules.pl                               |  18 +-
 .../mysql/it-IT/necessari/system_preferences.sql   |   1 -
 installer/data/mysql/kohastructure.sql             |   2 +
 installer/data/mysql/sysprefs.sql                  |   2 -
 installer/data/mysql/updatedatabase.pl             |  37 +++-
 installer/html-template-to-template-toolkit.pl     |   2 +-
 .../en/modules/admin/preferences/circulation.pref  |   6 -
 .../prog/en/modules/admin/preferences/opac.pref    |   7 -
 .../prog/en/modules/admin/smart-rules.tt           |   6 +
 .../bootstrap/en/includes/opac-detail-sidebar.inc  |   6 +-
 .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt |  48 ++---
 .../bootstrap/en/modules/opac-results-grouped.tt   |  10 +-
 .../opac-tmpl/bootstrap/en/modules/opac-results.tt |   8 +-
 .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt |   2 +-
 opac/opac-ISBDdetail.pl                            |  27 +--
 opac/opac-MARCdetail.pl                            |  18 +-
 opac/opac-detail.pl                                |  22 +-
 opac/opac-reserve.pl                               |  41 ++--
 opac/opac-search.pl                                |  19 +-
 reserve/request.pl                                 |  11 +-
 t/db_dependent/Circulation.t                       |   2 +-
 t/db_dependent/Circulation_Issuingrule.t           |   6 +
 t/db_dependent/Reserves.t                          |  24 ++-
 30 files changed, 363 insertions(+), 214 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index b808c66..24cb187 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -454,7 +454,6 @@ sub get_template_and_user {
             OPACAmazonCoverImages     => C4::Context->preference("OPACAmazonCoverImages"),
             OPACFRBRizeEditions       => C4::Context->preference("OPACFRBRizeEditions"),
             OpacHighlightedWords      => C4::Context->preference("OpacHighlightedWords"),
-            OPACItemHolds             => C4::Context->preference("OPACItemHolds"),
             OPACShelfBrowser          => "". C4::Context->preference("OPACShelfBrowser"),
             OPACURLOpenInNewWindow    => "" . C4::Context->preference("OPACURLOpenInNewWindow"),
             OPACUserCSS               => "". C4::Context->preference("OPACUserCSS"),
diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index f24f2f7..e3d714e 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1468,10 +1468,10 @@ Returns a hashref from the issuingrules table.
 sub GetIssuingRule {
     my ( $borrowertype, $itemtype, $branchcode ) = @_;
     my $dbh = C4::Context->dbh;
-    my $sth =  $dbh->prepare( "select * from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null"  );
+    my $sth =  $dbh->prepare( "select * from issuingrules where categorycode=? and itemtype=? and branchcode=?"  );
     my $irule;
 
-	$sth->execute( $borrowertype, $itemtype, $branchcode );
+    $sth->execute( $borrowertype, $itemtype, $branchcode );
     $irule = $sth->fetchrow_hashref;
     return $irule if defined($irule) ;
 
@@ -2697,8 +2697,10 @@ sub CanBookBeRenewed {
         # by pushing all the elements onto an array and removing the duplicates.
         my @reservable;
         foreach my $b (@borrowernumbers) {
+            my ( $borr ) = C4::Members::GetMemberDetails( $b );
             foreach my $i (@itemnumbers) {
-                if (   IsAvailableForItemLevelRequest($i)
+                my $item   = GetItem($i);
+                if (   IsAvailableForItemLevelRequest($item, $borr)
                     && CanItemBeReserved( $b, $i )
                     && !IsItemOnHoldAndFound($i) )
                 {
diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
index e33ef6e..96a4dbb 100644
--- a/C4/ILSDI/Services.pm
+++ b/C4/ILSDI/Services.pm
@@ -491,7 +491,7 @@ sub GetServices {
     my $canbookbereserved = CanBookBeReserved( $borrower, $biblionumber );
     if ($canbookbereserved eq 'OK') {
         push @availablefor, 'title level hold';
-        my $canitembereserved = IsAvailableForItemLevelRequest($itemnumber);
+        my $canitembereserved = IsAvailableForItemLevelRequest($item, $borrower);
         if ($canitembereserved) {
             push @availablefor, 'item level hold';
         }
diff --git a/C4/Items.pm b/C4/Items.pm
index e63ef1b..90fb29e 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -174,6 +174,8 @@ sub GetItem {
         ($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();
     }
 	#if we don't have an items.itype, use biblioitems.itemtype.
+    # FIXME this should respect the itypes systempreference
+    # if (C4::Context->preference('item-level_itypes')) {
 	if( ! $data->{'itype'} ) {
 		my $sth = $dbh->prepare("SELECT itemtype FROM biblioitems  WHERE biblionumber = ?");
 		$sth->execute($data->{'biblionumber'});
diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 5058c51..ba69dee 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -70,13 +70,13 @@ This modules provides somes functions to deal with reservations.
   The complete workflow is :
   ==== 1st use case ====
   patron request a document, 1st available :                      P >0, F=NULL, I=NULL
-  a library having it run "transfertodo", and clic on the list    
+  a library having it run "transfertodo", and clic on the list
          if there is no transfer to do, the reserve waiting
-         patron can pick it up                                    P =0, F=W,    I=filled 
+         patron can pick it up                                    P =0, F=W,    I=filled
          if there is a transfer to do, write in branchtransfer    P =0, F=T,    I=filled
            The pickup library recieve the book, it check in       P =0, F=W,    I=filled
   The patron borrow the book                                      P =0, F=F,    I=filled
-  
+
   ==== 2nd use case ====
   patron requests a document, a given item,
     If pickup is holding branch                                   P =0, F=W,   I=filled
@@ -106,9 +106,9 @@ BEGIN {
         &GetReserveFee
         &GetReserveInfo
         &GetReserveStatus
-        
+
         &GetOtherReserves
-        
+
         &ModReserveFill
         &ModReserveAffect
         &ModReserve
@@ -116,7 +116,7 @@ BEGIN {
         &ModReserveCancelAll
         &ModReserveMinusPriority
         &MoveReserve
-        
+
         &CheckReserves
         &CanBookBeReserved
 	&CanItemBeReserved
@@ -127,7 +127,9 @@ BEGIN {
         &AutoUnsuspendReserves
 
         &IsAvailableForItemLevelRequest
-        
+
+        &OPACItemHoldsAllowed
+
         &AlterPriority
         &ToggleLowestPriority
 
@@ -140,7 +142,7 @@ BEGIN {
         IsItemOnHoldAndFound
     );
     @EXPORT_OK = qw( MergeHolds );
-}    
+}
 
 =head2 AddReserve
 
@@ -351,7 +353,7 @@ sub GetReservesFromBiblionumber {
                 push( @bibitemno, $bibitemnos );    # FIXME: inefficient: use fetchall_arrayref
             }
             my $count = scalar @bibitemno;
-    
+
             # if we have two or more different specific itemtypes
             # reserved by same person on same day
             my $bdata;
@@ -491,7 +493,7 @@ sub CanBookBeReserved{
 
 sub CanItemBeReserved{
     my ($borrowernumber, $itemnumber) = @_;
-    
+
     my $dbh             = C4::Context->dbh;
     my $ruleitemtype; # itemtype of the matching issuing rule
     my $allowedreserves = 0;
@@ -513,18 +515,18 @@ sub CanItemBeReserved{
     my $itemtypefield = C4::Context->preference('item-level_itypes') ? "itype" : "itemtype";
 
     # we retrieve user rights on this itemtype and branchcode
-    my $sth = $dbh->prepare("SELECT categorycode, itemtype, branchcode, reservesallowed 
-                             FROM issuingrules 
-                             WHERE (categorycode in (?,'*') ) 
-                             AND (itemtype IN (?,'*')) 
-                             AND (branchcode IN (?,'*')) 
-                             ORDER BY 
-                               categorycode DESC, 
-                               itemtype     DESC, 
+    my $sth = $dbh->prepare("SELECT categorycode, itemtype, branchcode, reservesallowed
+                             FROM issuingrules
+                             WHERE (categorycode in (?,'*') )
+                             AND (itemtype IN (?,'*'))
+                             AND (branchcode IN (?,'*'))
+                             ORDER BY
+                               categorycode DESC,
+                               itemtype     DESC,
                                branchcode   DESC;"
                            );
-                           
-    my $querycount ="SELECT 
+
+    my $querycount ="SELECT
                             count(*) as count
                             FROM reserves
                                 LEFT JOIN items USING (itemnumber)
@@ -536,7 +538,7 @@ sub CanItemBeReserved{
     
     my $branchcode   = "";
     my $branchfield  = "reserves.branchcode";
-    
+
     if( $controlbranch eq "ItemHomeLibrary" ){
         $branchfield = "items.homebranch";
         $branchcode = $item->{homebranch};
@@ -553,9 +555,9 @@ sub CanItemBeReserved{
     }else{
         $ruleitemtype = '*';
     }
-    
+
     # we retrieve count
-    
+
     $querycount .= "AND $branchfield = ?";
     
     $querycount .= " AND $itemtypefield = ?" if ($ruleitemtype ne "*");
@@ -566,12 +568,11 @@ sub CanItemBeReserved{
     }else{
         $sthcount->execute($borrowernumber, $branchcode, $ruleitemtype);
     }
-    
+
     my $reservecount = "0";
     if(my $rowcount = $sthcount->fetchrow_hashref()){
         $reservecount = $rowcount->{count};
     }
-    
     # we check if it's ok or not
     if( $reservecount >= $allowedreserves ){
         return 'tooManyReserves';
@@ -955,7 +956,7 @@ sub CheckReserves {
            LEFT JOIN itemtypes   ON biblioitems.itemtype   = itemtypes.itemtype
         ";
     }
-   
+
     if ($item) {
         $sth = $dbh->prepare("$select WHERE itemnumber = ?");
         $sth->execute($item);
@@ -1053,7 +1054,7 @@ sub CancelExpiredReserves {
     # Cancel reserves that have passed their expiration date.
     my $dbh = C4::Context->dbh;
     my $sth = $dbh->prepare( "
-        SELECT * FROM reserves WHERE DATE(expirationdate) < DATE( CURDATE() ) 
+        SELECT * FROM reserves WHERE DATE(expirationdate) < DATE( CURDATE() )
         AND expirationdate IS NOT NULL
         AND found IS NULL
     " );
@@ -1062,7 +1063,7 @@ sub CancelExpiredReserves {
     while ( my $res = $sth->fetchrow_hashref() ) {
         CancelReserve({ reserve_id => $res->{'reserve_id'} });
     }
-  
+
     # Cancel reserves that have been waiting too long
     if ( C4::Context->preference("ExpireReservesMaxPickUpDelay") ) {
         my $max_pickup_delay = C4::Context->preference("ReservesMaxPickUpDelay");
@@ -1188,12 +1189,12 @@ If C<$rank> is 'del', the hold request is cancelled.
 
 If C<$rank> is an integer greater than zero, the priority of
 the request is set to that value.  Since priority != 0 means
-that the item is not waiting on the hold shelf, setting the 
+that the item is not waiting on the hold shelf, setting the
 priority to a non-zero value also sets the request's found
-status and waiting date to NULL. 
+status and waiting date to NULL.
 
 The optional C<$itemnumber> parameter is used only when
-C<$rank> is a non-zero integer; if supplied, the itemnumber 
+C<$rank> is a non-zero integer; if supplied, the itemnumber
 of the hold request is set accordingly; if omitted, the itemnumber
 is cleared.
 
@@ -1305,7 +1306,7 @@ sub ModReserveFill {
                 ";
     $sth = $dbh->prepare($query);
     $sth->execute( $biblionumber, $resdate, $borrowernumber );
-    
+
     # now fix the priority on the others (if the priority wasn't
     # already sorted!)....
     unless ( $priority == 0 ) {
@@ -1350,7 +1351,7 @@ with the biblionumber & the borrowernumber, we can affect the itemnumber
 to the correct reserve.
 
 if $transferToDo is not set, then the status is set to "Waiting" as well.
-otherwise, a transfer is on the way, and the end of the transfer will 
+otherwise, a transfer is on the way, and the end of the transfer will
 take care of the waiting status
 
 =cut
@@ -1511,22 +1512,18 @@ sub GetReserveInfo {
 
 =head2 IsAvailableForItemLevelRequest
 
-  my $is_available = IsAvailableForItemLevelRequest($itemnumber);
+  my $is_available = IsAvailableForItemLevelRequest($item_record,$borrower_record);
 
 Checks whether a given item record is available for an
 item-level hold request.  An item is available if
 
-* it is not lost AND 
-* it is not damaged AND 
-* it is not withdrawn AND 
+* it is not lost AND
+* it is not damaged AND
+* it is not withdrawn AND
 * does not have a not for loan value > 0
 
-Whether or not the item is currently on loan is 
-also checked - if the AllowOnShelfHolds system preference
-is ON, an item can be requested even if it is currently
-on loan to somebody else.  If the system preference
-is OFF, an item that is currently checked out cannot
-be the target of an item-level hold request.
+Need to check the issuingrules onshelfholds column,
+if this is set items on the shelf can be placed on hold
 
 Note that IsAvailableForItemLevelRequest() does not
 check if the staff operator is authorized to place
@@ -1537,48 +1534,80 @@ and canreservefromotherbranches.
 =cut
 
 sub IsAvailableForItemLevelRequest {
-    my $itemnumber = shift;
-   
-    my $item = GetItem($itemnumber);
+    my $item = shift;
+    my $borrower = shift;
 
+    my $dbh = C4::Context->dbh;
     # must check the notforloan setting of the itemtype
     # FIXME - a lot of places in the code do this
     #         or something similar - need to be
     #         consolidated
-    my $dbh = C4::Context->dbh;
-    my $notforloan_query;
+    my $itype = _get_itype($item);
+    my $notforloan_per_itemtype
+      = $dbh->selectrow_array("SELECT notforloan FROM itemtypes WHERE itemtype = ?",
+                              undef, $itype);
+
+    return 0 if
+        $notforloan_per_itemtype ||
+        $item->{itemlost}        ||
+        $item->{notforloan} > 0  ||
+        $item->{wthdrawn}        ||
+        ($item->{damaged} && !C4::Context->preference('AllowHoldsOnDamagedItems'));
+
+
+    return 1 if _OnShelfHoldsAllowed($itype,$borrower->{categorycode},$item->{holdingbranch});
+
+    return $item->{onloan} || GetReserveStatus($item->{itemnumber}) eq "Waiting";
+}
+
+=head2 OnShelfHoldsAllowed
+
+  OnShelfHoldsAllowed($itemtype,$borrowercategory,$branchcode);
+
+Checks issuingrules, using the borrowers categorycode, the itemtype, and branchcode to see if onshelf
+holds are allowed, returns true if so.
+
+=cut
+
+sub OnShelfHoldsAllowed {
+    my ($item, $borrower) = @_;
+
+    my $itype = _get_itype($item);
+    return _OnShelfHoldsAllowed($itype,$borrower->{categorycode},$item->{holdingbranch});
+}
+
+sub _get_itype {
+    my $item = shift;
+
+    my $itype;
     if (C4::Context->preference('item-level_itypes')) {
-        $notforloan_query = "SELECT itemtypes.notforloan
-                             FROM items
-                             JOIN itemtypes ON (itemtypes.itemtype = items.itype)
-                             WHERE itemnumber = ?";
-    } else {
-        $notforloan_query = "SELECT itemtypes.notforloan
-                             FROM items
-                             JOIN biblioitems USING (biblioitemnumber)
-                             JOIN itemtypes USING (itemtype)
-                             WHERE itemnumber = ?";
+        # We cant trust GetItem to honour the syspref, so safest to do it ourselves
+        # When GetItem is fixed, we can remove this
+        $itype = $item->{itype};
     }
-    my $sth = $dbh->prepare($notforloan_query);
-    $sth->execute($itemnumber);
-    my $notforloan_per_itemtype = 0;
-    if (my ($notforloan) = $sth->fetchrow_array) {
-        $notforloan_per_itemtype = 1 if $notforloan;
+    else {
+        # XXX This is a bit dodgy. It relies on biblio itemtype column having different name.
+        # So if we already have a biblioitems join when calling this function,
+        # we don't need to access the database again
+        $itype = $item->{itemtype};
+    }
+    unless ($itype) {
+        my $dbh = C4::Context->dbh;
+        my $query = "SELECT itemtype FROM biblioitems WHERE biblioitemnumber = ? ";
+        my $sth = $dbh->prepare($query);
+        $sth->execute($item->{biblioitemnumber});
+        if (my $data = $sth->fetchrow_hashref()){
+            $itype = $data->{itemtype};
+        }
     }
+    return $itype;
+}
 
-    my $available_per_item = 1;
-    $available_per_item = 0 if $item->{itemlost} or
-                               ( $item->{notforloan} > 0 ) or
-                               ($item->{damaged} and not C4::Context->preference('AllowHoldsOnDamagedItems')) or
-                               $item->{withdrawn} or
-                               $notforloan_per_itemtype;
-
+sub _OnShelfHoldsAllowed {
+    my ($itype,$borrowercategory,$branchcode) = @_;
 
-    if (C4::Context->preference('AllowOnShelfHolds')) {
-        return $available_per_item;
-    } else {
-        return ($available_per_item and ($item->{onloan} or GetReserveStatus($itemnumber) eq "Waiting"));
-    }
+    my $rule = C4::Circulation::GetIssuingRule($borrowercategory, $itype, $branchcode);
+    return $rule->{onshelfholds};
 }
 
 =head2 AlterPriority
@@ -1846,7 +1875,7 @@ sub _FixPriority {
     
     $sth = $dbh->prepare( "SELECT reserve_id FROM reserves WHERE lowestPriority = 1 ORDER BY priority" );
     $sth->execute();
-    
+
     unless ( $ignoreSetLowestRank ) {
       while ( my $res = $sth->fetchrow_hashref() ) {
         _FixPriority({
@@ -1914,7 +1943,7 @@ sub _Findgroupreserve {
           unless any{ $data->{borrowernumber} eq $_ } @$ignore_borrowers ;
     }
     return @results if @results;
-    
+
     # check for title-level targetted match
     my $title_level_target_query = qq/
         SELECT reserves.biblionumber        AS biblionumber,
@@ -1999,7 +2028,7 @@ sub _koha_notify_reserve {
 
     my $dbh = C4::Context->dbh;
     my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);
-    
+
     # Try to get the borrower's email address
     my $to_address = C4::Members::GetNoticeEmailAddress($borrowernumber);
 
@@ -2119,6 +2148,54 @@ sub _ShiftPriorityByDateAndPriority {
     return $new_priority;  # so the caller knows what priority they wind up receiving
 }
 
+=head2 OPACItemHoldsAllowed
+
+  OPACItemHoldsAllowed($item_record,$borrower_record);
+
+Checks issuingrules, using the borrowers categorycode, the itemtype, and branchcode to see
+if specific item holds are allowed, returns true if so.
+
+=cut
+
+sub OPACItemHoldsAllowed {
+    my ($item,$borrower) = @_;
+
+    my $branchcode = $item->{homebranch} or die "No homebranch";
+    my $itype;
+    my $dbh = C4::Context->dbh;
+    if (C4::Context->preference('item-level_itypes')) {
+       # We cant trust GetItem to honour the syspref, so safest to do it ourselves
+       # When GetItem is fixed, we can remove this
+       $itype = $item->{itype};
+    }
+    else {
+       my $query = "SELECT itemtype FROM biblioitems WHERE biblioitemnumber = ? ";
+       my $sth = $dbh->prepare($query);
+       $sth->execute($item->{biblioitemnumber});
+       if (my $data = $sth->fetchrow_hashref()){
+           $itype = $data->{itemtype};
+       }
+    }
+
+    my $query = "SELECT opacitemholds,categorycode,itemtype,branchcode FROM issuingrules WHERE
+          (issuingrules.categorycode = ? OR issuingrules.categorycode = '*')
+        AND
+          (issuingrules.itemtype = ? OR issuingrules.itemtype = '*')
+        AND
+          (issuingrules.branchcode = ? OR issuingrules.branchcode = '*')
+        ORDER BY
+          issuingrules.categorycode desc,
+          issuingrules.itemtype desc,
+          issuingrules.branchcode desc
+       LIMIT 1";
+    my $sth = $dbh->prepare($query);
+    $sth->execute($borrower->{categorycode},$itype,$branchcode);
+    my $data = $sth->fetchrow_hashref;
+    my $opacitemholds = uc substr ($data->{opacitemholds}, 0, 1);
+    return '' if $opacitemholds eq 'N';
+    return $opacitemholds;
+}
+
 =head2 MoveReserve
 
   MoveReserve( $itemnumber, $borrowernumber, $cancelreserve )
diff --git a/C4/UsageStats.pm b/C4/UsageStats.pm
index 627fba5..4960d51 100644
--- a/C4/UsageStats.pm
+++ b/C4/UsageStats.pm
@@ -155,7 +155,6 @@ sub BuildReport {
         AllowHoldPolicyOverride
         AllowHoldsOnDamagedItems
         AllowHoldsOnPatronsPossessions
-        AllowOnShelfHolds
         AutoResumeSuspendedHolds
         canreservefromotherbranches
         decreaseLoanHighHolds
@@ -265,7 +264,6 @@ sub BuildReport {
         AllowPurchaseSuggestionBranchChoice
         OpacAllowPublicListCreation
         OpacAllowSharingPrivateLists
-        OPACItemHolds
         OpacRenewalAllowed
         OpacRenewalBranch
         OPACViewOthersSuggestions
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 56518c2..ce07590 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -30,6 +30,7 @@ use Data::Dumper;
 use C4::VirtualShelves qw/:DEFAULT ShelvesMax/;
 use C4::Biblio;
 use C4::Items;
+use C4::Reserves;
 use C4::Koha;
 use C4::Auth qw/get_session/;
 use C4::Members;
@@ -238,7 +239,6 @@ sub shelfpage {
             my ($shelfnumber2,$shelfname,$owner,$category,$sorton) = GetShelf($shelfnumber);
 
             $template->param(
-                'AllowOnShelfHolds'     => C4::Context->preference('AllowOnShelfHolds'),
                 'DisplayMultiPlaceHold' => C4::Context->preference('DisplayMultiPlaceHold'),
             );
             if (C4::Context->preference('TagsEnabled')) {
@@ -259,6 +259,7 @@ sub shelfpage {
                     direction => $direction,
                 );
                 ( $items, $totitems ) = GetShelfContents( $shelfnumber, $shelflimit, $shelfoffset, $sortfield, $direction );
+                my $borrower = GetMember( 'borrowernumber' => $loggedinuser );
                 for my $this_item (@$items) {
                     my $biblionumber = $this_item->{'biblionumber'};
                     my $record = GetMarcBiblio($biblionumber);
@@ -296,6 +297,7 @@ sub shelfpage {
                             });
                     }
 
+                    $this_item->{'allow_onshelf_holds'} = C4::Reserves::OnShelfHoldsAllowed($this_item, $borrower);
                 }
                 if($type eq 'intranet'){
                     # Build drop-down list for 'Add To:' menu...
diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index eb3e875..4ab349f 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -101,12 +101,12 @@ elsif ($op eq 'delete-branch-item') {
 # save the values entered
 elsif ($op eq 'add') {
     my $sth_search = $dbh->prepare('SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?');
-    my $sth_insert = $dbh->prepare('INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, renewalperiod, norenewalbefore, auto_renew, reservesallowed, issuelength, lengthunit, hardduedate, hardduedatecompare, fine, finedays, maxsuspensiondays, firstremind, chargeperiod,rentaldiscount, overduefinescap) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)');
-    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, maxsuspensiondays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, renewalperiod=?, norenewalbefore=?, auto_renew=?, reservesallowed=?, issuelength=?, lengthunit = ?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, overduefinescap=?  WHERE branchcode=? AND categorycode=? AND itemtype=?");
+    my $sth_insert = $dbh->prepare('INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, norenewalbefore, auto_renew, reservesallowed, issuelength, lengthunit, hardduedate, hardduedatecompare, fine, finedays, maxsuspensiondays, firstremind, chargeperiod,rentaldiscount, onshelfholds, opacitemholds, overduefinescap) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)');
+    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, maxsuspensiondays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, renewalperiod=?, norenewalbefore=?, auto_renew=?, reservesallowed=?, issuelength=?, lengthunit=?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, onshelfholds=?, opacitemholds=?, overduefinescap=? WHERE branchcode=? AND categorycode=? AND itemtype=?");
     
     my $br = $branch; # branch
     my $bor  = $input->param('categorycode'); # borrower category
-    my $cat  = $input->param('itemtype');     # item type
+    my $itemtype  = $input->param('itemtype');     # item type
     my $fine = $input->param('fine');
     my $finedays     = $input->param('finedays');
     my $maxsuspensiondays = $input->param('maxsuspensiondays');
@@ -120,6 +120,7 @@ elsif ($op eq 'add') {
     $norenewalbefore = undef if $norenewalbefore eq '0' or $norenewalbefore =~ /^\s*$/;
     my $auto_renew = $input->param('auto_renew') eq 'yes' ? 1 : 0;
     my $reservesallowed  = $input->param('reservesallowed');
+    my $onshelfholds     = $input->param('onshelfholds') || 0;
     $maxissueqty =~ s/\s//g;
     $maxissueqty = undef if $maxissueqty !~ /^\d+/;
     my $issuelength  = $input->param('issuelength');
@@ -128,15 +129,16 @@ elsif ($op eq 'add') {
     $hardduedate = format_date_in_iso($hardduedate);
     my $hardduedatecompare = $input->param('hardduedatecompare');
     my $rentaldiscount = $input->param('rentaldiscount');
+    my $opacitemholds = $input->param('opacitemholds') || 0;
     my $overduefinescap = $input->param('overduefinescap') || undef;
-    $debug and warn "Adding $br, $bor, $cat, $fine, $maxissueqty";
+    $debug and warn "Adding $br, $bor, $itemtype, $fine, $maxissueqty";
 
-    $sth_search->execute($br,$bor,$cat);
+    $sth_search->execute($br,$bor,$itemtype);
     my $res = $sth_search->fetchrow_hashref();
     if ($res->{total}) {
-        $sth_update->execute($fine, $finedays, $maxsuspensiondays, $firstremind, $chargeperiod, $maxissueqty, $renewalsallowed, $renewalperiod, $norenewalbefore, $auto_renew, $reservesallowed, $issuelength,$lengthunit, $hardduedate,$hardduedatecompare,$rentaldiscount,$overduefinescap, $br,$bor,$cat);
+        $sth_update->execute($fine, $finedays, $maxsuspensiondays, $firstremind, $chargeperiod, $maxissueqty, $renewalsallowed, $renewalperiod, $norenewalbefore, $auto_renew, $reservesallowed, $issuelength,$lengthunit, $hardduedate,$hardduedatecompare,$rentaldiscount, $onshelfholds, $opacitemholds, $overduefinescap, $br,$bor,$itemtype);
     } else {
-        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed, $renewalperiod, $norenewalbefore, $auto_renew, $reservesallowed,$issuelength,$lengthunit,$hardduedate,$hardduedatecompare,$fine,$finedays, $maxsuspensiondays, $firstremind,$chargeperiod,$rentaldiscount,$overduefinescap);
+        $sth_insert->execute($br,$bor,$itemtype,$maxissueqty,$renewalsallowed, $renewalperiod, $norenewalbefore, $auto_renew, $reservesallowed,$issuelength,$lengthunit,$hardduedate,$hardduedatecompare,$fine,$finedays, $maxsuspensiondays, $firstremind,$chargeperiod,$rentaldiscount,$onshelfholds,$opacitemholds,$overduefinescap);
     }
 } 
 elsif ($op eq "set-branch-defaults") {
@@ -391,7 +393,7 @@ while (my $row = $sth2->fetchrow_hashref) {
     $row->{'humancategorycode'} ||= $row->{'categorycode'};
     $row->{'default_humancategorycode'} = 1 if $row->{'humancategorycode'} eq '*';
     $row->{'fine'} = sprintf('%.2f', $row->{'fine'});
-    if ($row->{'hardduedate'} ne '0000-00-00') {
+    if ($row->{'hardduedate'} && $row->{'hardduedate'} ne '0000-00-00') {
        $row->{'hardduedate'} = format_date( $row->{'hardduedate'});
        $row->{'hardduedatebefore'} = 1 if ($row->{'hardduedatecompare'} == -1);
        $row->{'hardduedateexact'} = 1 if ($row->{'hardduedatecompare'} ==  0);
diff --git a/installer/data/mysql/it-IT/necessari/system_preferences.sql b/installer/data/mysql/it-IT/necessari/system_preferences.sql
index df446bc..94a00b9 100644
--- a/installer/data/mysql/it-IT/necessari/system_preferences.sql
+++ b/installer/data/mysql/it-IT/necessari/system_preferences.sql
@@ -17,7 +17,6 @@
 -- 51 Franklin Street' WHERE variable = ' Fifth Floor' WHERE variable = ' Boston' WHERE variable = ' MA 02110-1301 USA.
 
 UPDATE systempreferences SET value = 'cataloguing' WHERE variable = 'AcqCreateItem';
-UPDATE systempreferences SET value = '1' WHERE variable = 'AllowOnShelfHolds';
 UPDATE systempreferences SET value = '1' WHERE variable = 'AllowRenewalLimitOverride';
 UPDATE systempreferences SET value = 'annual' WHERE variable = 'autoBarcode';
 UPDATE systempreferences SET value = 'email' WHERE variable = 'AutoEmailPrimaryAddress';
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 4ffbbf2..1470af3 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1192,6 +1192,8 @@ CREATE TABLE `issuingrules` ( -- circulation and fine rules
   `reservesallowed` smallint(6) NOT NULL default "0", -- how many holds are allowed
   `branchcode` varchar(10) NOT NULL default '', -- the branch this rule is for (branches.branchcode)
   overduefinescap decimal(28,6) default NULL, -- the maximum amount of an overdue fine
+  onshelfholds tinyint(1) NOT NULL default 0, -- allow holds for items that are on shelf
+  opacitemholds char(1) NOT NULL default 'N', -- allow opac users to place specific items on hold
   PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
   KEY `categorycode` (`categorycode`),
   KEY `itemtype` (`itemtype`)
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index c3e308f..377b1ba 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -25,7 +25,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('AllowMultipleIssuesOnABiblio',1,'Allow/Don\'t allow patrons to check out multiple items from one biblio','','YesNo'),
 ('AllowNotForLoanOverride','0','','If ON, Koha will allow the librarian to loan a not for loan item.','YesNo'),
 ('AllowOfflineCirculation','0','','If on, enables HTML5 offline circulation functionality.','YesNo'),
-('AllowOnShelfHolds','0','','Allow hold requests to be placed on items that are not on loan','YesNo'),
 ('AllowPKIAuth','None','None|Common Name|emailAddress','Use the field from a client-side SSL certificate to look a user in the Koha database','Choice'),
 ('AllowPurchaseSuggestionBranchChoice','0','1','Allow user to choose branch when making a purchase suggestion','YesNo'),
 ('AllowRenewalIfOtherItemsAvailable','0',NULL,'If enabled, allow a patron to renew an item with unfilled holds if other available items can fill that hold.','YesNo'),
@@ -262,7 +261,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('OpacHiddenItems','','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','Textarea'),
 ('OpacHighlightedWords','1','','If Set, then queried words are higlighted in OPAC','YesNo'),
 ('OpacHoldNotes','0','','Show hold notes on OPAC','YesNo'),
-('OPACItemHolds','1','0|1|force','Allow OPAC users to place hold on specific items. If No, users can only request next available copy. If Yes, users can choose between next available and specific copy. If Force, users *must* choose a specific copy.','Choice'),
 ('OpacItemLocation','callnum','callnum|ccode|location','Show the shelving location of items in the opac','Choice'),
 ('OPACItemsResultsDisplay','0','','If OFF : show only the status of items in result list.If ON : show full location of items (branch+location+callnumber) as in staff interface','YesNo'),
 ('OpacKohaUrl','1',NULL,'Show \'Powered by Koha\' text on OPAC footer.',NULL),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 393a3a1..f1275ad 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2093,7 +2093,6 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     $dbh->do("UPDATE `systempreferences` SET options='10' WHERE variable='globalDueDate'");
     $dbh->do("UPDATE `systempreferences` SET type='Integer' WHERE variable='numSearchResults'");
     $dbh->do("UPDATE `systempreferences` SET type='Integer' WHERE variable='OPACnumSearchResults'");
-    $dbh->do("UPDATE `systempreferences` SET type='Integer' WHERE variable='ReservesMaxPickupDelay'");
     $dbh->do("UPDATE `systempreferences` SET type='Integer' WHERE variable='TransfersMaxDaysWarning'");
     $dbh->do("UPDATE `systempreferences` SET type='Integer' WHERE variable='StaticHoldsQueueWeight'");
     $dbh->do("UPDATE `systempreferences` SET type='Integer' WHERE variable='holdCancelLength'");
@@ -9573,6 +9572,42 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+
+$DBversion = '3.17.00.XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    # First create the column
+    $dbh->do("ALTER TABLE issuingrules ADD onshelfholds tinyint(1) default 0 NOT NULL");
+    # Now update the column
+    if (C4::Context->preference("AllowOnShelfHolds")){
+        # Pref is on, set allow for all rules
+        $dbh->do("UPDATE issuingrules SET onshelfholds=1");
+    } else {
+        # If the preference is not set, leave off
+        $dbh->do("UPDATE issuingrules SET onshelfholds=0");
+    }
+    # Remove from the systempreferences table
+    $dbh->do("DELETE FROM systempreferences WHERE variable = 'AllowOnShelfHolds'");
+
+    # First create the column
+    $dbh->do("ALTER TABLE issuingrules ADD opacitemholds char(1) DEFAULT 'N' NOT NULL");
+    # Now update the column
+    my $opacitemholds = C4::Context->preference("OPACItemHolds") || '';
+    if (lc ($opacitemholds) eq 'force') {
+        $opacitemholds = 'F';
+    }
+    else {
+        $opacitemholds = $opacitemholds ? 'Y' : 'N';
+    }
+    # Set allow for all rules
+    $dbh->do("UPDATE issuingrules SET opacitemholds=1");
+
+    # Remove from the systempreferences table
+    $dbh->do("DELETE FROM systempreferences WHERE variable = 'OPACItemHolds'");
+
+    print "Upgrade to $DBversion done (Move AllowOnShelfHolds to circulation matrix; Move OPACItemHolds system preference to circulation matrix)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/installer/html-template-to-template-toolkit.pl b/installer/html-template-to-template-toolkit.pl
index e99b195..5f0e0ac 100755
--- a/installer/html-template-to-template-toolkit.pl
+++ b/installer/html-template-to-template-toolkit.pl
@@ -32,7 +32,7 @@ my @globals = ("themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets
 "SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages",
 "virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay",
 "OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled",
-"TagsShowOnList", "TagsInputOnList","loggedinusername","AllowOnShelfHolds","opacbookbag",
+"TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag",
 "OPACAmazonEnabled", "SyndeticsCoverImages","using_https");
 
 # Arguments:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index a296bf6..a16f231 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -439,12 +439,6 @@ Circulation:
                   no: "Don't allow"
             - hold requests to be placed on and filled by damaged items.
         -
-            - pref: AllowOnShelfHolds
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - hold requests to be placed on items that are not checked out.
-        -
             - pref: AllowHoldDateInFuture
               choices:
                   yes: Allow
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 45df9f8..bbe0021 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -489,13 +489,6 @@ OPAC:
 #              choices:
 #            - If ON, enables subject cloud on OPAC
         -
-            - pref: OPACItemHolds
-              choices:
-                  no: "Don't allow"
-                  yes: Allow
-                  force: Force
-            - patrons to place holds on specific items in the OPAC. If this is disabled, users can only put a hold on the next available item. If this is forced, users must put a hold on a specific item.
-        -
             - pref: OpacRenewalAllowed
               choices:
                   yes: Allow
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index 8bc5809..1397b1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -156,6 +156,8 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
                 <th>No renewal before</th>
                 <th>Automatic renewal</th>
                 <th>Holds allowed (count)</th>
+                <th>On shelf holds allowed</th>
+                <th>Allow OPAC users to place holds on items</th>
                 <th>Rental discount (%)</th>
                 <th colspan="2">&nbsp;</th>
             </tr>
@@ -218,6 +220,8 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
                                 [% END %]
                             </td>
 							<td>[% rule.reservesallowed %]</td>
+                                                        <td>[% IF rule.onshelfholds %]Yes[% ELSE %]No[% END %]</td>
+                                                        <td>[% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Yes[% ELSE %]No[% END %]</td>
 							<td>[% rule.rentaldiscount %]</td>
                             <td><a href="#" class="editrule">Edit</a></td>
 							<td>
@@ -275,6 +279,8 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
                         </select>
                     </td>
                     <td><input type="text" name="reservesallowed" id="reservesallowed" size="2" /></td>
+                    <td><input type="checkbox" name="onshelfholds" value="1" /></td>
+                    <td><select id="opacitemholds" name="opacitemholds"><option value="N">No</option><option value="Y">Yes</option><option value="F">Force</option></select></td>
                     <td><input type="text" name="rentaldiscount" id="rentaldiscount" size="2" /></td>
                     <td colspan="2">
                         <input type="hidden" name="branch" value="[% current_branch %]"/>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
index b15333b..bd976fb 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
@@ -2,12 +2,8 @@
     [% UNLESS ( norequests ) %]
         [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
             [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %]
-                [% IF ( AllowOnShelfHolds ) %]
+                [% IF ( AllowOnShelfHolds OR ItemsIssued ) %]
                     <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place hold</a></li>
-                [% ELSE %]
-                    [% IF ( ItemsIssued ) %]
-                        <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place hold</a></li>
-                    [% END %]
                 [% END %]
             [% END %]
         [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 6558e6e..3aa4cd1 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -243,26 +243,22 @@
                                                             </li>
                                                         [% END # / IF OpacHoldNotes %]
 
-                                                        [% IF OPACItemHolds == '1' or OPACItemHolds == 'force' %]
+                                                        <li>
+                                                        </li>
+                                                        [% IF bibitemloo.itemholdable %]
                                                             <!-- ITEM HOLDS -->
                                                             <li class="lradio place_on_type" style="display:none;">
                                                                 <label class="radio inline" for="reqany_[% bibitemloo.biblionumber %]">Next available item</label>
-                                                                [% IF OPACItemHolds == "1" %]
+                                                                [% IF NOT bibitemloo.force_hold %]
                                                                     <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
                                                                             id="reqany_[% bibitemloo.biblionumber %]"
                                                                             class="selectany"
                                                                             value="Any"
                                                                             checked="checked"
                                                                     />
-                                                                [% ELSE %]
-                                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
-                                                                            id="reqany_[% bibitemloo.biblionumber %]"
-                                                                            class="selectany"
-                                                                            value="Any"
-                                                                     />
                                                                 [% END %]
                                                                 <label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber %]">A specific item</label>
-                                                                [% IF OPACItemHolds == "force" %]
+                                                                [% IF bibitemloo.force_hold %]
                                                                     <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
                                                                            id="reqspecific_[% bibitemloo.biblionumber %]"
                                                                            class="selectspecific"
@@ -277,10 +273,10 @@
                                                                     />
                                                                 [% END %]
                                                             </li>
-                                                        [% END # / IF OPACItemHolds %]
+                                                        [% END # / IF bibitemloo.itemholdable %]
                                                     </ul>
 
-                                                    [% IF OPACItemHolds == '1' || OPACItemHolds == 'force' %]
+                                                    [% IF bibitemloo.itemholdable %]
                                                         <table class="copiesrow table table-bordered table-striped" id="copiesrow_[% bibitemloo.biblionumber %]">
                                                             <caption>Select a specific item:</caption>
                                                             <tr>
@@ -380,7 +376,7 @@
                                                                 </tr>
                                                             [% END # / FOREACH itemLoo IN bibitemloo.itemLoop%]
                                                         </table> <!-- / #copiesrow_[% bibitemloo.biblionumber %] -->
-                                                    [% END # / IF ( OPACItemHolds )%]
+                                                    [% END # / IF ( bibitemloo.itemholdable )%]
                                                 </div> <!-- / #hold-options-[% bibitemloo.biblionumber %] -->
                                             </fieldset>
                                         [% END # / IF ( bibitemloo.holdable ) %]
@@ -460,12 +456,10 @@
         // Hides all 'specific copy' table rows on load.
         $(".copiesrow").hide();
 
-        [% IF OPACItemHolds == 'force' %]
-          [% FOREACH bibitemloo IN bibitemloop %]
-            [% IF bibitemloo.holdable %]
-              $("#toggle-hold-options-[% bibitemloo.biblionumber %]").click();
-              $("#copiesrow_[% bibitemloo.biblionumber %]").show();
-            [% END %]
+        [% FOREACH bibitemloo IN bibitemloop %]
+          [% IF bibitemloo.force_hold %]
+            $("#toggle-hold-options-[% bibitemloo.biblionumber %]").click();
+            $("#copiesrow_[% bibitemloo.biblionumber %]").show();
           [% END %]
         [% END %]
 
@@ -523,20 +517,16 @@
 
         $("#place_on_hdr").show();
 
-        [% IF OPACItemHolds == '1' %]
-            $(".place_on_type").show();
-            // onload, selectany is checked
-            $(".selectany").attr("checked", "checked");
-        [% END %]
+        $(".place_on_type").show();
+        // onload, selectany is checked
+        $(".selectany").attr("checked", "checked");
 
         // If the user is *allowed* to choose a specific item
         // The first one is preselected
-        [% IF OPACItemHolds =="1" %]
-            $("table.copiesrow").each(function(){
-                var id = suffixOf($(this).attr("id"), "_");
-                select_first_available(id);
-            });
-        [% END %]
+        $("table.copiesrow").each(function(){
+            var id = suffixOf($(this).attr("id"), "_");
+            select_first_available(id);
+        });
 
         // On confirmsjs change
         $(".confirmjs").change(function(){
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
index 9b8cd2b..05d022a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
@@ -227,14 +227,8 @@ href="/cgi-bin/koha/opac-rss.pl?[% query_cgi %][% limit_cgi |html %]" />
                                                             <p>
                                                                 [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %]
                                                                     [% UNLESS ( GROUP_RESULT.norequests ) %]
-                                                                        [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
-                                                                            [% IF ( AllowOnShelfHolds ) %]
-                                                                                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
-                                                                            [% ELSE %]
-                                                                                [% IF ( GROUP_RESULT.itemsissued ) %]
-                                                                                    <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
-                                                                                [% END %]
-                                                                            [% END %]
+                                                                        [% IF Koha.Preference( 'opacuserlogin' ) == 1 && GROUP_RESULT.holdable %]
+                                                                            <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% GROUP_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
                                                                         [% END %]
                                                                     [% END %]
                                                                 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index 72a3a89..b977760 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -471,13 +471,9 @@
                                                 <div class="actions-menu">
                                                         [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %]
                                                             [% UNLESS ( SEARCH_RESULT.norequests ) %]
-                                                                [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && AllowOnShelfHolds ) %]
+                                                                [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) && SEARCH_RESULT.holdable %]
                                                                     <span class="actions"><a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place hold</a></span><!-- add back when available 0 holds in queue-->
-                                                                [% ELSE %]
-                                                                    [% IF ( SEARCH_RESULT.itemsissued ) %]
-                                                                        <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue-->
-                                                                    [% END %]
-                                                                [% END # / IF opacuserlogin && AllowOnShelfHolds %]
+                                                                [% END # / IF opacuserlogin && holdable %]
                                                             [% END # UNLESS SEARCH_RESULT.norequests %]
                                                         [% END # IF RequestOnOpac %]
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index f39b2c5..c380744 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -418,7 +418,7 @@
                                                         [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %]
                                                             [% UNLESS ( itemsloo.norequests ) %]
                                                                 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
-                                                                    [% IF ( AllowOnShelfHolds ) %]
+                                                                    [% IF ( itemsloo.allow_onshelf_holds ) %]
                                                                         <span class="actions"><a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place hold</a><!-- add back when available 0 holds in queue--></span>
                                                                     [% ELSE %]
                                                                         [% IF ( itemsloo.itemsissued ) %]
diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index c3c03c1..6aaa14b 100755
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -49,6 +49,7 @@ use CGI;
 use MARC::Record;
 use C4::Biblio;
 use C4::Items;
+use C4::Reserves;
 use C4::Acquisition;
 use C4::Review;
 use C4::Serials;    # uses getsubscriptionfrom biblionumber
@@ -70,17 +71,13 @@ my $biblionumber = $query->param('biblionumber');
 $biblionumber = int($biblionumber);
 
 # get biblionumbers stored in the cart
-my @cart_list;
-
-if($query->cookie("bib_list")){
-    my $cart_list = $query->cookie("bib_list");
-    @cart_list = split(/\//, $cart_list);
+if(my $cart_list = $query->cookie("bib_list")){
+    my @cart_list = split(/\//, $cart_list);
     if ( grep {$_ eq $biblionumber} @cart_list) {
         $template->param( incart => 1 );
     }
 }
 
-$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
 $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
 
 my $marcflavour      = C4::Context->preference("marcflavour");
@@ -148,16 +145,22 @@ $template->param(
 );
 
 my $norequests = 1;
+my $allow_onshelf_holds;
 my $res = GetISBDView($biblionumber, "opac");
 
 my $itemtypes = GetItemTypes();
+my $borrower = GetMember( 'borrowernumber' => $loggedinuser );
 for my $itm (@items) {
     $norequests = 0
-       if ( (not $itm->{'withdrawn'} )
-         && (not $itm->{'itemlost'} )
-         && ($itm->{'itemnotforloan'}<0 || not $itm->{'itemnotforloan'} )
-		 && (not $itemtypes->{$itm->{'itype'}}->{notforloan} )
-         && ($itm->{'itemnumber'} ) );
+      if $norequests
+        && !$itm->{'withdrawn'}
+        && !$itm->{'itemlost'}
+        && ($itm->{'itemnotforloan'}<0 || not $itm->{'itemnotforloan'})
+        && !$itemtypes->{$itm->{'itype'}}->{notforloan}
+        && $itm->{'itemnumber'};
+
+    $allow_onshelf_holds = C4::Reserves::OnShelfHoldsAllowed($itm, $borrower)
+      unless $allow_onshelf_holds;
 }
 
 my $reviews = getreviews( $biblionumber, 1 );
@@ -173,7 +176,7 @@ foreach ( @$reviews ) {
 
 $template->param(
     RequestOnOpac       => C4::Context->preference("RequestOnOpac"),
-    AllowOnShelfHolds   => C4::Context->preference('AllowOnShelfHolds'),
+    AllowOnShelfHolds   => $allow_onshelf_holds,
     norequests   => $norequests,
     ISBD         => $res,
     biblionumber => $biblionumber,
diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index f8fab90..342b7cb 100755
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -52,6 +52,8 @@ use CGI;
 use MARC::Record;
 use C4::Biblio;
 use C4::Items;
+use C4::Reserves;
+use C4::Members;
 use C4::Acquisition;
 use C4::Koha;
 use List::MoreUtils qw/any/;
@@ -103,17 +105,21 @@ $template->param(
 );
 
 # get biblionumbers stored in the cart
-my @cart_list;
-
-if($query->cookie("bib_list")){
-    my $cart_list = $query->cookie("bib_list");
-    @cart_list = split(/\//, $cart_list);
+if(my $cart_list = $query->cookie("bib_list")){
+    my @cart_list = split(/\//, $cart_list);
     if ( grep {$_ eq $biblionumber} @cart_list) {
         $template->param( incart => 1 );
     }
 }
 
-$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
+my $allow_onshelf_holds;
+my $borrower = GetMember( 'borrowernumber' => $loggedinuser );
+for my $itm (@all_items) {
+    $allow_onshelf_holds = C4::Reserves::OnShelfHoldsAllowed($itm, $borrower);
+    last if $allow_onshelf_holds;
+}
+
+$template->param( 'AllowOnShelfHolds' => $allow_onshelf_holds );
 $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
 
 # adding the $RequestOnOpac param
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 3bf703f..55fb621 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -437,12 +437,7 @@ if ($session->param('busc')) {
 }
 
 
-
-$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
 $template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
-
-
-
 $template->param('OPACShowCheckoutName' => C4::Context->preference("OPACShowCheckoutName") );
 $template->param('OPACShowBarcode' => C4::Context->preference("OPACShowBarcode") );
 
@@ -627,15 +622,21 @@ if ( not $viewallitems and @items > $max_items_to_display ) {
         items_count => scalar( @items ),
     );
 } else {
+  my $allow_onshelf_holds;
+  my $borrower = GetMember( 'borrowernumber' => $borrowernumber );
   for my $itm (@items) {
     $itm->{holds_count} = $item_reserves{ $itm->{itemnumber} };
     $itm->{priority} = $priority{ $itm->{itemnumber} };
     $norequests = 0
-       if ( (not $itm->{'withdrawn'} )
-         && (not $itm->{'itemlost'} )
-         && ($itm->{'itemnotforloan'}<0 || not $itm->{'itemnotforloan'} )
-		 && (not $itemtypes->{$itm->{'itype'}}->{notforloan} )
-         && ($itm->{'itemnumber'} ) );
+      if $norequests
+        && !$itm->{'withdrawn'}
+        && !$itm->{'itemlost'}
+        && ($itm->{'itemnotforloan'}<0 || not $itm->{'itemnotforloan'})
+        && !$itemtypes->{$itm->{'itype'}}->{notforloan}
+        && $itm->{'itemnumber'};
+
+    $allow_onshelf_holds = C4::Reserves::OnShelfHoldsAllowed($itm, $borrower)    
+      unless $allow_onshelf_holds;
 
     # get collection code description, too
     my $ccode = $itm->{'ccode'};
@@ -691,6 +692,7 @@ if ( not $viewallitems and @items > $max_items_to_display ) {
         push @itemloop, $itm;
     }
   }
+  $template->param( 'AllowOnShelfHolds' => $allow_onshelf_holds );
 }
 
 # Display only one tab if one items list is empty
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index ba778db..389e3c8 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -423,6 +423,7 @@ foreach my $biblioNum (@biblionumbers) {
 
     $biblioLoopIter{itemLoop} = [];
     my $numCopiesAvailable = 0;
+    my $numCopiesOPACAvailable = 0;
     foreach my $itemInfo (@{$biblioData->{itemInfos}}) {
         my $itemNum = $itemInfo->{itemnumber};
         my $itemLoopIter = {};
@@ -517,16 +518,27 @@ foreach my $biblioNum (@biblionumbers) {
 
         my $branch = GetReservesControlBranch( $itemInfo, $borr );
 
-        my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} );
-        my $policy_holdallowed = 1;
-
-        if ( $branchitemrule->{'holdallowed'} == 0 ||
-                ( $branchitemrule->{'holdallowed'} == 1 && $borr->{'branchcode'} ne $itemInfo->{'homebranch'} ) ) {
-            $policy_holdallowed = 0;
+        my $policy_holdallowed = !$itemLoopIter->{already_reserved};
+        if ($policy_holdallowed) {
+            if (my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} )) {
+                $policy_holdallowed =
+                  ($branchitemrule->{'holdallowed'} == 2) ||
+                  ($branchitemrule->{'holdallowed'} == 1
+                      && $borr->{'branchcode'} eq $itemInfo->{'homebranch'});
+            } else {
+                $policy_holdallowed = 0; # No rule - not allowed
+            }
         }
-
-        if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) eq 'OK' and ($itemLoopIter->{already_reserved} ne 1)) {
-            $itemLoopIter->{available} = 1;
+        $policy_holdallowed &&=
+            IsAvailableForItemLevelRequest($itemInfo,$borr) &&
+            CanItemBeReserved($borrowernumber,$itemNum) eq 'OK';
+
+        if ($policy_holdallowed) {
+            if ( my $hold_allowed = OPACItemHoldsAllowed( $itemInfo, $borr ) ) {
+                $itemLoopIter->{available} = 1;
+                $numCopiesOPACAvailable++;
+                $biblioLoopIter{force_hold} = 1 if $hold_allowed eq 'F';
+            }
             $numCopiesAvailable++;
         }
 
@@ -545,23 +557,22 @@ foreach my $biblioNum (@biblionumbers) {
         $numBibsAvailable++;
         $biblioLoopIter{bib_available} = 1;
         $biblioLoopIter{holdable} = 1;
+        $biblioLoopIter{itemholdable} = 1 if $numCopiesOPACAvailable;
     }
     if ($biblioLoopIter{already_reserved}) {
         $biblioLoopIter{holdable} = undef;
-    }
-    my $canReserve = CanBookBeReserved($borrowernumber,$biblioNum);
-    unless ($canReserve eq 'OK') {
-        $biblioLoopIter{holdable} = undef;
-        $biblioLoopIter{ $canReserve } = 1;
+        $biblioLoopIter{itemholdable} = undef;
     }
     if(not C4::Context->preference('AllowHoldsOnPatronsPossessions') and CheckIfIssuedToPatron($borrowernumber,$biblioNum)) {
         $biblioLoopIter{holdable} = undef;
         $biblioLoopIter{already_patron_possession} = 1;
     }
 
-    if( $biblioLoopIter{holdable} ){ $anyholdable++; }
+    $biblioLoopIter{holdable} &&= CanBookBeReserved($borrowernumber,$biblioNum) eq 'OK';
 
     push @$biblioLoop, \%biblioLoopIter;
+
+    $anyholdable = 1 if $biblioLoopIter{holdable};
 }
 
 if ( $numBibsAvailable == 0 || $anyholdable == 0) {
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index d7eaf9e..ac0354d 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -42,6 +42,8 @@ use C4::Branch; # GetBranches
 use C4::SocialData;
 use C4::Ratings;
 use C4::External::OverDrive;
+use C4::Members;
+use C4::Reserves;
 
 use POSIX qw(ceil floor strftime);
 use URI::Escape;
@@ -136,7 +138,7 @@ if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
 elsif (C4::Context->preference("marcflavour") eq "MARC21" ) {
     $template->param('usmarc' => 1);
 }
-$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
+
 $template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') );
 
 $template->param(
@@ -566,8 +568,11 @@ if ($@ || $error) {
     exit;
 }
 
+my $borrower = $borrowernumber ? GetMember( borrowernumber => $borrowernumber ) : undef;
+
 # At this point, each server has given us a result set
 # now we build that set for template display
+my %allow_onshelf_holds;
 my @sup_results_array;
 for (my $i=0;$i<@servers;$i++) {
     my $server = $servers[$i];
@@ -582,11 +587,23 @@ for (my $i=0;$i<@servers;$i++) {
                 # we need to set the offset parameter of searchResults to 0
                 my @group_results = searchResults( 'opac', $query_desc, $group->{'group_count'},$results_per_page, 0, $scan,
                                                    $group->{"RECORDS"});
+                if ($borrower) {
+                    $_->{holdable} =
+                        IsAvailableForItemLevelRequest($_, $borrower) &&
+                        OPACItemHoldsAllowed($_, $borrower)
+                      foreach @group_results;
+                }
                 push @newresults, { group_label => $group->{'group_label'}, GROUP_RESULTS => \@group_results };
             }
         } else {
             @newresults = searchResults('opac', $query_desc, $hits, $results_per_page, $offset, $scan,
                                         $results_hashref->{$server}->{"RECORDS"});
+            if ($borrower) {
+                $_->{holdable} =
+                    IsAvailableForItemLevelRequest($_, $borrower) &&
+                    OPACItemHoldsAllowed($_, $borrower)
+                  foreach @newresults;
+            }
         }
         $hits = 0 unless @newresults;
 
diff --git a/reserve/request.pl b/reserve/request.pl
index 70c002a..8178444 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -334,9 +334,6 @@ foreach my $biblionumber (@biblionumbers) {
 		        $item->{hosttitle} = GetBiblioData($item->{biblionumber})->{title};
 		}
 		
-            #   add information
-            $item->{itemcallnumber} = $item->{itemcallnumber};
-
             # if the item is currently on loan, we display its return date and
             # change the background color
             my $issues= GetItemIssue($itemnumber);
@@ -347,9 +344,9 @@ foreach my $biblionumber (@biblionumbers) {
 
             # checking reserve
             my ($reservedate,$reservedfor,$expectedAt,$reserve_id,$wait) = GetReservesFromItemnumber($itemnumber);
-            my $ItemBorrowerReserveInfo = GetMember( borrowernumber => $reservedfor );
-
             if ( defined $reservedate ) {
+                my $ItemBorrowerReserveInfo = GetMember( borrowernumber => $reservedfor );
+
                 $item->{backgroundcolor} = 'reserved';
                 $item->{reservedate}     = format_date($reservedate);
                 $item->{ReservedForBorrowernumber}     = $reservedfor;
@@ -394,7 +391,7 @@ foreach my $biblionumber (@biblionumbers) {
             }
 
             # If there is no loan, return and transfer, we show a checkbox.
-            $item->{notforloan} = $item->{notforloan} || 0;
+            $item->{notforloan} ||= 0;
 
             # if independent branches is on we need to check if the person can reserve
             # for branches they arent logged in to
@@ -424,7 +421,7 @@ foreach my $biblionumber (@biblionumbers) {
             if (
                    $policy_holdallowed
                 && !$item->{cantreserve}
-                && IsAvailableForItemLevelRequest($itemnumber)
+                && IsAvailableForItemLevelRequest($item, $borrowerinfo)
                 && CanItemBeReserved(
                     $borrowerinfo->{borrowernumber}, $itemnumber
                 ) eq 'OK'
diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t
index 58dbc2b..242cf59 100755
--- a/t/db_dependent/Circulation.t
+++ b/t/db_dependent/Circulation.t
@@ -291,7 +291,7 @@ C4::Context->dbh->do("DELETE FROM accountlines");
     );
 
     # Testing of feature to allow the renewal of reserved items if other items on the record can fill all needed holds
-    C4::Context->set_preference('AllowOnShelfHolds', 1 );
+    C4::Context->dbh->do("UPDATE issuingrules SET onshelfholds = 1");
     C4::Context->set_preference('AllowRenewalIfOtherItemsAvailable', 1 );
     ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber);
     is( $renewokay, 1, 'Bug 11634 - Allow renewal of item with unfilled holds if other available items can fill those holds');
diff --git a/t/db_dependent/Circulation_Issuingrule.t b/t/db_dependent/Circulation_Issuingrule.t
index 6e4f44f..b1d9d72 100644
--- a/t/db_dependent/Circulation_Issuingrule.t
+++ b/t/db_dependent/Circulation_Issuingrule.t
@@ -132,6 +132,8 @@ my $sampleissuingrule1 = {
     itemtype           => 'BOOK',
     categorycode       => $samplecat->{categorycode},
     maxsuspensiondays  => 0,
+    onshelfholds       => 0,
+    opacitemholds      => 'N',
 };
 my $sampleissuingrule2 = {
     branchcode         => $samplebranch2->{branchcode},
@@ -158,6 +160,8 @@ my $sampleissuingrule2 = {
     chargename         => 'Null',
     restrictedtype     => 'Null',
     maxsuspensiondays  => 0,
+    onshelfholds       => 1,
+    opacitemholds      => 'Y',
 };
 my $sampleissuingrule3 = {
     branchcode         => $samplebranch1->{branchcode},
@@ -184,6 +188,8 @@ my $sampleissuingrule3 = {
     chargename         => 'Null',
     restrictedtype     => 'Null',
     maxsuspensiondays  => 0,
+    onshelfholds       => 1,
+    opacitemholds      => 'F',
 };
 $query = 'INSERT INTO issuingrules (
                 branchcode,
diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t
index 4676a60..fa0cf94 100755
--- a/t/db_dependent/Reserves.t
+++ b/t/db_dependent/Reserves.t
@@ -17,7 +17,7 @@
 
 use Modern::Perl;
 
-use Test::More tests => 53;
+use Test::More tests => 56;
 
 use MARC::Record;
 use DateTime::Duration;
@@ -506,6 +506,28 @@ is( C4::Reserves::CanBookBeReserved($borrowernumber, $biblionumber) , 'OK', "Res
 ####### EO Bug 13113 <<<
        ####
 
+my $item = GetItem($itemnumber);
+
+ok( C4::Reserves::IsAvailableForItemLevelRequest($item, $borrower), "Reserving a book on item level" );
+
+my $itype = C4::Reserves::_get_itype($item);
+my $categorycode = $borrower->{categorycode};
+my $holdingbranch = $item->{holdingbranch};
+my $rule = C4::Circulation::GetIssuingRule($categorycode, $itype, $holdingbranch);
+
+$dbh->do(
+    "UPDATE issuingrules SET onshelfholds = 1 WHERE categorycode = ? AND itemtype= ? and branchcode = ?",
+    undef,
+    $rule->{categorycode}, $rule->{itemtype}, $rule->{branchcode}
+);
+ok( C4::Reserves::OnShelfHoldsAllowed($item, $borrower), "OnShelfHoldsAllowed() allowed" );
+$dbh->do(
+    "UPDATE issuingrules SET onshelfholds = 0 WHERE categorycode = ? AND itemtype= ? and branchcode = ?",
+    undef,
+    $rule->{categorycode}, $rule->{itemtype}, $rule->{branchcode}
+);
+ok( !C4::Reserves::OnShelfHoldsAllowed($item, $borrower), "OnShelfHoldsAllowed() disallowed" );
+
 $dbh->rollback;
 
 sub count_hold_print_messages {
-- 
1.9.1

From srdjan at catalyst.net.nz  Tue Dec  9 08:54:58 2014
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue,  9 Dec 2014 20:54:58 +1300
Subject: [Koha-patches] [PATCH] bug_13413: Koha::Log - logging for Koha
Message-ID: <1418111698-17037-1-git-send-email-srdjan@catalyst.net.nz>

---
 Koha/Log.pm  | 405 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 t/Koha_Log.t |  77 ++++++++++++
 2 files changed, 482 insertions(+)
 create mode 100644 Koha/Log.pm
 create mode 100755 t/Koha_Log.t

diff --git a/Koha/Log.pm b/Koha/Log.pm
new file mode 100644
index 0000000..78b8183
--- /dev/null
+++ b/Koha/Log.pm
@@ -0,0 +1,405 @@
+package Koha::Log;
+
+# Copyright 2014 Catalyst IT
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
+use Modern::Perl;
+use Log::Contextual qw(set_logger with_logger);
+use Exporter::Declare;
+use base 'Log::Contextual';
+
+exports qw(with_debug with_logger create_logger set_default_logger);
+
+=head1 NAME
+
+Koha::Log - Logging for Koha
+
+=head1 SYNOPSIS
+
+  # Main script
+  use Koha::Log;
+  # optionally
+  Koha::Log::set_default_logger('File', {filename => $LOG_FILE});
+
+  log_error { "Error" };
+  log_warn { "Warn" };
+  log_info { "Info" };
+
+  # Some module
+  use Koha::Log;
+  log_error { "Error" };
+
+=head1 DESCRIPTION
+
+  This is a combination of Log::Contextual and customised Log:Dispatcher
+  Why?
+  1. Because it uses code blocks to log, so complex debugging can be left in
+     without any performance penalty
+  2. Some useful things can be done
+
+  Out of the box it logs to STDERR
+
+=head1 LOG LEVELS
+
+  We support log levels of debug info warn error fatal
+  Not sure how useful is fatal;
+  trace level is TODO
+
+  Log functions are log_I<level>
+
+=head1 Log::Contextual FUNCTIONS
+
+By default, log_* functions are exported. For the full list see C<Log::Contextual>
+
+=cut
+
+my $default_logger;
+
+sub arg_default_logger {
+    return $_[1] || ($default_logger ||= create_logger());
+}
+sub arg_levels { [qw(debug trace info warn error fatal)] }
+sub default_import { ':log' }
+
+=head1 FUNCTIONS
+
+=head2 create_logger( Sink1 => {params}, Sink2 => {params} )
+
+  If no sinks are given, Stderr is assumed
+
+=head3 Sinks
+
+Sinks are C<Log::Dispatch::*> module names, eg File, Syslog etc
+We added two more:
+  C<Stdout> which is a shortcut for Screen stderr => 0
+  C<Stderr> which is a shortcut for Screen stderr => 1
+
+  Default sink parameters:
+    C<min_level> - if env KOHA_DEBUG is set to true valu then 'debug' else 'info'
+    C<name>      - lower case sink module name
+
+  Filename rules for C<File>) sink:
+    Filenames with absolute paths are honoured
+    otherwise files are placed in koha config logdir
+
+  Default C<facility> parameter for C<Syslog>) sink is I<user>
+
+=cut
+
+sub create_logger {
+    my %sink_defs = @_ ? @_ : (Stderr => {});
+    my $logger = Koha::Log::Dispatch->new;
+    while (my ($sink, $params) = each %sink_defs) {
+        $logger->add_sink($sink, $params);
+    }
+    return $logger;
+}
+
+=head1 DEFAULT LOGGER FUNCTIONS
+
+Following functions operate on the default logger.
+Default logger should be used most of the time.
+
+=head2 set_default_logger( Sink1 => {params}, Sink2 => {params} )
+
+  Calls C<create_logger()> and sets it as the default.
+  Should probably be used only in the main script.
+
+=cut
+
+sub set_default_logger {
+    $default_logger = create_logger(@_);
+    set_logger($default_logger);
+}
+
+sub restore_default_logger {
+    set_logger($default_logger);
+}
+
+=head2 add_sink( Sink, {params}, $force )
+=head2 remove_sink( sink_name )
+=head2 with_debug { code...} Sink1 [ => {params}], Sink2 ...
+
+  C<Koha::Log::Dispatch> method proxies, called on the default logger
+
+=cut
+
+sub add_sink {
+    $default_logger->add_sink(@_);
+}
+
+sub remove_sink {
+    my ($sink_name) = @_;
+    $default_logger->remove( lc $sink_name );
+}
+
+sub with_debug (&@) {
+    my $code = \&{shift @_};
+    $default_logger->with_debug($code, @_);
+}
+
+package Koha::Log::Dispatch;
+
+=head1 LOGGER CLASS
+
+C<create_logger()> returns a loger class based on C<Log::Dispatch>
+
+=cut
+
+use Modern::Perl;
+use Carp;
+use Class::Load 'load_class';
+
+use C4::Context;
+
+use base 'Log::Dispatch';
+
+my %ALL_LOGGER_PARAMS = (
+    newline   => 1,
+    min_level => $ENV{KOHA_DEBUG} ? 'debug' : 'info',
+);
+
+my %LOGGER_PARAMS = (
+    Stdout => {stderr => 0},
+    Stderr => {stderr => 1},
+    Syslog => {facility => 'user'},
+);
+
+=head1 LOGGER METHODS
+
+=head2 outputs()
+
+  Returns hashref {sink_name => sink_object...}
+
+=cut
+
+sub outputs {
+    my $self = shift;
+    return $self->{outputs};
+}
+
+=head2 set_level(log_level, @sink_names)
+
+  Sets  (minimum) log level for all named sinks (outputs)
+  If no named sinks are specified, all associated sinks are affected.
+
+=cut
+
+sub set_level {
+    my $self = shift;
+    my $level = shift or croak "No level specified";
+
+    my @outputs = @_ ? map ($self->output($_), @_) : values (%{ $self->outputs });
+    $_->{min_level} = $_->_level_as_number($level) foreach @outputs;
+}
+
+=head2 get_levels()
+
+  Returns hashref {sink_name => log_level...}
+
+=cut
+
+sub get_levels {
+    my $self = shift;
+
+    my @outputs = @_ ? map ($self->output($_), @_) : values (%{ $self->outputs });
+    return { map { $_->name => $_->min_level } @outputs };
+}
+
+=head2 add_sink( Sink, {params}, $force )
+
+  Creates a C<Log::Dispatch::Sink> object, and calls C<add()>
+  If sink with the name altready exists it returns, unless $force is true,
+  in which case existing sink is replaced with a new one.
+
+=cut
+
+sub add_sink {
+    my $self = shift;
+    my ($sink, $params, $force) = @_;
+
+    my $sink_params = $LOGGER_PARAMS{$sink} || {};
+    my $sink_name = $params->{name} ||= lc $sink;
+
+    if ( $self->output($sink_name) ) {
+        return unless $force;
+        $self->remove( $sink_name );
+    }
+
+    $params ||= {};
+    if (my $filename = $params->{filename}) {
+        $params->{filename} = C4::Context->config("logdir") . "/$filename"
+          unless $filename =~ m!^[/.]!o;
+    }
+
+    $sink = 'Screen' if $sink eq 'Stdout' || $sink eq 'Stderr';
+    my $sink_class = "Log::Dispatch::$sink";
+    load_class $sink_class;
+    $self->add( $sink_class->new( %ALL_LOGGER_PARAMS, %$sink_params, %$params ) );
+    return $sink_name;
+}
+
+=head2 with_debug( code_ref, Sink1 [ => {params}], Sink2 ... )
+
+  Executes code within a debug context
+  If Sink => params are given, those are used for debug logging in addition
+  to eny existing sinks with debug level. Otherwise all associated sinks
+  (outputs) are upgraded temporarily to debug level.
+
+  See B<ADVANCED USAGE> below
+
+=cut
+
+sub with_debug {
+    my $self = shift;
+    my $code = shift;
+
+    my $current_levels = $self->get_levels;
+
+    my @sink;
+    my @extra_logger;
+    if (@_) {
+        while (my $sink = shift @_) {
+            # next if ref $sink;
+            my $params = {};
+            $params = shift @_ if ref $_[0];
+            my $sink_name = $params->{name} || lc $sink;
+            unless ($self->output($sink_name)) {
+                $params->{min_level} = 'debug';
+                $self->add_sink($sink, $params);
+                push @extra_logger, $sink_name;
+            }
+            push @sink, $sink_name;
+        }
+    }
+    else {
+        @sink = keys %$current_levels;
+    }
+    $self->set_level('debug', @sink);
+    $code->();
+    $self->remove($_) foreach @extra_logger;
+    while (my ($name, $level) = each %$current_levels) {
+        $self->set_level($level, $name);
+    }
+}
+
+
+=head1 USAGE
+
+  The simplest example:
+
+  use Koha::Log;
+  do things();
+  log_info { "This will show in STDERR" };
+  log_debug { "This will not show in STDERR" };
+
+  A less simple example:
+
+  use Koha::Log qw(:log set_default_logger)
+  my %sinks = (
+    'File'   => {filename => 'my.log'},
+  );
+  set_default_logger(%sinks);
+
+  # In a module down below
+  use Koha::Log;
+  do things();
+  log_info { "This will show in my.log" };
+  log_debug { "This will not show in my.log" };
+
+  An example with multiple sinks:
+
+  use Koha::Log qw(:log set_default_logger)
+  my %sinks = (
+    'Stderr' => {min_level => 'debug'},
+    'Syslog' => {},
+    'File'   => {filename => 'my.log'},
+  );
+  set_default_logger(%sinks);
+
+  # In a module down below
+  use Koha::Log;
+  do things();
+  log_info { "This will show everywhere" };
+  log_debug { "This will show in STDERR" };
+
+  Enable debug messages:
+    KOHA_DEBUG=1 some_koha_script.pl
+
+  or in Apache:
+    SetEnv KOHA_DEBUG=1
+
+=cut
+
+=head1 ADVANCED USAGE
+
+  Enable debug messages just for a piece of code:
+
+  use Koha::Log qw(:log set_default_logger)
+  my %sinks = (
+    'File'   => {filename => 'my.log'},
+  );
+  set_default_logger(%sinks);
+
+  # In a module down below
+  use Koha::Log qw(:log with_debug)
+  do things();
+  log_debug { "This will not show" };
+  ...
+  with_debug {
+      do other_things();
+      log_debug {"This will show"};
+  };
+
+  This will make the block surounded by with_debug {} output debug to my.log
+  Alternatively:
+
+  with_debug {
+      do other_things();
+      log_debug {"This will show"};
+  } 'Stderr';
+
+  will leave my.log at 'info' level, and output debug (and other log levels) to STDERR.
+
+  Special logging:
+
+  use Koha::Log qw(:log set_default_logger)
+  my %sinks = (
+    'File'   => {filename => 'my.log'},
+  );
+  set_default_logger(%sinks);
+
+  # In a module down below
+  use Koha::Log qw(:log create_logger with_logger)
+  do things();
+  log_warn { "This will show in my.log" };
+  ...
+  my $special_logger = create_logger('File' => {filename => 'my_special.log});
+  with_logger $special_logger => sub {
+      log_warn { "This will show in my_special.log" };
+  };
+
+  This will make the block surounded by with_debug {} output debug to my.log
+
+=head1 TO DO
+
+  * Add support for Email and possibly other sinks
+  * Integrate C4::Log
+
+=cut
+
+1;
diff --git a/t/Koha_Log.t b/t/Koha_Log.t
new file mode 100755
index 0000000..2446a78
--- /dev/null
+++ b/t/Koha_Log.t
@@ -0,0 +1,77 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use autodie;
+
+use Test::More tests => 6;
+use Test::Output;
+
+my $LOG_FILE = '/tmp/koha_log_test.log';
+my $DEBUG_LOG_FILE = '/tmp/koha_log_debug.log';
+my $SPECIAL_LOG_FILE = '/tmp/koha_log_special.log';
+
+BEGIN {
+    use_ok('Koha::Log', ":log", "with_logger", "with_debug", "create_logger", "set_default_logger");
+}
+
+my %sinks = (
+    'Stderr' => {},
+    'Stdout' => {min_level => 'debug'},
+    'Syslog' => {},
+    'File'   => {filename => $LOG_FILE},
+);
+
+remove_log_files();
+
+set_default_logger(%sinks);
+
+my $expect = join '', map "$_\n", "Error", "Warn", "Info", "Koha::Log::Test::test()";
+my $expect_debug = join '', map "$_\n", "Debug1", "Debug2", "Debug3";
+
+stdout_is { stderr_is {
+    log_error { "Error" };
+    log_warn { "Warn" };
+    log_info { "Info" };
+
+    Koha::Log::Test::test();
+
+    log_debug {"Debug1"};
+    with_debug {
+        log_debug {"Debug2"};
+    } 'Stderr', 'File', {filename => $DEBUG_LOG_FILE, name => 'debug'};
+    log_debug {"Debug3"};
+
+    my $special_logger = create_logger('File' => {filename => $SPECIAL_LOG_FILE});
+    with_logger $special_logger => sub {
+        log_info { "Special" };
+    };
+
+    log_info { "Last" };
+} $expect."Debug2\n"."Last\n", "logged to stderr" } $expect.$expect_debug."Last\n", "logged to stdout";
+
+check_log($LOG_FILE, $expect."Last\n");
+check_log($DEBUG_LOG_FILE, "Debug2\n");
+check_log($SPECIAL_LOG_FILE, "Special\n");
+
+remove_log_files();
+
+sub check_log {
+    my ($file, $content) = @_;
+
+    open (my $log, "<", $file);
+    my $logged = join '', <$log>;
+    is ($logged, $content, "logged to file $file");
+}
+
+sub remove_log_files {
+    -f $_ && unlink $_ foreach $LOG_FILE, $DEBUG_LOG_FILE, $SPECIAL_LOG_FILE;
+}
+
+package Koha::Log::Test;
+
+use Koha::Log;
+
+sub test {
+    log_info { "Koha::Log::Test::test()" };
+}
-- 
1.9.1

From srdjan at catalyst.net.nz  Tue Dec  9 08:56:24 2014
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue,  9 Dec 2014 20:56:24 +1300
Subject: [Koha-patches] [PATCH] bug_13413: Koha::Log in longoverdue.pl
Message-ID: <1418111784-18075-1-git-send-email-srdjan@catalyst.net.nz>

---
 misc/cronjobs/longoverdue.pl | 53 +++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/misc/cronjobs/longoverdue.pl b/misc/cronjobs/longoverdue.pl
index 193aaaf..342c6c4 100755
--- a/misc/cronjobs/longoverdue.pl
+++ b/misc/cronjobs/longoverdue.pl
@@ -37,6 +37,7 @@ use C4::Context;
 use C4::Items;
 use C4::Circulation qw/LostItem/;
 use Getopt::Long;
+use Koha::Log qw(:log set_default_logger);
 
 my  $lost;  #  key=lost value,  value=num days.
 my ($charge, $verbose, $confirm, $quiet);
@@ -53,6 +54,16 @@ GetOptions(
     'mark-returned' => \$mark_returned,
 );
 
+my $log_level = $verbose ? 'debug' : 'info';
+my %loggers;
+if ($quiet) {
+    $loggers{File}   = {min_level => $log_level, filename => 'longoverdue.log'};
+} else {
+    $loggers{Stdout} = {min_level => $log_level, };
+}
+set_default_logger( %loggers );
+
+
 my $usage = << 'ENDUSAGE';
 longoverdue.pl : This cron script set lost values on overdue items and optionally sets charges the patron's account
 for the item's replacement price.  It is designed to be run as a nightly job.  The command line options that globally
@@ -126,7 +137,7 @@ if ( ! defined($charge) ) {
 }
 unless ($confirm) {
     $verbose = 1;     # If you're not running it for real, then the whole point is the print output.
-    print "### TEST MODE -- NO ACTIONS TAKEN ###\n";
+    log_info { "### TEST MODE -- NO ACTIONS TAKEN ###" };
 }
 
 # In my opinion, this line is safe SQL to have outside the API. --atz
@@ -168,14 +179,18 @@ foreach my $startrange (sort keys %$lost) {
     if( my $lostvalue = $lost->{$startrange} ) {
         my ($date1) = bounds($startrange);
         my ($date2) = bounds(  $endrange);
-        # print "\nRange ", ++$i, "\nDue $startrange - $endrange days ago ($date2 to $date1), lost => $lostvalue\n" if($verbose);
-        $verbose and 
-            printf "\nRange %s\nDue %3s - %3s days ago (%s to %s), lost => %s\n", ++$i,
-            $startrange, $endrange, $date2, $date1, $lostvalue;
+        #log_debug { "\nRange ", ++$i, "\nDue $startrange - $endrange days ago ($date2 to $date1), lost => $lostvalue" };
+        log_debug {
+            sprintf "\nRange %s\nDue %3s - %3s days ago (%s to %s), lost => %s",
+                ++$i, $startrange, $endrange, $date2, $date1, $lostvalue;
+        };
         $sth_items->execute($startrange, $endrange, $lostvalue);
         $count=0;
         while (my $row=$sth_items->fetchrow_hashref) {
-            printf ("Due %s: item %5s from borrower %5s to lost: %s\n", $row->{date_due}, $row->{itemnumber}, $row->{borrowernumber}, $lostvalue) if($verbose);
+            log_debug {
+                sprintf "Due %s: item %5s from borrower %5s to lost: %s",
+                    $row->{date_due}, $row->{itemnumber}, $row->{borrowernumber}, $lostvalue;
+            };
             if($confirm) {
                 ModItem({ itemlost => $lostvalue }, $row->{'biblionumber'}, $row->{'itemnumber'});
                 LostItem($row->{'itemnumber'}, $mark_returned) if( $charge && $charge eq $lostvalue);
@@ -196,20 +211,18 @@ foreach my $startrange (sort keys %$lost) {
     $endrange = $startrange;
 }
 
-sub summarize ($$) {
-    my $arg = shift;    # ref to array
-    my $got_items = shift || 0;     # print "count" line for items
-    my @report = @$arg or return undef;
+log_info {
     my $i = 0;
-    for my $range (@report) {
-        printf "\nRange %s\nDue %3s - %3s days ago (%s to %s), lost => %s\n", ++$i,
-            map {$range->{$_}} qw(startrange endrange date2 date1 lostvalue);
-        $got_items and printf "  %4s items\n", $range->{count};
-    }
+    join "",
+        "\n### LONGOVERDUE SUMMARY ###",
+        map (
+            sprintf (
+                "\nRange %s\nDue %3s - %3s days ago (%s to %s), lost => %s\n  %4s items\n",
+                ++$i, @$_{qw(startrange endrange date2 date1 lostvalue count)}
+            ),
+            @report
+        ),
+        "\nTOTAL: $total items\n"
+    ;
 }
 
-if (!$quiet){
-    print "\n### LONGOVERDUE SUMMARY ###";
-    summarize (\@report, 1);
-    print "\nTOTAL: $total items\n";
-}
-- 
1.9.1

From srdjan at catalyst.net.nz  Tue Dec  9 08:56:20 2014
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue,  9 Dec 2014 20:56:20 +1300
Subject: [Koha-patches] [PATCH] bug_13413: use Koha::Log with syslog sink
	instead of syslog directly in Sipserver.pm
Message-ID: <1418111780-18012-1-git-send-email-srdjan@catalyst.net.nz>

This way we can sift out debugs
---
 C4/SIP/SIPServer.pm | 56 +++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/C4/SIP/SIPServer.pm b/C4/SIP/SIPServer.pm
index 45d8007..737899e 100755
--- a/C4/SIP/SIPServer.pm
+++ b/C4/SIP/SIPServer.pm
@@ -5,7 +5,6 @@ use strict;
 use warnings;
 use FindBin qw($Bin);
 use lib "$Bin";
-use Sys::Syslog qw(syslog);
 use Net::Server::PreFork;
 use IO::Socket::INET;
 use Socket qw(:DEFAULT :crlf);
@@ -15,6 +14,7 @@ use Sip::Constants qw(:all);
 use Sip::Configuration;
 use Sip::Checksum qw(checksum verify_cksum);
 use Sip::MsgType;
+use Koha::Log qw(:log set_default_logger);
 
 use base qw(Net::Server::PreFork);
 
@@ -27,6 +27,11 @@ use constant LOG_SIP => "local6"; # Local alias for the logging facility
 # A script with no MAIN namespace?
 # A module that takes command line args?
 
+set_default_logger(
+    Syslog => {min_level => 'warn', facility => LOG_SIP},
+    Stdout => {min_level => 'fatal'},
+);
+
 my %transports = (
     RAW    => \&raw_transport,
     telnet => \&telnet_transport,
@@ -95,14 +100,13 @@ sub process_request {
     $self->{service} = $config->find_service($sockaddr, $port, $proto);
 
     if (!defined($self->{service})) {
-		syslog("LOG_ERR", "process_request: Unknown recognized server connection: %s:%s/%s", $sockaddr, $port, $proto);
-		die "process_request: Bad server connection";
+        log_fatal { "process_request: Unknown recognized server connection: %s:%s/%s", $sockaddr, $port, $proto };
     }
 
     $transport = $transports{$self->{service}->{transport}};
 
     if (!defined($transport)) {
-		syslog("LOG_WARNING", "Unknown transport '%s', dropping", $service->{transport});
+		log_warn { "Unknown transport '%s', dropping", $service->{transport} };
 		return;
     } else {
 		&$transport($self);
@@ -120,35 +124,35 @@ sub raw_transport {
 
     while (!$self->{account}) {
     local $SIG{ALRM} = sub { die "raw_transport Timed Out!\n"; };
-    syslog("LOG_DEBUG", "raw_transport: timeout is %d", $service->{timeout});
+    log_debug { "raw_transport: timeout is %d", $service->{timeout} };
     $input = Sip::read_SIP_packet(*STDIN);
     if (!$input) {
         # EOF on the socket
-        syslog("LOG_INFO", "raw_transport: shutting down: EOF during login");
+        log_info { "raw_transport: shutting down: EOF during login" };
         return;
     }
     $input =~ s/[\r\n]+$//sm;	# Strip off trailing line terminator(s)
     last if Sip::MsgType::handle($input, $self, LOGIN);
     }
 
-    syslog("LOG_DEBUG", "raw_transport: uname/inst: '%s/%s'",
+    log_debug { "raw_transport: uname/inst: '%s/%s'",
 	   $self->{account}->{id},
-	   $self->{account}->{institution});
+	   $self->{account}->{institution} };
 
     $self->sip_protocol_loop();
-    syslog("LOG_INFO", "raw_transport: shutting down");
+    log_info { "raw_transport: shutting down" };
 }
 
 sub get_clean_string {
 	my $string = shift;
 	if (defined $string) {
-		syslog("LOG_DEBUG", "get_clean_string  pre-clean(length %s): %s", length($string), $string);
+		log_debug { "get_clean_string  pre-clean(length %s): %s", length($string), $string };
 		chomp($string);
 		$string =~ s/^[^A-z0-9]+//;
 		$string =~ s/[^A-z0-9]+$//;
-		syslog("LOG_DEBUG", "get_clean_string post-clean(length %s): %s", length($string), $string);
+		log_debug { "get_clean_string post-clean(length %s): %s", length($string), $string };
 	} else {
-		syslog("LOG_INFO", "get_clean_string called on undefined");
+		log_info { "get_clean_string called on undefined" };
 	}
 	return $string;
 }
@@ -158,7 +162,7 @@ sub get_clean_input {
 	my $in = <STDIN>;
 	$in = get_clean_string($in);
 	while (my $extra = <STDIN>){
-		syslog("LOG_ERR", "get_clean_input got extra lines: %s", $extra);
+		log_error { "get_clean_input got extra lines: %s", $extra };
 	}
 	return $in;
 }
@@ -171,7 +175,7 @@ sub telnet_transport {
     my $input;
     my $config  = $self->{config};
 	my $timeout = $self->{service}->{timeout} || $config->{timeout} || 30;
-	syslog("LOG_DEBUG", "telnet_transport: timeout is %s", $timeout);
+	log_debug { "telnet_transport: timeout is %s", $timeout };
 
     eval {
 	local $SIG{ALRM} = sub { die "telnet_transport: Timed Out ($timeout seconds)!\n"; };
@@ -190,35 +194,33 @@ sub telnet_transport {
 		$pwd = <STDIN>;
 		alarm 0;
 
-		syslog("LOG_DEBUG", "telnet_transport 1: uid length %s, pwd length %s", length($uid), length($pwd));
+		log_debug { "telnet_transport 1: uid length %s, pwd length %s", length($uid), length($pwd) };
 		$uid = get_clean_string ($uid);
 		$pwd = get_clean_string ($pwd);
-		syslog("LOG_DEBUG", "telnet_transport 2: uid length %s, pwd length %s", length($uid), length($pwd));
+		log_debug { "telnet_transport 2: uid length %s, pwd length %s", length($uid), length($pwd) };
 
 	    if (exists ($config->{accounts}->{$uid})
 		&& ($pwd eq $config->{accounts}->{$uid}->password())) {
 			$account = $config->{accounts}->{$uid};
 			Sip::MsgType::login_core($self,$uid,$pwd) and last;
 	    }
-		syslog("LOG_WARNING", "Invalid login attempt: '%s'", ($uid||''));
+		log_warn { "Invalid login attempt: '%s'", ($uid||'') };
 		print("Invalid login$CRLF");
 	}
     }; # End of eval
 
     if ($@) {
-		syslog("LOG_ERR", "telnet_transport: Login timed out");
-		die "Telnet Login Timed out";
+        log_fatal { "telnet_transport: Login timed out" };
     } elsif (!defined($account)) {
-		syslog("LOG_ERR", "telnet_transport: Login Failed");
-		die "Login Failure";
+        log_fatal { "telnet_transport: Login Failed" };
     } else {
-		print "Login OK.  Initiating SIP$CRLF";
+        print "Login OK.  Initiating SIP$CRLF";
     }
 
     $self->{account} = $account;
-    syslog("LOG_DEBUG", "telnet_transport: uname/inst: '%s/%s'", $account->{id}, $account->{institution});
+    log_debug { "telnet_transport: uname/inst: '%s/%s'", $account->{id}, $account->{institution} };
     $self->sip_protocol_loop();
-    syslog("LOG_INFO", "telnet_transport: shutting down");
+    log_info { "telnet_transport: shutting down" };
 }
 
 #
@@ -257,19 +259,19 @@ sub sip_protocol_loop {
 		$input =~ s/[^A-z0-9]+$//s;	# Same on the end, should get DOSsy ^M line-endings too.
 		while (chomp($input)) {warn "Extra line ending on input";}
 		unless ($input) {
-            syslog("LOG_ERR", "sip_protocol_loop: empty input skipped");
+            log_error { "sip_protocol_loop: empty input skipped" };
             print("96$CR");
             next;
 		}
 		# end cheap input hacks
 		my $status = Sip::MsgType::handle($input, $self, $expect);
 		if (!$status) {
-			syslog("LOG_ERR", "sip_protocol_loop: failed to handle %s",substr($input,0,2));
+			log_error { "sip_protocol_loop: failed to handle %s",substr($input,0,2) };
 		}
 		next if $status eq REQUEST_ACS_RESEND;
 		if ($expect && ($status ne $expect)) {
 			# We received a non-"RESEND" that wasn't what we were expecting.
-		    syslog("LOG_ERR", "sip_protocol_loop: expected %s, received %s, exiting", $expect, $input);
+		    log_error { "sip_protocol_loop: expected %s, received %s, exiting", $expect, $input };
 		}
 		# We successfully received and processed what we were expecting
 		$expect = '';
-- 
1.9.1

From dpavlin at rot13.org  Tue Dec 16 12:52:46 2014
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Tue, 16 Dec 2014 12:52:46 +0100
Subject: [Koha-patches] [PATCH] Bug 13470 - pay fines with extended borrower
	attributes result in application error
Message-ID: <1418730766-14102-1-git-send-email-dpavlin@rot13.org>

Test scenario:

1. ensure that extended patron attributes are turned on in system preferences
2. find borrower which has fine to pay, and click on pay button
3. verify application error
4. apply patch and verify that application error is gone
---
 members/paycollect.pl |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/members/paycollect.pl b/members/paycollect.pl
index ca47862..6473f02 100755
--- a/members/paycollect.pl
+++ b/members/paycollect.pl
@@ -149,6 +149,7 @@ $template->param(
     total         => $total_due,
     activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
     RoutingSerials => C4::Context->preference('RoutingSerials'),
+    ExtendedPatronAttributes => C4::Context->preference('ExtendedPatronAttributes'),
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
@@ -179,9 +180,6 @@ sub borrower_add_additional_fields {
 
     if (C4::Context->preference('ExtendedPatronAttributes')) {
         $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
-        $template->param(
-            ExtendedPatronAttributes => 1,
-        );
     }
 
     # Computes full borrower address
-- 
1.7.2.5


From dpavlin at rot13.org  Fri Dec 19 14:55:32 2014
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Fri, 19 Dec 2014 14:55:32 +0100
Subject: [Koha-patches] [PATCH] Bug 10773 - Add item-level descriptions for
	Label Printing
Message-ID: <1418997332-5328-1-git-send-email-dpavlin@rot13.org>

This patch adds new fields ccode_description, homebranch_description,
holdingbranch_description, location_description and
permanent_location_description which can be used in the Label Creator
to display names/descriptions instead of codes

Test Plan:

1) Edit a layout in the Label Creator so that it includes any of these
fields. I suggest including "homebranch_description" and perhaps
"ccode_description" if you have them in your item data.
2) Add items to a batch in the Label Creator.
3) Export the batch using the layout, and view as PDF
4) Verify that you see descriptions for fields which you added
---
 C4/Labels/Label.pm |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/C4/Labels/Label.pm b/C4/Labels/Label.pm
index ff6c865..5e1da18 100644
--- a/C4/Labels/Label.pm
+++ b/C4/Labels/Label.pm
@@ -97,6 +97,16 @@ sub _get_label_item {
     my $data1 = $sth1->fetchrow_hashref;
     $data->{'itemtype'} = $data1->{'description'};
     $data->{'itype'} = $data1->{'description'};
+    # add *_description fields
+    if ($data->{'homebranch'} || $data->{'holdingbranch'}){
+        require C4::Branch;
+        $data->{'homebranch_description'} = C4::Branch::GetBranchName($data->{'homebranch'}) if $data->{'homebranch'};
+        $data->{'holdingbranch_description'} = C4::Branch::GetBranchName($data->{'holdingbranch'}) if $data->{'holdingbranch'};
+    }
+    $data->{'ccode_description'} = C4::Biblio::GetAuthorisedValueDesc('','', $data->{'ccode'} ,'','','CCODE', 1) if $data->{'ccode'};
+    $data->{'location_description'} = C4::Biblio::GetAuthorisedValueDesc('','', $data->{'location'} ,'','','LOC', 1) if $data->{'location'};
+    $data->{'permanent_location_description'} = C4::Biblio::GetAuthorisedValueDesc('','', $data->{'permanent_location'} ,'','','LOC', 1) if $data->{'permanent_location'};
+
     $barcode_only ? return $data->{'barcode'} : return $data;
 }
 
-- 
1.7.2.5


From dpavlin at rot13.org  Mon Dec 22 15:09:01 2014
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Mon, 22 Dec 2014 15:09:01 +0100
Subject: [Koha-patches] [PATCH 1/2] Bug 10773 - Add item-level descriptions
	for Label Printing
Message-ID: <1419257342-13139-1-git-send-email-dpavlin@rot13.org>

This patch adds new fields ccode_description, homebranch_description,
holdingbranch_description, location_description and
permanent_location_description which can be used in the Label Creator
to display names/descriptions instead of codes

Test Plan:

1) Edit a layout in the Label Creator so that it includes any of these
fields. I suggest including "homebranch_description" and perhaps
"ccode_description" if you have them in your item data.
2) Add items to a batch in the Label Creator.
3) Export the batch using the layout, and view as PDF
4) Verify that you see descriptions for fields which you added
---
 C4/Labels/Label.pm |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/C4/Labels/Label.pm b/C4/Labels/Label.pm
index ff6c865..5e1da18 100644
--- a/C4/Labels/Label.pm
+++ b/C4/Labels/Label.pm
@@ -97,6 +97,16 @@ sub _get_label_item {
     my $data1 = $sth1->fetchrow_hashref;
     $data->{'itemtype'} = $data1->{'description'};
     $data->{'itype'} = $data1->{'description'};
+    # add *_description fields
+    if ($data->{'homebranch'} || $data->{'holdingbranch'}){
+        require C4::Branch;
+        $data->{'homebranch_description'} = C4::Branch::GetBranchName($data->{'homebranch'}) if $data->{'homebranch'};
+        $data->{'holdingbranch_description'} = C4::Branch::GetBranchName($data->{'holdingbranch'}) if $data->{'holdingbranch'};
+    }
+    $data->{'ccode_description'} = C4::Biblio::GetAuthorisedValueDesc('','', $data->{'ccode'} ,'','','CCODE', 1) if $data->{'ccode'};
+    $data->{'location_description'} = C4::Biblio::GetAuthorisedValueDesc('','', $data->{'location'} ,'','','LOC', 1) if $data->{'location'};
+    $data->{'permanent_location_description'} = C4::Biblio::GetAuthorisedValueDesc('','', $data->{'permanent_location'} ,'','','LOC', 1) if $data->{'permanent_location'};
+
     $barcode_only ? return $data->{'barcode'} : return $data;
 }
 
-- 
1.7.2.5


From dpavlin at rot13.org  Mon Dec 22 15:09:02 2014
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Mon, 22 Dec 2014 15:09:02 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 10773 - add help for *_description
	fields
In-Reply-To: <1419257342-13139-1-git-send-email-dpavlin@rot13.org>
References: <1419257342-13139-1-git-send-email-dpavlin@rot13.org>
Message-ID: <1419257342-13139-2-git-send-email-dpavlin@rot13.org>

---
 .../prog/en/modules/labels/label-edit-layout.tt    |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
index 583f6f0..92422c8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
@@ -106,6 +106,7 @@
                                                     <p>Enter a comma separated list of fields to print.  You may include any <em>Koha field</em> or MARC subfield.</p>
                                                     <p>See online help for advanced options</p>
                                                     <p>ex: barcode, itemcallnumber, title, "050a 050b", 300a </p>
+                                                    <p>Fileds homebranch_description, holdingbranch_description, ccode_description, location_description and permanent_location_description show description instead of code.</p>
                                                 </div>
                                             </fieldset></li>
 											</ol>
-- 
1.7.2.5