Attachment #4751 for bug #5786

View | Details | Raw Unified | Return to bug 5786
Collapse All | Expand All

Lines 2167-2173 sub CanBookBeRenewed { Link Here

(-)a/C4/Circulation.pm (-1 / +2 lines)
2167	LEFT JOIN biblioitems USING (biblioitemnumber)	2167	LEFT JOIN biblioitems USING (biblioitemnumber)
2168		2168
2169	WHERE	2169	WHERE
2170	(issuingrules.categorycode = borrowers.categorycode OR issuingrules.categorycode = '*')	2170	(issuingrules.categorycode = borrowers.categorycode
		2171	OR issuingrules.categorycode = '*')
2171	AND	2172	AND
2172	(issuingrules.itemtype = $itype OR issuingrules.itemtype = '*')	2173	(issuingrules.itemtype = $itype OR issuingrules.itemtype = '*')
2173	AND	2174	AND

Lines 156-161 sub GetItem { Link Here

(-)a/C4/Items.pm (+2 lines)
156	($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();	156	($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();
157	}	157	}
158	#if we don't have an items.itype, use biblioitems.itemtype.	158	#if we don't have an items.itype, use biblioitems.itemtype.
		159	# FIXME this should respect the itypes systempreference
		160	# if (C4::Context->preference('item-level_itypes')) {
159	if( ! $data->{'itype'} ) {	161	if( ! $data->{'itype'} ) {
160	my $sth = $dbh->prepare("SELECT itemtype FROM biblioitems WHERE biblionumber = ?");	162	my $sth = $dbh->prepare("SELECT itemtype FROM biblioitems WHERE biblionumber = ?");
161	$sth->execute($data->{'biblionumber'});	163	$sth->execute($data->{'biblionumber'});




# Copyright 2000-2002 Katipo Communications
#           2006 SAN Ouest Provence
#           2007-2010 BibLibre Paul POULAIN
#           2011 Catalyst IT
#
# This file is part of Koha.
#

    if(my $rowcount = $sthcount->fetchrow_hashref()){
        $reservecount = $rowcount->{count};
    }
    
    # we check if it's ok or not
    if( $reservecount < $allowedreserves ){
        return 1;


=head2 IsAvailableForItemLevelRequest

  my $is_available = IsAvailableForItemLevelRequest($itemnumber,$borrowernumber,$branchcode);

Checks whether a given item record is available for an
item-level hold request.  An item is available if

* it is not withdrawn AND 
* does not have a not for loan value > 0

Need to check the issuingrules onshelfholds column, 
if this is set items on the shelf can be placed on hold
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.

Note that IsAvailableForItemLevelRequest() does not
check if the staff operator is authorized to place


sub IsAvailableForItemLevelRequest {
    my $itemnumber = shift;
    my $borrowernumber = shift;
    my $branchcode = shift;
    my $item = GetItem($itemnumber);

    # must check the notforloan setting of the itemtype
    # FIXME - a lot of places in the code do this
    #         or something similar - need to be

                               $item->{wthdrawn} or
                               $notforloan_per_itemtype;

    # check issuingrules
    
    if (OnShelfHoldsAllowed($itemnumber,$borrowernumber,$branchcode)) {
        return $available_per_item;
    } else {
        return ($available_per_item and ($item->{onloan} or GetReserveStatus($itemnumber) eq "W")); 
    }
}

=head2 OnShelfHoldsAllowed

  OnShelfHoldsAllowed($itemnumber,$borrowernumber,$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 ($itemnumber,$borrowernumber,$branchcode) = @_;
    my $item = GetItem($itemnumber);
    my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);
    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 onshelfholds,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 $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare($query);
    $sth->execute($borrower->{categorycode},$itype,$branchcode);
    my $data = $sth->fetchrow_hashref;
    if ($data->{onshelfholds}){
	return 1;
    }
    else {
	return 0;
    }
}

=head2 AlterPriority

  AlterPriority( $where, $borrowernumber, $biblionumber, $reservedate );

Lines 183-189 sub shelfpage ($$$$$) { Link Here

(-)a/C4/VirtualShelves/Page.pm (-1 lines)
183	# explicitly fetch this shelf	183	# explicitly fetch this shelf
184	my ($shelfnumber2,$shelfname,$owner,$category,$sorton) = GetShelf($shelfnumber);	184	my ($shelfnumber2,$shelfname,$owner,$category,$sorton) = GetShelf($shelfnumber);
185		185
186	$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
187	if (C4::Context->preference('TagsEnabled')) {	186	if (C4::Context->preference('TagsEnabled')) {
188	$template->param(TagsEnabled => 1);	187	$template->param(TagsEnabled => 1);
189	foreach (qw(TagsShowOnList TagsInputOnList)) {	188	foreach (qw(TagsShowOnList TagsInputOnList)) {




# 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, reservesallowed, issuelength, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod, rentaldiscount, onshelfholds) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, onshelfholds=? WHERE branchcode=? AND categorycode=? AND itemtype=?");
    
    my $br = $branch; # branch
    my $bor  = $input->param('categorycode'); # borrower category

    my $maxissueqty  = $input->param('maxissueqty');
    my $renewalsallowed  = $input->param('renewalsallowed');
    my $reservesallowed  = $input->param('reservesallowed');
    my $onshelfholds     = $input->param('onshelfholds');
    $maxissueqty =~ s/\s//g;
    $maxissueqty = undef if $maxissueqty !~ /^\d+/;
    my $issuelength  = $input->param('issuelength');

    $sth_search->execute($br,$bor,$cat);
    my $res = $sth_search->fetchrow_hashref();
    if ($res->{total}) {
        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$hardduedate,$hardduedatecompare,$rentaldiscount, $onshelfholds, $br,$bor,$cat);
    } else {
        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount,$onshelfholds);
    }
} 
elsif ($op eq "set-branch-defaults") {

Lines 185-191 $tabsysprefs{HomeOrHoldingBranch} = "Circulation"; Link Here

(-)a/admin/systempreferences.pl (-1 lines)
185	$tabsysprefs{HomeOrHoldingBranchReturn} = "Circulation";	185	$tabsysprefs{HomeOrHoldingBranchReturn} = "Circulation";
186	$tabsysprefs{RandomizeHoldsQueueWeight} = "Circulation";	186	$tabsysprefs{RandomizeHoldsQueueWeight} = "Circulation";
187	$tabsysprefs{StaticHoldsQueueWeight} = "Circulation";	187	$tabsysprefs{StaticHoldsQueueWeight} = "Circulation";
188	$tabsysprefs{AllowOnShelfHolds} = "Circulation";
189	$tabsysprefs{AllowHoldsOnDamagedItems} = "Circulation";	188	$tabsysprefs{AllowHoldsOnDamagedItems} = "Circulation";
190	$tabsysprefs{UseBranchTransferLimits} = "Circulation";	189	$tabsysprefs{UseBranchTransferLimits} = "Circulation";
191	$tabsysprefs{AllowHoldPolicyOverride} = "Circulation";	190	$tabsysprefs{AllowHoldPolicyOverride} = "Circulation";

Lines 217-223 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES Link Here

(-)a/installer/data/mysql/de-DE/mandatory/sysprefs.sql (-1 lines)
217	('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on intranet','YesNo'),	217	('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on intranet','YesNo'),
218	('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on intranet','YesNo');	218	('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on intranet','YesNo');
219	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');	219	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');
220	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowOnShelfHolds', '0', '', 'Allow hold requests to be placed on items that are not on loan', 'YesNo');
221	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');	220	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');
222	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');	221	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');
223	-- FIXME: add FrameworksLoaded, noOPACUserLogin?	222	-- FIXME: add FrameworksLoaded, noOPACUserLogin?

Lines 219-225 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES Link Here

(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (-1 lines)
219	('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on intranet','YesNo'),	219	('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on intranet','YesNo'),
220	('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on intranet','YesNo');	220	('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on intranet','YesNo');
221	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');	221	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');
222	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowOnShelfHolds', '0', '', 'Allow hold requests to be placed on items that are not on loan', 'YesNo');
223	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');	222	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');
224	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');	223	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');
225	-- FIXME: add FrameworksLoaded, noOPACUserLogin?	224	-- FIXME: add FrameworksLoaded, noOPACUserLogin?

Lines 214-220 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES Link Here

(-)a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql (-1 lines)
214	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('XSLTDetailsDisplay','0','','Activer la feuille XSL pour l''affichage des notices détaillées dans la partie pro','YesNo');	214	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('XSLTDetailsDisplay','0','','Activer la feuille XSL pour l''affichage des notices détaillées dans la partie pro','YesNo');
215	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('XSLTResultsDisplay','0','','Activer la feuille XSL pour l''affichage des listes de résultat dans la partie pro','YesNo');	215	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('XSLTResultsDisplay','0','','Activer la feuille XSL pour l''affichage des listes de résultat dans la partie pro','YesNo');
216	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Définit quel champ est utilisé pour la limitation par type de document dans la recherche avancée','Choice');	216	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Définit quel champ est utilisé pour la limitation par type de document dans la recherche avancée','Choice');
217	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowOnShelfHolds', '0', '', 'Autorise les réservations de documents en rayon.', 'YesNo');
218	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Autorise les réservations de documents déclarés endommagés', 'YesNo');	217	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Autorise les réservations de documents déclarés endommagés', 'YesNo');
219	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Active la fonction de suppression à l''OPAC. Elle demande plus de paramétrage, demandez à votre administrateur', 'YesNo');	218	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Active la fonction de suppression à l''OPAC. Elle demande plus de paramétrage, demandez à votre administrateur', 'YesNo');
220	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('SMSSendDriver','','','Détermine le pilote utilisé par SMS::Send pour envoyer des SMS.','free');	219	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES ('SMSSendDriver','','','Détermine le pilote utilisé par SMS::Send pour envoyer des SMS.','free');

Lines 9-15 insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, Link Here

(-)a/installer/data/mysql/it-IT/necessari/sysprefs.sql (-1 lines)
9	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('advancedMARCeditor','0','','Se su ON, nel MARC editor non verranno visualizzati i campi/sottocampi delle descrizioni.','YesNo');	9	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('advancedMARCeditor','0','','Se su ON, nel MARC editor non verranno visualizzati i campi/sottocampi delle descrizioni.','YesNo');
10	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Selezionare quale set di campi comprenderà la ricerca avanzata per tipo.','Choice');	10	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Selezionare quale set di campi comprenderà la ricerca avanzata per tipo.','Choice');
11	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AllowHoldsOnDamagedItems','1','','Permette l\'inserimento di richieste di prenotazione su copie danneggiate','YesNo');	11	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AllowHoldsOnDamagedItems','1','','Permette l\'inserimento di richieste di prenotazione su copie danneggiate','YesNo');
12	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AllowOnShelfHolds','1','','Permette di inserire prenotazioni su documenti non in prestito.','YesNo');
13	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AllowRenewalLimitOverride','1','','Se On, permette che i limiti ai rinnovi possano essere superati dal bibliotecario nel modulo della circolazione','YesNo');	12	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AllowRenewalLimitOverride','1','','Se On, permette che i limiti ai rinnovi possano essere superati dal bibliotecario nel modulo della circolazione','YesNo');
14	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AmazonAssocTag','','','See: http://aws.amazon.com','free');	13	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AmazonAssocTag','','','See: http://aws.amazon.com','free');
15	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AmazonCoverImages','0','','Se ON, visualizza nell’interfaccia del bibliotecario l’immagine della copertina presa dal Web Service di Amazon','YesNo');	14	insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('AmazonCoverImages','0','','Se ON, visualizza nell’interfaccia del bibliotecario l’immagine della copertina presa dal Web Service di Amazon','YesNo');

Lines 235-241 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES Link Here

(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql (-1 lines)
235	('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on intranet','YesNo'),	235	('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on intranet','YesNo'),
236	('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on intranet','YesNo');	236	('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on intranet','YesNo');
237	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');	237	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');
238	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowOnShelfHolds', '0', '', 'Allow hold requests to be placed on items that are not on loan', 'YesNo');
239	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');	238	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');
240	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');	239	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');
241	-- FIXME: add FrameworksLoaded, noOPACUserLogin?	240	-- FIXME: add FrameworksLoaded, noOPACUserLogin?

Lines 214-220 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES Link Here

(-)a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql (-1 lines)
214	('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on OPAC WARNING: MARC21 Only','YesNo'),	214	('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on OPAC WARNING: MARC21 Only','YesNo'),
215	('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on OPAC WARNING: MARC21 Only','YesNo');	215	('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on OPAC WARNING: MARC21 Only','YesNo');
216	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');	216	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');
217	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowOnShelfHolds', '0', '', 'Allow hold requests to be placed on items that are not on loan', 'YesNo');
218	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');	217	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');
219	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');	218	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');
220	-- FIXME: add FrameworksLoaded, noOPACUserLogin?	219	-- FIXME: add FrameworksLoaded, noOPACUserLogin?

Lines 241-247 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES Link Here

(-)a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql (-1 lines)
241	('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on OPAC exemple : ../koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl','Textarea'),	241	('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on OPAC exemple : ../koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl','Textarea'),
242	('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on OPAC exemple : ../koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl','Textarea');	242	('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on OPAC exemple : ../koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl','Textarea');
243	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');	243	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');
244	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowOnShelfHolds', '0', '', 'Allow hold requests to be placed on items that are not on loan', 'YesNo');
245	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');	244	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');
246	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');	245	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');
247	-- FIXME: add FrameworksLoaded, noOPACUserLogin?	246	-- FIXME: add FrameworksLoaded, noOPACUserLogin?

Lines 266-272 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES Link Here

(-)a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql (-1 lines)
266	('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on OPAC exemple : ../koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl','Textarea'),	266	('XSLTDetailsDisplay','0','','Enable XSL stylesheet control over details page display on OPAC exemple : ../koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl','Textarea'),
267	('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on OPAC exemple : ../koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl','Textarea');	267	('XSLTResultsDisplay','0','','Enable XSL stylesheet control over results page display on OPAC exemple : ../koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl','Textarea');
268	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');	268	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AdvancedSearchTypes','itemtypes','itemtypes\|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice');
269	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowOnShelfHolds', '0', '', 'Allow hold requests to be placed on items that are not on loan', 'YesNo');
270	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');	269	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('AllowHoldsOnDamagedItems', '1', '', 'Allow hold requests to be placed on damaged items', 'YesNo');
271	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');	270	INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES('OpacSuppression', '0', '', 'Turn ON the OPAC Suppression feature, requires further setup, ask your system administrator for details', 'YesNo');
272	-- FIXME: add FrameworksLoaded, noOPACUserLogin?	271	-- FIXME: add FrameworksLoaded, noOPACUserLogin?




    SetVersion($DBversion);
}

$DBversion = '3.05.00.XXX';
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
    print "Upgrade to $DBversion done (Bug 5786 move AllowOnShelfHolds to circulation matrix)\n";
    # First create the column
    $dbh->do("ALTER TABLE issuingrules ADD onshelfholds BOOLEAN");
    # Now update the column    
    if (C4::Context->preference("AllowOnShelfHolds")){
	# Pref is on, set allow for all rules
	$dbh->do("UPDATE issuingrules SET onshelfholds=1");
    }
    # If the preference is not set, leave off
    # Remove from the systempreferences table
    $dbh->do("DELETE FROM systempreferences WHERE variable = 'AllowOnShelfHolds'");	
    SetVersion ($DBversion);
}

=head1 FUNCTIONS

=head2 DropAllForeignKeys($table)

Lines 32-38 my @globals = ("themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets Link Here

(-)a/installer/html-template-to-template-toolkit.pl (-1 / +1 lines)
32	"SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages",	32	"SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages",
33	"virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay",	33	"virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay",
34	"OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled",	34	"OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled",
35	"TagsShowOnList", "TagsInputOnList","loggedinusername","AllowOnShelfHolds","opacbookbag",	35	"TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag",
36	"OPACAmazonEnabled", "SyndeticsCoverImages","using_https");	36	"OPACAmazonEnabled", "SyndeticsCoverImages","using_https");
37		37
38	# Arguments:	38	# Arguments:




                  no: "Don't allow"
            - hold requests to be placed on 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




#              choices:
#            - If ON, enables subject cloud on OPAC
        -
            - pref: OPACItemHolds
              choices:
                  yes: Allow
                  no: "Don't allow"
            - 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.
        -
            - pref: OpacRenewalAllowed
              choices:
                  yes: Allow




                <th>Suspension in Days (day)</th>
                <th>Renewals Allowed (count)</th>
                <th>Holds Allowed (count)</th>
		<th>On Shelf Holds Allowed</th>
		<th>Rental Discount (%)</th>
				<th>&nbsp;</th>
            </tr>
				[% FOREACH rule IN rules %]

								[% END %]
							</td>
							<td>[% rule.issuelength %]</td>
                            <td>[% IF ( rule.hardduedate ) %]
                                    [% IF ( rule.hardduedatebefore ) %]
                                        before
                                    [% ELSIF ( rule.hardduedateexact ) %]
                                        on
                                    [% ELSIF ( rule.hardduedateafter ) %]
                                        after
                                    [% END %]
                                    [% rule.hardduedate %]
                                [% ELSE %]
                                    None defined
                                [% END %]   
                            </td>
							<td>[% rule.fine %]</td>
							<td>[% rule.chargeperiod %]</td>
							<td>[% rule.firstremind %]</td>
							<td>[% rule.finedays %]</td>
							<td>[% rule.renewalsallowed %]</td>
							<td>[% rule.reservesallowed %]</td>
							<td>[% IF rule.onshelfholds %]Yes[% ELSE %]No[% END %]</td>
							<td>[% rule.rentaldiscount %]</td>
							<td>
								<a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]">Delete</a>

                    <td><input name="finedays" size="3" /> </td>
                    <td><input name="renewalsallowed" size="2" /></td>
                    <td><input name="reservesallowed" size="2" /></td>
		    <td><input type="radio" name="onshelfholds" value="1">Yes <input type="radio" name="onshelfholds" value="0">No</td>
		    <td><input name="rentaldiscount" size="2" /></td>
                    <td><input type="hidden" name="branch" value="[% current_branch %]"/><input type="submit" value="Add" class="submit" /></td>
                </tr>

Lines 17-23 TIP: Note that in this case an error message appears notifying the circulation l Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt (-2 / +2 lines)
17	<li>it is not marked not for loan AND,</li>	17	<li>it is not marked not for loan AND,</li>
18	<li>it is not withdrawn AND,</li>	18	<li>it is not withdrawn AND,</li>
19	<li>it is not damaged (unless the AllowHoldsOnDamagedItems system preference is ON), AND</li>	19	<li>it is not damaged (unless the AllowHoldsOnDamagedItems system preference is ON), AND</li>
20	<li>it is not on loan (unless the AllowOnShelfHolds system preference is ON)</li>	20	<li>it is not on loan (unless the On Shelf Holds Allowed issue rule is ON)</li>
21	</ul></li>	21	</ul></li>
22	<li>	22	<li>
23	<span style="background-color: #ffe599">	23	<span style="background-color: #ffe599">
Lines 34-37 TIP: If independent branches is on and the canreservefromotherbranches system p Link Here
34	<li>Hold priority can be altered by viewing the holds for the title</li>	34	<li>Hold priority can be altered by viewing the holds for the title</li>
35	<li>To view holds on a title, click the 'Holds' tab on the left</li>	35	<li>To view holds on a title, click the 'Holds' tab on the left</li>
36	<li>By changing the priority number a patron can be moved up or down on the list of holds</li>	36	<li>By changing the priority number a patron can be moved up or down on the list of holds</li>
37	</ul>[% INCLUDE 'help-bottom.inc' %]	37	</ul>[% INCLUDE 'help-bottom.inc' %]




[% UNLESS ( norequests ) %]
        [% IF ( opacuserlogin ) %]
		[% IF ( RequestOnOpac ) %]
			[% IF ( AllowOnShelfHolds ) %]
				<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 %]




[% UNLESS ( norequests ) %]
        [% IF ( opacuserlogin ) %]
        [% IF ( RequestOnOpac ) %]
            [% IF ( AllowOnShelfHolds ) %]
                <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 %]




<ul id="action">

[% UNLESS ( norequests ) %]
    [% IF ( opacuserlogin ) %]
		[% IF ( RequestOnOpac ) %]
            <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
       	[% END %]
			[% ELSE %]
				[% IF ( ItemsIssued ) %]
		            		<li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
				[% END %]
			[% END %]
        	[% END %]
	[% END %]
[% END %]
        <li><a class="print" href="#" onclick="window.print();">Print</a></li>




                                [% IF ( RequestOnOpac ) %]
					[% UNLESS ( GROUP_RESULT.norequests ) %]
						[% IF ( opacuserlogin ) %]
							[% 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 %]
						[% END %]
					[% END %]
				[% END %]




                                [% IF ( RequestOnOpac ) %]
					[% UNLESS ( SEARCH_RESULT.norequests ) %]
						[% IF ( opacuserlogin ) %]
							<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-->
								<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-->
							[% 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 %]
						[% END %]
					[% END %]
				[% END %]




      [% IF ( RequestOnOpac ) %]
          [% UNLESS ( itemsloo.norequests ) %]
            [% IF ( opacuserlogin ) %]
              [% IF ( AllowOnShelfHolds ) %]
                <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
              [% ELSE %]
                [% IF ( itemsloo.itemsissued ) %]
                  <a class="hold" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% itemsloo.biblionumber %]">Place Hold</a><!-- add back when available 0 holds in queue-->
                [% END %]
              [% END %]
            [% END %]
          [% END %]
        [% END %]

Lines 69-75 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-ISBDdetail.pl (-2 lines)
69		69
70	my $biblionumber = $query->param('biblionumber');	70	my $biblionumber = $query->param('biblionumber');
71		71
72	$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
73	$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );	72	$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
74		73
75	my $marcflavour = C4::Context->preference("marcflavour");	74	my $marcflavour = C4::Context->preference("marcflavour");
Lines 152-158 foreach ( @$reviews ) { Link Here
152		151
153	$template->param(	152	$template->param(
154	RequestOnOpac => C4::Context->preference("RequestOnOpac"),	153	RequestOnOpac => C4::Context->preference("RequestOnOpac"),
155	AllowOnShelfHolds => C4::Context->preference('AllowOnShelfHolds'),
156	norequests => $norequests,	154	norequests => $norequests,
157	ISBD => $res,	155	ISBD => $res,
158	biblionumber => $biblionumber,	156	biblionumber => $biblionumber,

Lines 81-87 $template->param( Link Here

(-)a/opac/opac-MARCdetail.pl (-1 lines)
81	bibliotitle => $biblio->{title},	81	bibliotitle => $biblio->{title},
82	);	82	);
83		83
84	$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
85	$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );	84	$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
86		85
87	# adding the $RequestOnOpac param	86	# adding the $RequestOnOpac param

Lines 66-72 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here

(-)a/opac/opac-detail.pl (-1 lines)
66		66
67	my $biblionumber = $query->param('biblionumber') \|\| $query->param('bib');	67	my $biblionumber = $query->param('biblionumber') \|\| $query->param('bib');
68		68
69	$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
70	$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );	69	$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
71		70
72	my $record = GetMarcBiblio($biblionumber);	71	my $record = GetMarcBiblio($biblionumber);

Lines 432-438 foreach my $biblioNum (@biblionumbers) { Link Here

(-)a/opac/opac-reserve.pl (-1 / +1 lines)
432	$policy_holdallowed = 0;	432	$policy_holdallowed = 0;
433	}	433	}
434		434
435	if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum)) {	435	if (IsAvailableForItemLevelRequest($itemNum,$borr->{'borrowernumber'},$itemInfo->{'homebranch'}) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum)) {
436	$itemLoopIter->{available} = 1;	436	$itemLoopIter->{available} = 1;
437	$numCopiesAvailable++;	437	$numCopiesAvailable++;
438	}	438	}

Lines 100-106 if (C4::Context->preference("marcflavour") eq "UNIMARC" ) { Link Here

(-)a/opac/opac-search.pl (-2 / +1 lines)
100	elsif (C4::Context->preference("marcflavour") eq "MARC21" ) {	100	elsif (C4::Context->preference("marcflavour") eq "MARC21" ) {
101	$template->param('usmarc' => 1);	101	$template->param('usmarc' => 1);
102	}	102	}
103	$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );	103
104	$template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') );	104	$template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') );
105		105
106	if (C4::Context->preference('BakerTaylorEnabled')) {	106	if (C4::Context->preference('BakerTaylorEnabled')) {
107	-

Return to bug 5786

Lines 3-8 package C4::Reserves; Link Here

(-)a/C4/Reserves.pm (-12 / +61 lines)
3	# Copyright 2000-2002 Katipo Communications	3	# Copyright 2000-2002 Katipo Communications
4	# 2006 SAN Ouest Provence	4	# 2006 SAN Ouest Provence
5	# 2007-2010 BibLibre Paul POULAIN	5	# 2007-2010 BibLibre Paul POULAIN
		6	# 2011 Catalyst IT
6	#	7	#
7	# This file is part of Koha.	8	# This file is part of Koha.
8	#	9	#
Lines 471-477 sub CanItemBeReserved{ Link Here
471	if(my $rowcount = $sthcount->fetchrow_hashref()){	472	if(my $rowcount = $sthcount->fetchrow_hashref()){
472	$reservecount = $rowcount->{count};	473	$reservecount = $rowcount->{count};
473	}	474	}
474
475	# we check if it's ok or not	475	# we check if it's ok or not
476	if( $reservecount < $allowedreserves ){	476	if( $reservecount < $allowedreserves ){
477	return 1;	477	return 1;
Lines 1299-1305 sub GetReserveInfo { Link Here
1299		1299
1300	=head2 IsAvailableForItemLevelRequest	1300	=head2 IsAvailableForItemLevelRequest
1301		1301
1302	my $is_available = IsAvailableForItemLevelRequest($itemnumber);	1302	my $is_available = IsAvailableForItemLevelRequest($itemnumber,$borrowernumber,$branchcode);
1303		1303
1304	Checks whether a given item record is available for an	1304	Checks whether a given item record is available for an
1305	item-level hold request. An item is available if	1305	item-level hold request. An item is available if
Lines 1309-1320 item-level hold request. An item is available if Link Here
1309	* it is not withdrawn AND	1309	* it is not withdrawn AND
1310	* does not have a not for loan value > 0	1310	* does not have a not for loan value > 0
1311		1311
1312	Whether or not the item is currently on loan is	1312	Need to check the issuingrules onshelfholds column,
1313	also checked - if the AllowOnShelfHolds system preference	1313	if this is set items on the shelf can be placed on hold
1314	is ON, an item can be requested even if it is currently
1315	on loan to somebody else. If the system preference
1316	is OFF, an item that is currently checked out cannot
1317	be the target of an item-level hold request.
1318		1314
1319	Note that IsAvailableForItemLevelRequest() does not	1315	Note that IsAvailableForItemLevelRequest() does not
1320	check if the staff operator is authorized to place	1316	check if the staff operator is authorized to place
Lines 1326-1334 and canreservefromotherbranches. Link Here
1326		1322
1327	sub IsAvailableForItemLevelRequest {	1323	sub IsAvailableForItemLevelRequest {
1328	my $itemnumber = shift;	1324	my $itemnumber = shift;
1329		1325	my $borrowernumber = shift;
		1326	my $branchcode = shift;
1330	my $item = GetItem($itemnumber);	1327	my $item = GetItem($itemnumber);
1331
1332	# must check the notforloan setting of the itemtype	1328	# must check the notforloan setting of the itemtype
1333	# FIXME - a lot of places in the code do this	1329	# FIXME - a lot of places in the code do this
1334	# or something similar - need to be	1330	# or something similar - need to be
Lines 1361-1374 sub IsAvailableForItemLevelRequest { Link Here
1361	$item->{wthdrawn} or	1357	$item->{wthdrawn} or
1362	$notforloan_per_itemtype;	1358	$notforloan_per_itemtype;
1363		1359
1364		1360	# check issuingrules
1365	if (C4::Context->preference('AllowOnShelfHolds')) {	1361
		1362	if (OnShelfHoldsAllowed($itemnumber,$borrowernumber,$branchcode)) {
1366	return $available_per_item;	1363	return $available_per_item;
1367	} else {	1364	} else {
1368	return ($available_per_item and ($item->{onloan} or GetReserveStatus($itemnumber) eq "W"));	1365	return ($available_per_item and ($item->{onloan} or GetReserveStatus($itemnumber) eq "W"));
1369	}	1366	}
1370	}	1367	}
1371		1368
		1369	=head2 OnShelfHoldsAllowed
		1370
		1371	OnShelfHoldsAllowed($itemnumber,$borrowernumber,$branchcode);
		1372
		1373	Checks issuingrules, using the borrowers categorycode, the itemtype, and branchcode to see if onshelf
		1374	holds are allowed, returns true if so.
		1375
		1376	=cut
		1377
		1378	sub OnShelfHoldsAllowed {
		1379	my ($itemnumber,$borrowernumber,$branchcode) = @_;
		1380	my $item = GetItem($itemnumber);
		1381	my $borrower = C4::Members::GetMember(borrowernumber => $borrowernumber);
		1382	my $itype;
		1383	my $dbh = C4::Context->dbh;
		1384	if (C4::Context->preference('item-level_itypes')) {
		1385	# We cant trust GetItem to honour the syspref, so safest to do it ourselves
		1386	# When GetItem is fixed, we can remove this
		1387	$itype = $item->{itype};
		1388	}
		1389	else {
		1390	my $query = "SELECT itemtype FROM biblioitems WHERE biblioitemnumber = ? ";
		1391	my $sth = $dbh->prepare($query);
		1392	$sth->execute($item->{biblioitemnumber});
		1393	if (my $data = $sth->fetchrow_hashref()){
		1394	$itype = $data->{itemtype};
		1395	}
		1396	}
		1397
		1398	my $query = "SELECT onshelfholds,categorycode,itemtype,branchcode FROM issuingrules WHERE
		1399	(issuingrules.categorycode = ? OR issuingrules.categorycode = '*')
		1400	AND
		1401	(issuingrules.itemtype = ? OR issuingrules.itemtype = '*')
		1402	AND
		1403	(issuingrules.branchcode = ? OR issuingrules.branchcode = '*')
		1404	ORDER BY
		1405	issuingrules.categorycode desc,
		1406	issuingrules.itemtype desc,
		1407	issuingrules.branchcode desc
		1408	LIMIT 1";
		1409	my $dbh = C4::Context->dbh;
		1410	my $sth = $dbh->prepare($query);
		1411	$sth->execute($borrower->{categorycode},$itype,$branchcode);
		1412	my $data = $sth->fetchrow_hashref;
		1413	if ($data->{onshelfholds}){
		1414	return 1;
		1415	}
		1416	else {
		1417	return 0;
		1418	}
		1419	}
		1420
1372	=head2 AlterPriority	1421	=head2 AlterPriority
1373		1422
1374	AlterPriority( $where, $borrowernumber, $biblionumber, $reservedate );	1423	AlterPriority( $where, $borrowernumber, $biblionumber, $reservedate );

Lines 4370-4375 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+16 lines)
4370	SetVersion($DBversion);	4370	SetVersion($DBversion);
4371	}	4371	}
4372		4372
		4373	$DBversion = '3.05.00.XXX';
		4374	if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
		4375	print "Upgrade to $DBversion done (Bug 5786 move AllowOnShelfHolds to circulation matrix)\n";
		4376	# First create the column
		4377	$dbh->do("ALTER TABLE issuingrules ADD onshelfholds BOOLEAN");
		4378	# Now update the column
		4379	if (C4::Context->preference("AllowOnShelfHolds")){
		4380	# Pref is on, set allow for all rules
		4381	$dbh->do("UPDATE issuingrules SET onshelfholds=1");
		4382	}
		4383	# If the preference is not set, leave off
		4384	# Remove from the systempreferences table
		4385	$dbh->do("DELETE FROM systempreferences WHERE variable = 'AllowOnShelfHolds'");
		4386	SetVersion ($DBversion);
		4387	}
		4388
4373	=head1 FUNCTIONS	4389	=head1 FUNCTIONS
4374		4390
4375	=head2 DropAllForeignKeys($table)	4391	=head2 DropAllForeignKeys($table)

Lines 295-306 OPAC: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-6 lines)
295	# choices:	295	# choices:
296	# - If ON, enables subject cloud on OPAC	296	# - If ON, enables subject cloud on OPAC
297	-	297	-
298	- pref: OPACItemHolds
299	choices:
300	yes: Allow
301	no: "Don't allow"
302	- 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.
303	-
304	- pref: OpacRenewalAllowed	298	- pref: OpacRenewalAllowed
305	choices:	299	choices:
306	yes: Allow	300	yes: Allow

Lines 802-817 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (-9 / +3 lines)
802	<ul id="action">	802	<ul id="action">
803		803
804	[% UNLESS ( norequests ) %]	804	[% UNLESS ( norequests ) %]
805	[% IF ( opacuserlogin ) %]	805	[% IF ( opacuserlogin ) %]
806	[% IF ( RequestOnOpac ) %]	806	[% IF ( RequestOnOpac ) %]
807	[% IF ( AllowOnShelfHolds ) %]	807	<li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
808	<li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>	808	[% END %]
809	[% ELSE %]
810	[% IF ( ItemsIssued ) %]
811	<li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% biblionumber %]">Place Hold</a></li>
812	[% END %]
813	[% END %]
814	[% END %]
815	[% END %]	809	[% END %]
816	[% END %]	810	[% END %]
817	<li><a class="print" href="#" onclick="window.print();">Print</a></li>	811	<li><a class="print" href="#" onclick="window.print();">Print</a></li>

Lines 509-521 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt (-7 / +1 lines)
509	[% IF ( RequestOnOpac ) %]	509	[% IF ( RequestOnOpac ) %]
510	[% UNLESS ( SEARCH_RESULT.norequests ) %]	510	[% UNLESS ( SEARCH_RESULT.norequests ) %]
511	[% IF ( opacuserlogin ) %]	511	[% IF ( opacuserlogin ) %]
512	[% IF ( AllowOnShelfHolds ) %]	512	<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-->
513	<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-->
514	[% ELSE %]
515	[% IF ( SEARCH_RESULT.itemsissued ) %]
516	<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-->
517	[% END %]
518	[% END %]
519	[% END %]	513	[% END %]
520	[% END %]	514	[% END %]
521	[% END %]	515	[% END %]

Lines 101-108 elsif ($op eq 'delete-branch-item') { Link Here

(-)a/admin/smart-rules.pl (-4 / +5 lines)
101	# save the values entered	101	# save the values entered
102	elsif ($op eq 'add') {	102	elsif ($op eq 'add') {
103	my $sth_search = $dbh->prepare("SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?");	103	my $sth_search = $dbh->prepare("SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?");
104	my $sth_insert = $dbh->prepare("INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)");	104	my $sth_insert = $dbh->prepare("INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod, rentaldiscount, onshelfholds) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
105	my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, hardduedate=?, hardduedatecompare=?, rentaldiscount=? WHERE branchcode=? AND categorycode=? AND itemtype=?");	105	my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, onshelfholds=? WHERE branchcode=? AND categorycode=? AND itemtype=?");
106		106
107	my $br = $branch; # branch	107	my $br = $branch; # branch
108	my $bor = $input->param('categorycode'); # borrower category	108	my $bor = $input->param('categorycode'); # borrower category
Lines 114-119 elsif ($op eq 'add') { Link Here
114	my $maxissueqty = $input->param('maxissueqty');	114	my $maxissueqty = $input->param('maxissueqty');
115	my $renewalsallowed = $input->param('renewalsallowed');	115	my $renewalsallowed = $input->param('renewalsallowed');
116	my $reservesallowed = $input->param('reservesallowed');	116	my $reservesallowed = $input->param('reservesallowed');
		117	my $onshelfholds = $input->param('onshelfholds');
117	$maxissueqty =~ s/\s//g;	118	$maxissueqty =~ s/\s//g;
118	$maxissueqty = undef if $maxissueqty !~ /^\d+/;	119	$maxissueqty = undef if $maxissueqty !~ /^\d+/;
119	my $issuelength = $input->param('issuelength');	120	my $issuelength = $input->param('issuelength');
Lines 126-134 elsif ($op eq 'add') { Link Here
126	$sth_search->execute($br,$bor,$cat);	127	$sth_search->execute($br,$bor,$cat);
127	my $res = $sth_search->fetchrow_hashref();	128	my $res = $sth_search->fetchrow_hashref();
128	if ($res->{total}) {	129	if ($res->{total}) {
129	$sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$hardduedate,$hardduedatecompare,$rentaldiscount, $br,$bor,$cat);	130	$sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$hardduedate,$hardduedatecompare,$rentaldiscount, $onshelfholds, $br,$bor,$cat);
130	} else {	131	} else {
131	$sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount);	132	$sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount,$onshelfholds);
132	}	133	}
133	}	134	}
134	elsif ($op eq "set-branch-defaults") {	135	elsif ($op eq "set-branch-defaults") {

Lines 80-86 for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-8 / +17 lines)
80	<th>Suspension in Days (day)</th>	80	<th>Suspension in Days (day)</th>
81	<th>Renewals Allowed (count)</th>	81	<th>Renewals Allowed (count)</th>
82	<th>Holds Allowed (count)</th>	82	<th>Holds Allowed (count)</th>
83	<th>Rental Discount (%)</th>	83	<th>On Shelf Holds Allowed</th>
		84	<th>Rental Discount (%)</th>
84	<th> </th>	85	<th> </th>
85	</tr>	86	</tr>
86	[% FOREACH rule IN rules %]	87	[% FOREACH rule IN rules %]
Lines 108-126 for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde Link Here
108	[% END %]	109	[% END %]
109	</td>	110	</td>
110	<td>[% rule.issuelength %]</td>	111	<td>[% rule.issuelength %]</td>
111	<td>[% IF ( rule.hardduedate ) %]	112	<td>[% IF ( rule.hardduedate ) %]
112	[% IF ( rule.hardduedatebefore ) %]before [% rule.hardduedate %]</td>	113	[% IF ( rule.hardduedatebefore ) %]
113	[% ELSE %][% IF ( rule.hardduedateexact ) %]on [% rule.hardduedate %]</td>	114	before
114	[% ELSE %][% IF ( rule.hardduedateafter ) %]after [% rule.hardduedate %]</td>[% END %]	115	[% ELSIF ( rule.hardduedateexact ) %]
115	[% END %]	116	on
116	[% END %]	117	[% ELSIF ( rule.hardduedateafter ) %]
117	[% ELSE %]None defined[% END %]	118	after
		119	[% END %]
		120	[% rule.hardduedate %]
		121	[% ELSE %]
		122	None defined
		123	[% END %]
		124	</td>
118	<td>[% rule.fine %]</td>	125	<td>[% rule.fine %]</td>
119	<td>[% rule.chargeperiod %]</td>	126	<td>[% rule.chargeperiod %]</td>
120	<td>[% rule.firstremind %]</td>	127	<td>[% rule.firstremind %]</td>
121	<td>[% rule.finedays %]</td>	128	<td>[% rule.finedays %]</td>
122	<td>[% rule.renewalsallowed %]</td>	129	<td>[% rule.renewalsallowed %]</td>
123	<td>[% rule.reservesallowed %]</td>	130	<td>[% rule.reservesallowed %]</td>
		131	<td>[% IF rule.onshelfholds %]Yes[% ELSE %]No[% END %]</td>
124	<td>[% rule.rentaldiscount %]</td>	132	<td>[% rule.rentaldiscount %]</td>
125	<td>	133	<td>
126	<a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype %]&categorycode=[% rule.categorycode %]&branch=[% rule.current_branch %]">Delete</a>	134	<a class="button" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype %]&categorycode=[% rule.categorycode %]&branch=[% rule.current_branch %]">Delete</a>
Lines 175-180 for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde Link Here
175	<td><input name="finedays" size="3" /> </td>	183	<td><input name="finedays" size="3" /> </td>
176	<td><input name="renewalsallowed" size="2" /></td>	184	<td><input name="renewalsallowed" size="2" /></td>
177	<td><input name="reservesallowed" size="2" /></td>	185	<td><input name="reservesallowed" size="2" /></td>
		186	<td><input type="radio" name="onshelfholds" value="1">Yes <input type="radio" name="onshelfholds" value="0">No</td>
178	<td><input name="rentaldiscount" size="2" /></td>	187	<td><input name="rentaldiscount" size="2" /></td>
179	<td><input type="hidden" name="branch" value="[% current_branch %]"/><input type="submit" value="Add" class="submit" /></td>	188	<td><input type="hidden" name="branch" value="[% current_branch %]"/><input type="submit" value="Add" class="submit" /></td>
180	</tr>	189	</tr>